@atproto/bsky 0.0.11 → 0.0.13

package/dist/index.js

@@ -27864,16 +27864,16 @@ var require_validate = __commonJS({
         const matches = RELATIVE_JSON_POINTER.exec($data);
         if (!matches)
           throw new Error(`Invalid JSON-pointer: ${$data}`);
-        const up28 = +matches[1];
+        const up29 = +matches[1];
         jsonPointer = matches[2];
         if (jsonPointer === "#") {
-          if (up28 >= dataLevel)
-            throw new Error(errorMsg("property/index", up28));
-          return dataPathArr[dataLevel - up28];
+          if (up29 >= dataLevel)
+            throw new Error(errorMsg("property/index", up29));
+          return dataPathArr[dataLevel - up29];
         }
-        if (up28 > dataLevel)
-          throw new Error(errorMsg("data", up28));
-        data = dataNames[dataLevel - up28];
+        if (up29 > dataLevel)
+          throw new Error(errorMsg("data", up29));
+        data = dataNames[dataLevel - up29];
         if (!jsonPointer)
           return data;
       }
@@ -27886,8 +27886,8 @@ var require_validate = __commonJS({
         }
       }
       return expr;
-      function errorMsg(pointerType, up28) {
-        return `Cannot access ${pointerType} ${up28} levels up, current level is ${dataLevel}`;
+      function errorMsg(pointerType, up29) {
+        return `Cannot access ${pointerType} ${up29} levels up, current level is ${dataLevel}`;
       }
     }
     exports.getData = getData;
@@ -99623,16 +99623,18 @@ var decompressPubkey2 = (compressed) => {
 };
 
 // ../crypto/src/p256/operations.ts
-var verifyDidSig = async (did2, data, sig) => {
+var verifyDidSig = async (did2, data, sig, opts) => {
   const { jwtAlg, keyBytes } = parseDidKey(did2);
   if (jwtAlg !== P256_JWT_ALG) {
     throw new Error(`Not a P-256 did:key: ${did2}`);
   }
-  return verifySig(keyBytes, data, sig);
+  return verifySig(keyBytes, data, sig, opts);
 };
-var verifySig = async (publicKey, data, sig) => {
+var verifySig = async (publicKey, data, sig, opts) => {
   const msgHash = await sha2562(data);
-  return p256.verify(sig, msgHash, publicKey, { lowS: true });
+  return p256.verify(sig, msgHash, publicKey, {
+    lowS: opts?.lowS ?? true
+  });
 };
 
 // ../crypto/src/p256/plugin.ts
@@ -99644,16 +99646,18 @@ var p256Plugin = {
 var plugin_default = p256Plugin;
 
 // ../crypto/src/secp256k1/operations.ts
-var verifyDidSig2 = async (did2, data, sig) => {
+var verifyDidSig2 = async (did2, data, sig, opts) => {
   const { jwtAlg, keyBytes } = parseDidKey(did2);
   if (jwtAlg !== SECP256K1_JWT_ALG) {
     throw new Error(`Not a secp256k1 did:key: ${did2}`);
   }
-  return verifySig2(keyBytes, data, sig);
+  return verifySig2(keyBytes, data, sig, opts);
 };
-var verifySig2 = async (publicKey, data, sig) => {
+var verifySig2 = async (publicKey, data, sig, opts) => {
   const msgHash = await sha2562(data);
-  return secp256k1.verify(sig, msgHash, publicKey, { lowS: true });
+  return secp256k1.verify(sig, msgHash, publicKey, {
+    lowS: opts?.lowS ?? true
+  });
 };
 
 // ../crypto/src/secp256k1/plugin.ts
@@ -99757,13 +99761,13 @@ var randomIntFromSeed = async (seed, high, low = 0) => {
 };
 
 // ../crypto/src/verify.ts
-var verifySignature = (didKey, data, sig) => {
+var verifySignature = (didKey, data, sig, opts) => {
   const parsed = parseDidKey(didKey);
   const plugin = plugins_default.find((p) => p.jwtAlg === parsed.jwtAlg);
   if (!plugin) {
-    throw new Error(`Unsupported signature alg: :${parsed.jwtAlg}`);
+    throw new Error(`Unsupported signature alg: ${parsed.jwtAlg}`);
   }
-  return plugin.verifySignature(didKey, data, sig);
+  return plugin.verifySignature(didKey, data, sig, opts);
 };
 
 // ../common-web/src/check.ts
@@ -99848,6 +99852,19 @@ var createDeferrable = () => {
   });
   return { resolve, complete: promise };
 };
+var handleAllSettledErrors = (results) => {
+  const errors = results.filter(isRejected).map((res) => res.reason);
+  if (errors.length === 0) {
+    return;
+  }
+  if (errors.length === 1) {
+    throw errors[0];
+  }
+  throw new AggregateError(errors, "Multiple errors: " + errors.map((err) => err?.message).join("\n"));
+};
+var isRejected = (result) => {
+  return result.status === "rejected";
+};
 
 // ../common-web/src/tid.ts
 var TID_LEN = 13;
@@ -103609,6 +103626,9 @@ var graphemeLen = (str) => {
   const splitter = new import_graphemer.default();
   return splitter.countGraphemes(str);
 };
+var utf8ToB64Url = (utf8) => {
+  return toString2(fromString2(utf8, "utf8"), "base64url");
+};
 var b64UrlToUtf8 = (b64) => {
   return toString2(fromString2(b64, "base64url"), "utf8");
 };
@@ -103617,26 +103637,10 @@ var validateLanguage = (langTag) => {
 };
 var bcp47Regexp = /^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-(?<extension>[0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(?<privateUseA>x(-[A-Za-z0-9]{1,8})+))?)|(?<privateUseB>x(-[A-Za-z0-9]{1,8})+))$/;
 
-// ../identity/src/types.ts
-var verificationMethod = objectType({
-  id: stringType(),
-  type: stringType(),
-  controller: stringType(),
-  publicKeyMultibase: stringType().optional()
-});
-var service = objectType({
-  id: stringType(),
-  type: stringType(),
-  serviceEndpoint: unionType([stringType(), recordType(unknownType())])
-});
-var didDocument = objectType({
-  id: stringType(),
-  alsoKnownAs: arrayType(stringType()).optional(),
-  verificationMethod: arrayType(verificationMethod).optional(),
-  service: arrayType(service).optional()
-});
-
-// ../identity/src/did/atproto-data.ts
+// ../common-web/src/did-doc.ts
+var isValidDidDoc = (doc) => {
+  return didDocument.safeParse(doc).success;
+};
 var getDid = (doc) => {
   const id = doc.id;
   if (typeof id !== "string") {
@@ -103644,7 +103648,16 @@ var getDid = (doc) => {
   }
   return id;
 };
-var getKey = (doc) => {
+var getHandle = (doc) => {
+  const aka = doc.alsoKnownAs;
+  if (!aka)
+    return void 0;
+  const found = aka.find((name3) => name3.startsWith("at://"));
+  if (!found)
+    return void 0;
+  return found.slice(5);
+};
+var getSigningKey = (doc) => {
   const did2 = getDid(doc);
   let keys = doc.verificationMethod;
   if (!keys)
@@ -103655,50 +103668,103 @@ var getKey = (doc) => {
     keys = [keys];
   }
   const found = keys.find((key) => key.id === "#atproto" || key.id === `${did2}#atproto`);
-  if (!found)
+  if (!found?.publicKeyMultibase)
     return void 0;
-  if (!found.publicKeyMultibase)
-    return void 0;
-  const keyBytes = multibaseToBytes(found.publicKeyMultibase);
-  let didKey = void 0;
-  if (found.type === "EcdsaSecp256r1VerificationKey2019") {
-    didKey = formatDidKey(P256_JWT_ALG, keyBytes);
-  } else if (found.type === "EcdsaSecp256k1VerificationKey2019") {
-    didKey = formatDidKey(SECP256K1_JWT_ALG, keyBytes);
-  } else if (found.type === "Multikey") {
-    const parsed = parseMultikey(found.publicKeyMultibase);
-    didKey = formatDidKey(parsed.jwtAlg, parsed.keyBytes);
-  }
-  return didKey;
-};
-var getHandle = (doc) => {
-  const aka = doc.alsoKnownAs;
-  if (!aka)
-    return void 0;
-  const found = aka.find((name3) => name3.startsWith("at://"));
-  if (!found)
-    return void 0;
-  return found.slice(5);
+  return {
+    type: found.type,
+    publicKeyMultibase: found.publicKeyMultibase
+  };
 };
-var getPds = (doc) => {
+var getPdsEndpoint = (doc) => {
   return getServiceEndpoint(doc, {
     id: "#atproto_pds",
     type: "AtprotoPersonalDataServer"
   });
 };
-var getFeedGen = (doc) => {
+var getFeedGenEndpoint = (doc) => {
   return getServiceEndpoint(doc, {
     id: "#bsky_fg",
     type: "BskyFeedGenerator"
   });
 };
+var getServiceEndpoint = (doc, opts) => {
+  const did2 = getDid(doc);
+  let services = doc.service;
+  if (!services)
+    return void 0;
+  if (typeof services !== "object")
+    return void 0;
+  if (!Array.isArray(services)) {
+    services = [services];
+  }
+  const found = services.find((service2) => service2.id === opts.id || service2.id === `${did2}${opts.id}`);
+  if (!found)
+    return void 0;
+  if (found.type !== opts.type) {
+    return void 0;
+  }
+  if (typeof found.serviceEndpoint !== "string") {
+    return void 0;
+  }
+  return validateUrl(found.serviceEndpoint);
+};
+var validateUrl = (urlStr) => {
+  let url;
+  try {
+    url = new URL(urlStr);
+  } catch {
+    return void 0;
+  }
+  if (!["http:", "https:"].includes(url.protocol)) {
+    return void 0;
+  } else if (!url.hostname) {
+    return void 0;
+  } else {
+    return urlStr;
+  }
+};
+var verificationMethod = z.object({
+  id: z.string(),
+  type: z.string(),
+  controller: z.string(),
+  publicKeyMultibase: z.string().optional()
+});
+var service = z.object({
+  id: z.string(),
+  type: z.string(),
+  serviceEndpoint: z.union([z.string(), z.record(z.unknown())])
+});
+var didDocument = z.object({
+  id: z.string(),
+  alsoKnownAs: z.array(z.string()).optional(),
+  verificationMethod: z.array(verificationMethod).optional(),
+  service: z.array(service).optional()
+});
+
+// ../identity/src/did/atproto-data.ts
+var getKey = (doc) => {
+  const key = getSigningKey(doc);
+  if (!key)
+    return void 0;
+  const keyBytes = multibaseToBytes(key.publicKeyMultibase);
+  let didKey = void 0;
+  if (key.type === "EcdsaSecp256r1VerificationKey2019") {
+    didKey = formatDidKey(P256_JWT_ALG, keyBytes);
+  } else if (key.type === "EcdsaSecp256k1VerificationKey2019") {
+    didKey = formatDidKey(SECP256K1_JWT_ALG, keyBytes);
+  } else if (key.type === "Multikey") {
+    const parsed = parseMultikey(key.publicKeyMultibase);
+    didKey = formatDidKey(parsed.jwtAlg, parsed.keyBytes);
+  }
+  return didKey;
+};
 var parseToAtprotoDocument = (doc) => {
   const did2 = getDid(doc);
   return {
     did: did2,
     signingKey: getKey(doc),
     handle: getHandle(doc),
-    pds: getPds(doc)
+    pds: getPdsEndpoint(doc)
   };
 };
 var ensureAtpDocument = (doc) => {
@@ -103717,36 +103783,12 @@ var ensureAtpDocument = (doc) => {
   }
   return { did: did2, signingKey, handle: handle2, pds };
 };
-var validateUrl = (url) => {
-  const { hostname, protocol } = new URL(url);
-  if (!["http:", "https:"].includes(protocol)) {
-    throw new Error("Invalid pds protocol");
-  }
-  if (!hostname) {
-    throw new Error("Invalid pds hostname");
-  }
-};
-var getServiceEndpoint = (doc, opts) => {
-  const did2 = getDid(doc);
-  let services = doc.service;
-  if (!services)
-    return void 0;
-  if (typeof services !== "object")
-    return void 0;
-  if (!Array.isArray(services)) {
-    services = [services];
-  }
-  const found = services.find((service2) => service2.id === opts.id || service2.id === `${did2}${opts.id}`);
-  if (!found)
-    return void 0;
-  if (found.type !== opts.type) {
-    return void 0;
-  }
-  if (typeof found.serviceEndpoint !== "string") {
-    return void 0;
+var ensureAtprotoKey = (doc) => {
+  const { signingKey } = parseToAtprotoDocument(doc);
+  if (!signingKey) {
+    throw new Error(`Could not parse signingKey from doc: ${doc}`);
   }
-  validateUrl(found.serviceEndpoint);
-  return found.serviceEndpoint;
+  return signingKey;
 };
 
 // ../identity/src/errors.ts
@@ -103802,16 +103844,17 @@ var BaseResolver = class {
       return null;
     return this.validateDidDoc(did2, got);
   }
-  async refreshCache(did2) {
-    await this.cache?.refreshCache(did2, () => this.resolveNoCache(did2));
+  async refreshCache(did2, prevResult) {
+    await this.cache?.refreshCache(did2, () => this.resolveNoCache(did2), prevResult);
   }
   async resolve(did2, forceRefresh = false) {
+    let fromCache = null;
     if (this.cache && !forceRefresh) {
-      const fromCache = await this.cache.checkCache(did2);
-      if (fromCache?.stale) {
-        await this.refreshCache(did2);
-      }
-      if (fromCache) {
+      fromCache = await this.cache.checkCache(did2);
+      if (fromCache && !fromCache.expired) {
+        if (fromCache?.stale) {
+          await this.refreshCache(did2, fromCache);
+        }
         return fromCache.doc;
       }
     }
@@ -103820,7 +103863,7 @@ var BaseResolver = class {
       await this.cache?.clearEntry(did2);
       return null;
     }
-    await this.cache?.cacheDid(did2, got);
+    await this.cache?.cacheDid(did2, got, fromCache ?? void 0);
     return got;
   }
   async ensureResolve(did2, forceRefresh = false) {
@@ -103838,8 +103881,8 @@ var BaseResolver = class {
     if (did2.startsWith("did:key:")) {
       return did2;
     } else {
-      const data = await this.resolveAtprotoData(did2, forceRefresh);
-      return data.signingKey;
+      const didDocument2 = await this.ensureResolve(did2, forceRefresh);
+      return ensureAtprotoKey(didDocument2);
     }
   }
   async verifySignature(did2, data, sig, forceRefresh = false) {
@@ -103972,7 +104015,7 @@ var HandleResolver = class {
     const url = new URL("/.well-known/atproto-did", `https://${handle2}`);
     try {
       const res = await fetch(url, { signal });
-      const did2 = await res.text();
+      const did2 = (await res.text()).split("\n")[0].trim();
       if (typeof did2 === "string" && did2.startsWith("did:")) {
         return did2;
       }
@@ -105260,15 +105303,6 @@ var discriminatedObject = z.object({ $type: z.string() });
 function isDiscriminatedObject(value) {
   return discriminatedObject.safeParse(value).success;
 }
-var LexiconDocMalformedError = class extends Error {
-  constructor(message, schemaDef, issues) {
-    super(message);
-    this.schemaDef = schemaDef;
-    this.issues = issues;
-    this.schemaDef = schemaDef;
-    this.issues = issues;
-  }
-};
 var ValidationError = class extends Error {
 };
 var InvalidLexiconError = class extends Error {
@@ -105349,23 +105383,13 @@ var Lexicons = class {
     }
   }
   add(doc) {
-    try {
-      lexiconDoc.parse(doc);
-    } catch (e) {
-      if (e instanceof ZodError) {
-        throw new LexiconDocMalformedError(`Failed to parse schema definition ${doc.id}`, doc, e.issues);
-      } else {
-        throw e;
-      }
-    }
-    const validatedDoc = doc;
-    const uri2 = toLexUri(validatedDoc.id);
+    const uri2 = toLexUri(doc.id);
     if (this.docs.has(uri2)) {
       throw new Error(`${uri2} has already been registered`);
     }
-    resolveRefUris(validatedDoc, uri2);
-    this.docs.set(uri2, validatedDoc);
-    for (const [defUri, def3] of iterDefs(validatedDoc)) {
+    resolveRefUris(doc, uri2);
+    this.docs.set(uri2, doc);
+    for (const [defUri, def3] of iterDefs(doc)) {
       this.defs.set(defUri, def3);
     }
   }
@@ -109920,7 +109944,27 @@ function ui8ToBuffer(bytes3) {
 }
 
 // ../xrpc-server/src/auth.ts
-var verifyJwt = async (jwtStr, ownDid, getSigningKey) => {
+var createServiceJwt = async (params2) => {
+  const { iss, aud, keypair } = params2;
+  const exp = params2.exp ?? Math.floor((Date.now() + MINUTE) / 1e3);
+  const header = {
+    typ: "JWT",
+    alg: keypair.jwtAlg
+  };
+  const payload = {
+    iss,
+    aud,
+    exp
+  };
+  const toSignStr = `${jsonToB64Url(header)}.${jsonToB64Url(payload)}`;
+  const toSign = fromString2(toSignStr, "utf8");
+  const sig = await keypair.sign(toSign);
+  return `${toSignStr}.${toString2(sig, "base64url")}`;
+};
+var jsonToB64Url = (json) => {
+  return utf8ToB64Url(JSON.stringify(json));
+};
+var verifyJwt = async (jwtStr, ownDid, getSigningKey2) => {
   const parts = jwtStr.split(".");
   if (parts.length !== 3) {
     throw new AuthRequiredError("poorly formatted jwt", "BadJwt");
@@ -109935,17 +109979,30 @@ var verifyJwt = async (jwtStr, ownDid, getSigningKey) => {
   }
   const msgBytes = fromString2(parts.slice(0, 2).join("."), "utf8");
   const sigBytes = fromString2(sig, "base64url");
-  const signingKey = await getSigningKey(payload.iss);
+  const verifySignatureWithKey = (key) => {
+    return verifySignature(key, msgBytes, sigBytes, {
+      lowS: false
+    });
+  };
+  const signingKey = await getSigningKey2(payload.iss, false);
   let validSig;
   try {
-    validSig = await verifySignature(signingKey, msgBytes, sigBytes);
+    validSig = await verifySignatureWithKey(signingKey);
   } catch (err) {
     throw new AuthRequiredError("could not verify jwt signature", "BadJwtSignature");
   }
+  if (!validSig) {
+    const freshSigningKey = await getSigningKey2(payload.iss, true);
+    try {
+      validSig = freshSigningKey !== signingKey ? await verifySignatureWithKey(freshSigningKey) : false;
+    } catch (err) {
+      throw new AuthRequiredError("could not verify jwt signature", "BadJwtSignature");
+    }
+  }
   if (!validSig) {
     throw new AuthRequiredError("jwt signature does not match jwt issuer", "BadJwtSignature");
   }
-  return payload.iss;
+  return payload;
 };
 var parseB64UrlToJson = (b64) => {
   return JSON.parse(b64UrlToUtf8(b64));
@@ -118755,7 +118812,7 @@ var skeleton2 = async (params2, ctx) => {
   }
   let feedItemsQb = feedService.selectFeedItemQb().where("originatorDid", "=", actorDid);
   if (filter === "posts_with_media") {
-    feedItemsQb = feedItemsQb.where("post.creator", "=", actorDid).whereExists((qb) => qb.selectFrom("post_embed_image").select("post_embed_image.postUri").whereRef("post_embed_image.postUri", "=", "feed_item.postUri"));
+    feedItemsQb = feedItemsQb.where("type", "=", "post").whereExists((qb) => qb.selectFrom("post_embed_image").select("post_embed_image.postUri").whereRef("post_embed_image.postUri", "=", "feed_item.postUri"));
   } else if (filter === "posts_no_replies") {
     feedItemsQb = feedItemsQb.where((qb) => qb.where("post.replyParent", "is", null).orWhere("type", "=", "repost"));
   }
@@ -118806,6 +118863,18 @@ var schemaDict = {
     lexicon: 1,
     id: "com.atproto.admin.defs",
     defs: {
+      statusAttr: {
+        type: "object",
+        required: ["applied"],
+        properties: {
+          applied: {
+            type: "boolean"
+          },
+          ref: {
+            type: "string"
+          }
+        }
+      },
       actionView: {
         type: "object",
         required: [
@@ -119215,6 +119284,44 @@ var schemaDict = {
           }
         }
       },
+      accountView: {
+        type: "object",
+        required: ["did", "handle", "indexedAt"],
+        properties: {
+          did: {
+            type: "string",
+            format: "did"
+          },
+          handle: {
+            type: "string",
+            format: "handle"
+          },
+          email: {
+            type: "string"
+          },
+          indexedAt: {
+            type: "string",
+            format: "datetime"
+          },
+          invitedBy: {
+            type: "ref",
+            ref: "lex:com.atproto.server.defs#inviteCode"
+          },
+          invites: {
+            type: "array",
+            items: {
+              type: "ref",
+              ref: "lex:com.atproto.server.defs#inviteCode"
+            }
+          },
+          invitesDisabled: {
+            type: "boolean"
+          },
+          inviteNote: {
+            type: "string"
+          }
+        }
+      },
       repoViewNotFound: {
         type: "object",
         required: ["did"],
@@ -119235,6 +119342,24 @@ var schemaDict = {
           }
         }
       },
+      repoBlobRef: {
+        type: "object",
+        required: ["did", "cid"],
+        properties: {
+          did: {
+            type: "string",
+            format: "did"
+          },
+          cid: {
+            type: "string",
+            format: "cid"
+          },
+          recordUri: {
+            type: "string",
+            format: "at-uri"
+          }
+        }
+      },
       recordView: {
         type: "object",
         required: [
@@ -119517,6 +119642,33 @@ var schemaDict = {
       }
     }
   },
+  ComAtprotoAdminGetAccountInfo: {
+    lexicon: 1,
+    id: "com.atproto.admin.getAccountInfo",
+    defs: {
+      main: {
+        type: "query",
+        description: "View details about an account.",
+        parameters: {
+          type: "params",
+          required: ["did"],
+          properties: {
+            did: {
+              type: "string",
+              format: "did"
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.defs#accountView"
+          }
+        }
+      }
+    }
+  },
   ComAtprotoAdminGetInviteCodes: {
     lexicon: 1,
     id: "com.atproto.admin.getInviteCodes",
@@ -119811,6 +119963,54 @@ var schemaDict = {
       }
     }
   },
+  ComAtprotoAdminGetSubjectStatus: {
+    lexicon: 1,
+    id: "com.atproto.admin.getSubjectStatus",
+    defs: {
+      main: {
+        type: "query",
+        description: "Fetch the service-specific the admin status of a subject (account, record, or blob)",
+        parameters: {
+          type: "params",
+          properties: {
+            did: {
+              type: "string",
+              format: "did"
+            },
+            uri: {
+              type: "string",
+              format: "at-uri"
+            },
+            blob: {
+              type: "string",
+              format: "cid"
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["subject"],
+            properties: {
+              subject: {
+                type: "union",
+                refs: [
+                  "lex:com.atproto.admin.defs#repoRef",
+                  "lex:com.atproto.repo.strongRef",
+                  "lex:com.atproto.admin.defs#repoBlobRef"
+                ]
+              },
+              takedown: {
+                type: "ref",
+                ref: "lex:com.atproto.admin.defs#statusAttr"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   ComAtprotoAdminResolveModerationReports: {
     lexicon: 1,
     id: "com.atproto.admin.resolveModerationReports",
@@ -119903,9 +120103,6 @@ var schemaDict = {
             q: {
               type: "string"
             },
-            invitedBy: {
-              type: "string"
-            },
             limit: {
               type: "integer",
               minimum: 1,
@@ -120110,6 +120307,58 @@ var schemaDict = {
       }
     }
   },
+  ComAtprotoAdminUpdateSubjectStatus: {
+    lexicon: 1,
+    id: "com.atproto.admin.updateSubjectStatus",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Update the service-specific admin status of a subject (account, record, or blob)",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["subject"],
+            properties: {
+              subject: {
+                type: "union",
+                refs: [
+                  "lex:com.atproto.admin.defs#repoRef",
+                  "lex:com.atproto.repo.strongRef",
+                  "lex:com.atproto.admin.defs#repoBlobRef"
+                ]
+              },
+              takedown: {
+                type: "ref",
+                ref: "lex:com.atproto.admin.defs#statusAttr"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["subject"],
+            properties: {
+              subject: {
+                type: "union",
+                refs: [
+                  "lex:com.atproto.admin.defs#repoRef",
+                  "lex:com.atproto.repo.strongRef",
+                  "lex:com.atproto.admin.defs#repoBlobRef"
+                ]
+              },
+              takedown: {
+                type: "ref",
+                ref: "lex:com.atproto.admin.defs#statusAttr"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   ComAtprotoIdentityResolveHandle: {
     lexicon: 1,
     id: "com.atproto.identity.resolveHandle",
@@ -120407,7 +120656,9 @@ var schemaDict = {
                 ref: "lex:com.atproto.moderation.defs#reasonType"
               },
               reason: {
-                type: "string"
+                type: "string",
+                maxGraphemes: 2e3,
+                maxLength: 2e4
               },
               subject: {
                 type: "union",
@@ -121056,7 +121307,7 @@ var schemaDict = {
           encoding: "application/json",
           schema: {
             type: "object",
-            required: ["handle", "email", "password"],
+            required: ["handle"],
             properties: {
               email: {
                 type: "string"
@@ -121077,6 +121328,9 @@ var schemaDict = {
               },
               recoveryKey: {
                 type: "string"
+              },
+              plcOp: {
+                type: "unknown"
               }
             }
           }
@@ -121100,6 +121354,9 @@ var schemaDict = {
               did: {
                 type: "string",
                 format: "did"
+              },
+              didDoc: {
+                type: "unknown"
               }
             }
           }
@@ -121325,6 +121582,9 @@ var schemaDict = {
                 type: "string",
                 format: "did"
               },
+              didDoc: {
+                type: "unknown"
+              },
               email: {
                 type: "string"
               },
@@ -121639,6 +121899,9 @@ var schemaDict = {
               did: {
                 type: "string",
                 format: "did"
+              },
+              didDoc: {
+                type: "unknown"
               }
             }
           }
@@ -121715,6 +121978,41 @@ var schemaDict = {
       }
     }
   },
+  ComAtprotoServerReserveSigningKey: {
+    lexicon: 1,
+    id: "com.atproto.server.reserveSigningKey",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Reserve a repo signing key for account creation.",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            properties: {
+              did: {
+                type: "string",
+                description: "The did to reserve a new did:key for"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["signingKey"],
+            properties: {
+              signingKey: {
+                type: "string",
+                description: "Public signing key in the form of a did:key."
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   ComAtprotoServerResetPassword: {
     lexicon: 1,
     id: "com.atproto.server.resetPassword",
@@ -122132,7 +122430,7 @@ var schemaDict = {
       },
       repo: {
         type: "object",
-        required: ["did", "head"],
+        required: ["did", "head", "rev"],
         properties: {
           did: {
             type: "string",
@@ -122141,6 +122439,9 @@ var schemaDict = {
           head: {
             type: "string",
             format: "cid"
+          },
+          rev: {
+            type: "string"
           }
         }
       }
@@ -122541,6 +122842,10 @@ var schemaDict = {
             type: "string",
             format: "at-uri"
           },
+          blockingByList: {
+            type: "ref",
+            ref: "lex:app.bsky.graph.defs#listViewBasic"
+          },
           following: {
             type: "string",
             format: "at-uri"
@@ -126065,48 +126370,55 @@ function toKnownErr3(e) {
   return e;
 }
 
-// ../api/src/client/types/com/atproto/admin/getInviteCodes.ts
+// ../api/src/client/types/com/atproto/admin/getAccountInfo.ts
 function toKnownErr4(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
-// ../api/src/client/types/com/atproto/admin/getModerationAction.ts
+// ../api/src/client/types/com/atproto/admin/getInviteCodes.ts
 function toKnownErr5(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
-// ../api/src/client/types/com/atproto/admin/getModerationActions.ts
+// ../api/src/client/types/com/atproto/admin/getModerationAction.ts
 function toKnownErr6(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
-// ../api/src/client/types/com/atproto/admin/getModerationReport.ts
+// ../api/src/client/types/com/atproto/admin/getModerationActions.ts
 function toKnownErr7(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
-// ../api/src/client/types/com/atproto/admin/getModerationReports.ts
+// ../api/src/client/types/com/atproto/admin/getModerationReport.ts
 function toKnownErr8(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
+// ../api/src/client/types/com/atproto/admin/getModerationReports.ts
+function toKnownErr9(e) {
+  if (e instanceof XRPCError) {
+  }
+  return e;
+}
+
 // ../api/src/client/types/com/atproto/admin/getRecord.ts
 var RecordNotFoundError = class extends XRPCError {
   constructor(src3) {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr9(e) {
+function toKnownErr10(e) {
   if (e instanceof XRPCError) {
     if (e.error === "RecordNotFound")
       return new RecordNotFoundError(e);
@@ -126120,7 +126432,7 @@ var RepoNotFoundError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr10(e) {
+function toKnownErr11(e) {
   if (e instanceof XRPCError) {
     if (e.error === "RepoNotFound")
       return new RepoNotFoundError(e);
@@ -126128,29 +126440,36 @@ function toKnownErr10(e) {
   return e;
 }
 
+// ../api/src/client/types/com/atproto/admin/getSubjectStatus.ts
+function toKnownErr12(e) {
+  if (e instanceof XRPCError) {
+  }
+  return e;
+}
+
 // ../api/src/client/types/com/atproto/admin/resolveModerationReports.ts
-function toKnownErr11(e) {
+function toKnownErr13(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/admin/reverseModerationAction.ts
-function toKnownErr12(e) {
+function toKnownErr14(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/admin/searchRepos.ts
-function toKnownErr13(e) {
+function toKnownErr15(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/admin/sendEmail.ts
-function toKnownErr14(e) {
+function toKnownErr16(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126162,7 +126481,7 @@ var SubjectHasActionError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr15(e) {
+function toKnownErr17(e) {
   if (e instanceof XRPCError) {
     if (e.error === "SubjectHasAction")
       return new SubjectHasActionError(e);
@@ -126171,42 +126490,49 @@ function toKnownErr15(e) {
 }
 
 // ../api/src/client/types/com/atproto/admin/updateAccountEmail.ts
-function toKnownErr16(e) {
+function toKnownErr18(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/admin/updateAccountHandle.ts
-function toKnownErr17(e) {
+function toKnownErr19(e) {
+  if (e instanceof XRPCError) {
+  }
+  return e;
+}
+
+// ../api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
+function toKnownErr20(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/identity/resolveHandle.ts
-function toKnownErr18(e) {
+function toKnownErr21(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/identity/updateHandle.ts
-function toKnownErr19(e) {
+function toKnownErr22(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/label/queryLabels.ts
-function toKnownErr20(e) {
+function toKnownErr23(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/moderation/createReport.ts
-function toKnownErr21(e) {
+function toKnownErr24(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126218,7 +126544,7 @@ var InvalidSwapError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr22(e) {
+function toKnownErr25(e) {
   if (e instanceof XRPCError) {
     if (e.error === "InvalidSwap")
       return new InvalidSwapError(e);
@@ -126232,7 +126558,7 @@ var InvalidSwapError2 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr23(e) {
+function toKnownErr26(e) {
   if (e instanceof XRPCError) {
     if (e.error === "InvalidSwap")
       return new InvalidSwapError2(e);
@@ -126246,7 +126572,7 @@ var InvalidSwapError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr24(e) {
+function toKnownErr27(e) {
   if (e instanceof XRPCError) {
     if (e.error === "InvalidSwap")
       return new InvalidSwapError3(e);
@@ -126255,21 +126581,21 @@ function toKnownErr24(e) {
 }
 
 // ../api/src/client/types/com/atproto/repo/describeRepo.ts
-function toKnownErr25(e) {
+function toKnownErr28(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/repo/getRecord.ts
-function toKnownErr26(e) {
+function toKnownErr29(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/repo/listRecords.ts
-function toKnownErr27(e) {
+function toKnownErr30(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126281,7 +126607,7 @@ var InvalidSwapError4 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr28(e) {
+function toKnownErr31(e) {
   if (e instanceof XRPCError) {
     if (e.error === "InvalidSwap")
       return new InvalidSwapError4(e);
@@ -126290,7 +126616,7 @@ function toKnownErr28(e) {
 }
 
 // ../api/src/client/types/com/atproto/repo/uploadBlob.ts
-function toKnownErr29(e) {
+function toKnownErr32(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126317,7 +126643,7 @@ var InvalidEmailError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr30(e) {
+function toKnownErr33(e) {
   if (e instanceof XRPCError) {
     if (e.error === "AccountNotFound")
       return new AccountNotFoundError(e);
@@ -126367,7 +126693,7 @@ var IncompatibleDidDocError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr31(e) {
+function toKnownErr34(e) {
   if (e instanceof XRPCError) {
     if (e.error === "InvalidHandle")
       return new InvalidHandleError2(e);
@@ -126393,7 +126719,7 @@ var AccountTakedownError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr32(e) {
+function toKnownErr35(e) {
   if (e instanceof XRPCError) {
     if (e.error === "AccountTakedown")
       return new AccountTakedownError(e);
@@ -126402,14 +126728,14 @@ function toKnownErr32(e) {
 }
 
 // ../api/src/client/types/com/atproto/server/createInviteCode.ts
-function toKnownErr33(e) {
+function toKnownErr36(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/server/createInviteCodes.ts
-function toKnownErr34(e) {
+function toKnownErr37(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126421,7 +126747,7 @@ var AccountTakedownError2 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr35(e) {
+function toKnownErr38(e) {
   if (e instanceof XRPCError) {
     if (e.error === "AccountTakedown")
       return new AccountTakedownError2(e);
@@ -126440,7 +126766,7 @@ var InvalidTokenError2 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr36(e) {
+function toKnownErr39(e) {
   if (e instanceof XRPCError) {
     if (e.error === "ExpiredToken")
       return new ExpiredTokenError2(e);
@@ -126451,14 +126777,14 @@ function toKnownErr36(e) {
 }
 
 // ../api/src/client/types/com/atproto/server/deleteSession.ts
-function toKnownErr37(e) {
+function toKnownErr40(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/server/describeServer.ts
-function toKnownErr38(e) {
+function toKnownErr41(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126470,7 +126796,7 @@ var DuplicateCreateError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr39(e) {
+function toKnownErr42(e) {
   if (e instanceof XRPCError) {
     if (e.error === "DuplicateCreate")
       return new DuplicateCreateError(e);
@@ -126479,7 +126805,7 @@ function toKnownErr39(e) {
 }
 
 // ../api/src/client/types/com/atproto/server/getSession.ts
-function toKnownErr40(e) {
+function toKnownErr43(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126491,7 +126817,7 @@ var AccountTakedownError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr41(e) {
+function toKnownErr44(e) {
   if (e instanceof XRPCError) {
     if (e.error === "AccountTakedown")
       return new AccountTakedownError3(e);
@@ -126505,7 +126831,7 @@ var AccountTakedownError4 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr42(e) {
+function toKnownErr45(e) {
   if (e instanceof XRPCError) {
     if (e.error === "AccountTakedown")
       return new AccountTakedownError4(e);
@@ -126514,28 +126840,35 @@ function toKnownErr42(e) {
 }
 
 // ../api/src/client/types/com/atproto/server/requestAccountDelete.ts
-function toKnownErr43(e) {
+function toKnownErr46(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
-function toKnownErr44(e) {
+function toKnownErr47(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/server/requestEmailUpdate.ts
-function toKnownErr45(e) {
+function toKnownErr48(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/server/requestPasswordReset.ts
-function toKnownErr46(e) {
+function toKnownErr49(e) {
+  if (e instanceof XRPCError) {
+  }
+  return e;
+}
+
+// ../api/src/client/types/com/atproto/server/reserveSigningKey.ts
+function toKnownErr50(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126552,7 +126885,7 @@ var InvalidTokenError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr47(e) {
+function toKnownErr51(e) {
   if (e instanceof XRPCError) {
     if (e.error === "ExpiredToken")
       return new ExpiredTokenError3(e);
@@ -126563,7 +126896,7 @@ function toKnownErr47(e) {
 }
 
 // ../api/src/client/types/com/atproto/server/revokeAppPassword.ts
-function toKnownErr48(e) {
+function toKnownErr52(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126585,7 +126918,7 @@ var TokenRequiredError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr49(e) {
+function toKnownErr53(e) {
   if (e instanceof XRPCError) {
     if (e.error === "ExpiredToken")
       return new ExpiredTokenError4(e);
@@ -126598,21 +126931,21 @@ function toKnownErr49(e) {
 }
 
 // ../api/src/client/types/com/atproto/sync/getBlob.ts
-function toKnownErr50(e) {
+function toKnownErr54(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/getBlocks.ts
-function toKnownErr51(e) {
+function toKnownErr55(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/getCheckout.ts
-function toKnownErr52(e) {
+function toKnownErr56(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126624,7 +126957,7 @@ var HeadNotFoundError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr53(e) {
+function toKnownErr57(e) {
   if (e instanceof XRPCError) {
     if (e.error === "HeadNotFound")
       return new HeadNotFoundError(e);
@@ -126636,14 +126969,14 @@ function toKnownErr53(e) {
 var getLatestCommit_exports = {};
 __export(getLatestCommit_exports, {
   RepoNotFoundError: () => RepoNotFoundError2,
-  toKnownErr: () => toKnownErr54
+  toKnownErr: () => toKnownErr58
 });
 var RepoNotFoundError2 = class extends XRPCError {
   constructor(src3) {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr54(e) {
+function toKnownErr58(e) {
   if (e instanceof XRPCError) {
     if (e.error === "RepoNotFound")
       return new RepoNotFoundError2(e);
@@ -126652,105 +126985,105 @@ function toKnownErr54(e) {
 }
 
 // ../api/src/client/types/com/atproto/sync/getRecord.ts
-function toKnownErr55(e) {
+function toKnownErr59(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/getRepo.ts
-function toKnownErr56(e) {
+function toKnownErr60(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/listBlobs.ts
-function toKnownErr57(e) {
+function toKnownErr61(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/listRepos.ts
-function toKnownErr58(e) {
+function toKnownErr62(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
-function toKnownErr59(e) {
+function toKnownErr63(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/com/atproto/sync/requestCrawl.ts
-function toKnownErr60(e) {
+function toKnownErr64(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/getPreferences.ts
-function toKnownErr61(e) {
+function toKnownErr65(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/getProfile.ts
-function toKnownErr62(e) {
+function toKnownErr66(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/getProfiles.ts
-function toKnownErr63(e) {
+function toKnownErr67(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/getSuggestions.ts
-function toKnownErr64(e) {
+function toKnownErr68(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/putPreferences.ts
-function toKnownErr65(e) {
+function toKnownErr69(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/searchActors.ts
-function toKnownErr66(e) {
+function toKnownErr70(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
-function toKnownErr67(e) {
+function toKnownErr71(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
-function toKnownErr68(e) {
+function toKnownErr72(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/feed/getActorFeeds.ts
-function toKnownErr69(e) {
+function toKnownErr73(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126767,7 +127100,7 @@ var BlockedByActorError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr70(e) {
+function toKnownErr74(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BlockedActor")
       return new BlockedActorError(e);
@@ -126788,7 +127121,7 @@ var BlockedByActorError2 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr71(e) {
+function toKnownErr75(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BlockedActor")
       return new BlockedActorError2(e);
@@ -126804,7 +127137,7 @@ var UnknownFeedError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr72(e) {
+function toKnownErr76(e) {
   if (e instanceof XRPCError) {
     if (e.error === "UnknownFeed")
       return new UnknownFeedError(e);
@@ -126813,14 +127146,14 @@ function toKnownErr72(e) {
 }
 
 // ../api/src/client/types/app/bsky/feed/getFeedGenerator.ts
-function toKnownErr73(e) {
+function toKnownErr77(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/feed/getFeedGenerators.ts
-function toKnownErr74(e) {
+function toKnownErr78(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126830,14 +127163,14 @@ function toKnownErr74(e) {
 var getFeedSkeleton_exports = {};
 __export(getFeedSkeleton_exports, {
   UnknownFeedError: () => UnknownFeedError2,
-  toKnownErr: () => toKnownErr75
+  toKnownErr: () => toKnownErr79
 });
 var UnknownFeedError2 = class extends XRPCError {
   constructor(src3) {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr75(e) {
+function toKnownErr79(e) {
   if (e instanceof XRPCError) {
     if (e.error === "UnknownFeed")
       return new UnknownFeedError2(e);
@@ -126846,7 +127179,7 @@ function toKnownErr75(e) {
 }
 
 // ../api/src/client/types/app/bsky/feed/getLikes.ts
-function toKnownErr76(e) {
+function toKnownErr80(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126858,7 +127191,7 @@ var UnknownListError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr77(e) {
+function toKnownErr81(e) {
   if (e instanceof XRPCError) {
     if (e.error === "UnknownList")
       return new UnknownListError(e);
@@ -126872,7 +127205,7 @@ var NotFoundError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr78(e) {
+function toKnownErr82(e) {
   if (e instanceof XRPCError) {
     if (e.error === "NotFound")
       return new NotFoundError(e);
@@ -126881,28 +127214,28 @@ function toKnownErr78(e) {
 }
 
 // ../api/src/client/types/app/bsky/feed/getPosts.ts
-function toKnownErr79(e) {
+function toKnownErr83(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/feed/getRepostedBy.ts
-function toKnownErr80(e) {
+function toKnownErr84(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
-function toKnownErr81(e) {
+function toKnownErr85(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/feed/getTimeline.ts
-function toKnownErr82(e) {
+function toKnownErr86(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -126914,7 +127247,7 @@ var BadQueryStringError = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr83(e) {
+function toKnownErr87(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError(e);
@@ -126923,133 +127256,133 @@ function toKnownErr83(e) {
 }
 
 // ../api/src/client/types/app/bsky/graph/getBlocks.ts
-function toKnownErr84(e) {
+function toKnownErr88(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getFollowers.ts
-function toKnownErr85(e) {
+function toKnownErr89(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getFollows.ts
-function toKnownErr86(e) {
+function toKnownErr90(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getList.ts
-function toKnownErr87(e) {
+function toKnownErr91(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getListBlocks.ts
-function toKnownErr88(e) {
+function toKnownErr92(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getListMutes.ts
-function toKnownErr89(e) {
+function toKnownErr93(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getLists.ts
-function toKnownErr90(e) {
+function toKnownErr94(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getMutes.ts
-function toKnownErr91(e) {
+function toKnownErr95(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
-function toKnownErr92(e) {
+function toKnownErr96(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/muteActor.ts
-function toKnownErr93(e) {
+function toKnownErr97(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/muteActorList.ts
-function toKnownErr94(e) {
+function toKnownErr98(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/unmuteActor.ts
-function toKnownErr95(e) {
+function toKnownErr99(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/graph/unmuteActorList.ts
-function toKnownErr96(e) {
+function toKnownErr100(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/notification/getUnreadCount.ts
-function toKnownErr97(e) {
+function toKnownErr101(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/notification/listNotifications.ts
-function toKnownErr98(e) {
+function toKnownErr102(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/notification/registerPush.ts
-function toKnownErr99(e) {
+function toKnownErr103(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/notification/updateSeen.ts
-function toKnownErr100(e) {
+function toKnownErr104(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/unspecced/getPopular.ts
-function toKnownErr101(e) {
+function toKnownErr105(e) {
   if (e instanceof XRPCError) {
   }
   return e;
 }
 
 // ../api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
-function toKnownErr102(e) {
+function toKnownErr106(e) {
   if (e instanceof XRPCError) {
   }
   return e;
@@ -127061,7 +127394,7 @@ var UnknownFeedError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr103(e) {
+function toKnownErr107(e) {
   if (e instanceof XRPCError) {
     if (e.error === "UnknownFeed")
       return new UnknownFeedError3(e);
@@ -127075,7 +127408,7 @@ var BadQueryStringError2 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr104(e) {
+function toKnownErr108(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError2(e);
@@ -127089,7 +127422,7 @@ var BadQueryStringError3 = class extends XRPCError {
     super(src3.status, src3.error, src3.message, src3.headers);
   }
 };
-function toKnownErr105(e) {
+function toKnownErr109(e) {
   if (e instanceof XRPCError) {
     if (e.error === "BadQueryString")
       return new BadQueryStringError3(e);
@@ -127155,74 +127488,89 @@ var AdminNS = class {
       throw toKnownErr3(e);
     });
   }
+  getAccountInfo(params2, opts) {
+    return this._service.xrpc.call("com.atproto.admin.getAccountInfo", params2, void 0, opts).catch((e) => {
+      throw toKnownErr4(e);
+    });
+  }
   getInviteCodes(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getInviteCodes", params2, void 0, opts).catch((e) => {
-      throw toKnownErr4(e);
+      throw toKnownErr5(e);
     });
   }
   getModerationAction(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getModerationAction", params2, void 0, opts).catch((e) => {
-      throw toKnownErr5(e);
+      throw toKnownErr6(e);
     });
   }
   getModerationActions(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getModerationActions", params2, void 0, opts).catch((e) => {
-      throw toKnownErr6(e);
+      throw toKnownErr7(e);
     });
   }
   getModerationReport(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getModerationReport", params2, void 0, opts).catch((e) => {
-      throw toKnownErr7(e);
+      throw toKnownErr8(e);
     });
   }
   getModerationReports(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getModerationReports", params2, void 0, opts).catch((e) => {
-      throw toKnownErr8(e);
+      throw toKnownErr9(e);
     });
   }
   getRecord(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getRecord", params2, void 0, opts).catch((e) => {
-      throw toKnownErr9(e);
+      throw toKnownErr10(e);
     });
   }
   getRepo(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.getRepo", params2, void 0, opts).catch((e) => {
-      throw toKnownErr10(e);
+      throw toKnownErr11(e);
+    });
+  }
+  getSubjectStatus(params2, opts) {
+    return this._service.xrpc.call("com.atproto.admin.getSubjectStatus", params2, void 0, opts).catch((e) => {
+      throw toKnownErr12(e);
     });
   }
   resolveModerationReports(data, opts) {
     return this._service.xrpc.call("com.atproto.admin.resolveModerationReports", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr11(e);
+      throw toKnownErr13(e);
     });
   }
   reverseModerationAction(data, opts) {
     return this._service.xrpc.call("com.atproto.admin.reverseModerationAction", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr12(e);
+      throw toKnownErr14(e);
     });
   }
   searchRepos(params2, opts) {
     return this._service.xrpc.call("com.atproto.admin.searchRepos", params2, void 0, opts).catch((e) => {
-      throw toKnownErr13(e);
+      throw toKnownErr15(e);
     });
   }
   sendEmail(data, opts) {
     return this._service.xrpc.call("com.atproto.admin.sendEmail", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr14(e);
+      throw toKnownErr16(e);
     });
   }
   takeModerationAction(data, opts) {
     return this._service.xrpc.call("com.atproto.admin.takeModerationAction", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr15(e);
+      throw toKnownErr17(e);
     });
   }
   updateAccountEmail(data, opts) {
     return this._service.xrpc.call("com.atproto.admin.updateAccountEmail", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr16(e);
+      throw toKnownErr18(e);
     });
   }
   updateAccountHandle(data, opts) {
     return this._service.xrpc.call("com.atproto.admin.updateAccountHandle", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr17(e);
+      throw toKnownErr19(e);
+    });
+  }
+  updateSubjectStatus(data, opts) {
+    return this._service.xrpc.call("com.atproto.admin.updateSubjectStatus", opts?.qp, data, opts).catch((e) => {
+      throw toKnownErr20(e);
     });
   }
 };
@@ -127232,12 +127580,12 @@ var IdentityNS = class {
   }
   resolveHandle(params2, opts) {
     return this._service.xrpc.call("com.atproto.identity.resolveHandle", params2, void 0, opts).catch((e) => {
-      throw toKnownErr18(e);
+      throw toKnownErr21(e);
     });
   }
   updateHandle(data, opts) {
     return this._service.xrpc.call("com.atproto.identity.updateHandle", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr19(e);
+      throw toKnownErr22(e);
     });
   }
 };
@@ -127247,7 +127595,7 @@ var LabelNS = class {
   }
   queryLabels(params2, opts) {
     return this._service.xrpc.call("com.atproto.label.queryLabels", params2, void 0, opts).catch((e) => {
-      throw toKnownErr20(e);
+      throw toKnownErr23(e);
     });
   }
 };
@@ -127257,7 +127605,7 @@ var ModerationNS = class {
   }
   createReport(data, opts) {
     return this._service.xrpc.call("com.atproto.moderation.createReport", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr21(e);
+      throw toKnownErr24(e);
     });
   }
 };
@@ -127267,42 +127615,42 @@ var RepoNS = class {
   }
   applyWrites(data, opts) {
     return this._service.xrpc.call("com.atproto.repo.applyWrites", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr22(e);
+      throw toKnownErr25(e);
     });
   }
   createRecord(data, opts) {
     return this._service.xrpc.call("com.atproto.repo.createRecord", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr23(e);
+      throw toKnownErr26(e);
     });
   }
   deleteRecord(data, opts) {
     return this._service.xrpc.call("com.atproto.repo.deleteRecord", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr24(e);
+      throw toKnownErr27(e);
     });
   }
   describeRepo(params2, opts) {
     return this._service.xrpc.call("com.atproto.repo.describeRepo", params2, void 0, opts).catch((e) => {
-      throw toKnownErr25(e);
+      throw toKnownErr28(e);
     });
   }
   getRecord(params2, opts) {
     return this._service.xrpc.call("com.atproto.repo.getRecord", params2, void 0, opts).catch((e) => {
-      throw toKnownErr26(e);
+      throw toKnownErr29(e);
     });
   }
   listRecords(params2, opts) {
     return this._service.xrpc.call("com.atproto.repo.listRecords", params2, void 0, opts).catch((e) => {
-      throw toKnownErr27(e);
+      throw toKnownErr30(e);
     });
   }
   putRecord(data, opts) {
     return this._service.xrpc.call("com.atproto.repo.putRecord", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr28(e);
+      throw toKnownErr31(e);
     });
   }
   uploadBlob(data, opts) {
     return this._service.xrpc.call("com.atproto.repo.uploadBlob", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr29(e);
+      throw toKnownErr32(e);
     });
   }
 };
@@ -127312,102 +127660,107 @@ var ServerNS = class {
   }
   confirmEmail(data, opts) {
     return this._service.xrpc.call("com.atproto.server.confirmEmail", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr30(e);
+      throw toKnownErr33(e);
     });
   }
   createAccount(data, opts) {
     return this._service.xrpc.call("com.atproto.server.createAccount", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr31(e);
+      throw toKnownErr34(e);
     });
   }
   createAppPassword(data, opts) {
     return this._service.xrpc.call("com.atproto.server.createAppPassword", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr32(e);
+      throw toKnownErr35(e);
     });
   }
   createInviteCode(data, opts) {
     return this._service.xrpc.call("com.atproto.server.createInviteCode", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr33(e);
+      throw toKnownErr36(e);
     });
   }
   createInviteCodes(data, opts) {
     return this._service.xrpc.call("com.atproto.server.createInviteCodes", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr34(e);
+      throw toKnownErr37(e);
     });
   }
   createSession(data, opts) {
     return this._service.xrpc.call("com.atproto.server.createSession", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr35(e);
+      throw toKnownErr38(e);
     });
   }
   deleteAccount(data, opts) {
     return this._service.xrpc.call("com.atproto.server.deleteAccount", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr36(e);
+      throw toKnownErr39(e);
     });
   }
   deleteSession(data, opts) {
     return this._service.xrpc.call("com.atproto.server.deleteSession", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr37(e);
+      throw toKnownErr40(e);
     });
   }
   describeServer(params2, opts) {
     return this._service.xrpc.call("com.atproto.server.describeServer", params2, void 0, opts).catch((e) => {
-      throw toKnownErr38(e);
+      throw toKnownErr41(e);
     });
   }
   getAccountInviteCodes(params2, opts) {
     return this._service.xrpc.call("com.atproto.server.getAccountInviteCodes", params2, void 0, opts).catch((e) => {
-      throw toKnownErr39(e);
+      throw toKnownErr42(e);
     });
   }
   getSession(params2, opts) {
     return this._service.xrpc.call("com.atproto.server.getSession", params2, void 0, opts).catch((e) => {
-      throw toKnownErr40(e);
+      throw toKnownErr43(e);
     });
   }
   listAppPasswords(params2, opts) {
     return this._service.xrpc.call("com.atproto.server.listAppPasswords", params2, void 0, opts).catch((e) => {
-      throw toKnownErr41(e);
+      throw toKnownErr44(e);
     });
   }
   refreshSession(data, opts) {
     return this._service.xrpc.call("com.atproto.server.refreshSession", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr42(e);
+      throw toKnownErr45(e);
     });
   }
   requestAccountDelete(data, opts) {
     return this._service.xrpc.call("com.atproto.server.requestAccountDelete", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr43(e);
+      throw toKnownErr46(e);
     });
   }
   requestEmailConfirmation(data, opts) {
     return this._service.xrpc.call("com.atproto.server.requestEmailConfirmation", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr44(e);
+      throw toKnownErr47(e);
     });
   }
   requestEmailUpdate(data, opts) {
     return this._service.xrpc.call("com.atproto.server.requestEmailUpdate", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr45(e);
+      throw toKnownErr48(e);
     });
   }
   requestPasswordReset(data, opts) {
     return this._service.xrpc.call("com.atproto.server.requestPasswordReset", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr46(e);
+      throw toKnownErr49(e);
+    });
+  }
+  reserveSigningKey(data, opts) {
+    return this._service.xrpc.call("com.atproto.server.reserveSigningKey", opts?.qp, data, opts).catch((e) => {
+      throw toKnownErr50(e);
     });
   }
   resetPassword(data, opts) {
     return this._service.xrpc.call("com.atproto.server.resetPassword", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr47(e);
+      throw toKnownErr51(e);
     });
   }
   revokeAppPassword(data, opts) {
     return this._service.xrpc.call("com.atproto.server.revokeAppPassword", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr48(e);
+      throw toKnownErr52(e);
     });
   }
   updateEmail(data, opts) {
     return this._service.xrpc.call("com.atproto.server.updateEmail", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr49(e);
+      throw toKnownErr53(e);
     });
   }
 };
@@ -127417,57 +127770,57 @@ var SyncNS = class {
   }
   getBlob(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getBlob", params2, void 0, opts).catch((e) => {
-      throw toKnownErr50(e);
+      throw toKnownErr54(e);
     });
   }
   getBlocks(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getBlocks", params2, void 0, opts).catch((e) => {
-      throw toKnownErr51(e);
+      throw toKnownErr55(e);
     });
   }
   getCheckout(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getCheckout", params2, void 0, opts).catch((e) => {
-      throw toKnownErr52(e);
+      throw toKnownErr56(e);
     });
   }
   getHead(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getHead", params2, void 0, opts).catch((e) => {
-      throw toKnownErr53(e);
+      throw toKnownErr57(e);
     });
   }
   getLatestCommit(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getLatestCommit", params2, void 0, opts).catch((e) => {
-      throw toKnownErr54(e);
+      throw toKnownErr58(e);
     });
   }
   getRecord(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getRecord", params2, void 0, opts).catch((e) => {
-      throw toKnownErr55(e);
+      throw toKnownErr59(e);
     });
   }
   getRepo(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.getRepo", params2, void 0, opts).catch((e) => {
-      throw toKnownErr56(e);
+      throw toKnownErr60(e);
     });
   }
   listBlobs(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.listBlobs", params2, void 0, opts).catch((e) => {
-      throw toKnownErr57(e);
+      throw toKnownErr61(e);
     });
   }
   listRepos(params2, opts) {
     return this._service.xrpc.call("com.atproto.sync.listRepos", params2, void 0, opts).catch((e) => {
-      throw toKnownErr58(e);
+      throw toKnownErr62(e);
     });
   }
   notifyOfUpdate(data, opts) {
     return this._service.xrpc.call("com.atproto.sync.notifyOfUpdate", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr59(e);
+      throw toKnownErr63(e);
     });
   }
   requestCrawl(data, opts) {
     return this._service.xrpc.call("com.atproto.sync.requestCrawl", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr60(e);
+      throw toKnownErr64(e);
     });
   }
 };
@@ -127496,37 +127849,37 @@ var ActorNS = class {
   }
   getPreferences(params2, opts) {
     return this._service.xrpc.call("app.bsky.actor.getPreferences", params2, void 0, opts).catch((e) => {
-      throw toKnownErr61(e);
+      throw toKnownErr65(e);
     });
   }
   getProfile(params2, opts) {
     return this._service.xrpc.call("app.bsky.actor.getProfile", params2, void 0, opts).catch((e) => {
-      throw toKnownErr62(e);
+      throw toKnownErr66(e);
     });
   }
   getProfiles(params2, opts) {
     return this._service.xrpc.call("app.bsky.actor.getProfiles", params2, void 0, opts).catch((e) => {
-      throw toKnownErr63(e);
+      throw toKnownErr67(e);
     });
   }
   getSuggestions(params2, opts) {
     return this._service.xrpc.call("app.bsky.actor.getSuggestions", params2, void 0, opts).catch((e) => {
-      throw toKnownErr64(e);
+      throw toKnownErr68(e);
     });
   }
   putPreferences(data, opts) {
     return this._service.xrpc.call("app.bsky.actor.putPreferences", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr65(e);
+      throw toKnownErr69(e);
     });
   }
   searchActors(params2, opts) {
     return this._service.xrpc.call("app.bsky.actor.searchActors", params2, void 0, opts).catch((e) => {
-      throw toKnownErr66(e);
+      throw toKnownErr70(e);
     });
   }
   searchActorsTypeahead(params2, opts) {
     return this._service.xrpc.call("app.bsky.actor.searchActorsTypeahead", params2, void 0, opts).catch((e) => {
-      throw toKnownErr67(e);
+      throw toKnownErr71(e);
     });
   }
 };
@@ -127573,82 +127926,82 @@ var FeedNS = class {
   }
   describeFeedGenerator(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.describeFeedGenerator", params2, void 0, opts).catch((e) => {
-      throw toKnownErr68(e);
+      throw toKnownErr72(e);
     });
   }
   getActorFeeds(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getActorFeeds", params2, void 0, opts).catch((e) => {
-      throw toKnownErr69(e);
+      throw toKnownErr73(e);
     });
   }
   getActorLikes(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getActorLikes", params2, void 0, opts).catch((e) => {
-      throw toKnownErr70(e);
+      throw toKnownErr74(e);
     });
   }
   getAuthorFeed(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getAuthorFeed", params2, void 0, opts).catch((e) => {
-      throw toKnownErr71(e);
+      throw toKnownErr75(e);
     });
   }
   getFeed(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getFeed", params2, void 0, opts).catch((e) => {
-      throw toKnownErr72(e);
+      throw toKnownErr76(e);
     });
   }
   getFeedGenerator(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getFeedGenerator", params2, void 0, opts).catch((e) => {
-      throw toKnownErr73(e);
+      throw toKnownErr77(e);
     });
   }
   getFeedGenerators(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getFeedGenerators", params2, void 0, opts).catch((e) => {
-      throw toKnownErr74(e);
+      throw toKnownErr78(e);
     });
   }
   getFeedSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getFeedSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr75(e);
+      throw toKnownErr79(e);
     });
   }
   getLikes(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getLikes", params2, void 0, opts).catch((e) => {
-      throw toKnownErr76(e);
+      throw toKnownErr80(e);
     });
   }
   getListFeed(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getListFeed", params2, void 0, opts).catch((e) => {
-      throw toKnownErr77(e);
+      throw toKnownErr81(e);
     });
   }
   getPostThread(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getPostThread", params2, void 0, opts).catch((e) => {
-      throw toKnownErr78(e);
+      throw toKnownErr82(e);
     });
   }
   getPosts(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getPosts", params2, void 0, opts).catch((e) => {
-      throw toKnownErr79(e);
+      throw toKnownErr83(e);
     });
   }
   getRepostedBy(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getRepostedBy", params2, void 0, opts).catch((e) => {
-      throw toKnownErr80(e);
+      throw toKnownErr84(e);
     });
   }
   getSuggestedFeeds(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getSuggestedFeeds", params2, void 0, opts).catch((e) => {
-      throw toKnownErr81(e);
+      throw toKnownErr85(e);
     });
   }
   getTimeline(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.getTimeline", params2, void 0, opts).catch((e) => {
-      throw toKnownErr82(e);
+      throw toKnownErr86(e);
     });
   }
   searchPosts(params2, opts) {
     return this._service.xrpc.call("app.bsky.feed.searchPosts", params2, void 0, opts).catch((e) => {
-      throw toKnownErr83(e);
+      throw toKnownErr87(e);
     });
   }
 };
@@ -127798,67 +128151,67 @@ var GraphNS = class {
   }
   getBlocks(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getBlocks", params2, void 0, opts).catch((e) => {
-      throw toKnownErr84(e);
+      throw toKnownErr88(e);
     });
   }
   getFollowers(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getFollowers", params2, void 0, opts).catch((e) => {
-      throw toKnownErr85(e);
+      throw toKnownErr89(e);
     });
   }
   getFollows(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getFollows", params2, void 0, opts).catch((e) => {
-      throw toKnownErr86(e);
+      throw toKnownErr90(e);
     });
   }
   getList(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getList", params2, void 0, opts).catch((e) => {
-      throw toKnownErr87(e);
+      throw toKnownErr91(e);
     });
   }
   getListBlocks(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getListBlocks", params2, void 0, opts).catch((e) => {
-      throw toKnownErr88(e);
+      throw toKnownErr92(e);
     });
   }
   getListMutes(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getListMutes", params2, void 0, opts).catch((e) => {
-      throw toKnownErr89(e);
+      throw toKnownErr93(e);
     });
   }
   getLists(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getLists", params2, void 0, opts).catch((e) => {
-      throw toKnownErr90(e);
+      throw toKnownErr94(e);
     });
   }
   getMutes(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getMutes", params2, void 0, opts).catch((e) => {
-      throw toKnownErr91(e);
+      throw toKnownErr95(e);
     });
   }
   getSuggestedFollowsByActor(params2, opts) {
     return this._service.xrpc.call("app.bsky.graph.getSuggestedFollowsByActor", params2, void 0, opts).catch((e) => {
-      throw toKnownErr92(e);
+      throw toKnownErr96(e);
     });
   }
   muteActor(data, opts) {
     return this._service.xrpc.call("app.bsky.graph.muteActor", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr93(e);
+      throw toKnownErr97(e);
     });
   }
   muteActorList(data, opts) {
     return this._service.xrpc.call("app.bsky.graph.muteActorList", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr94(e);
+      throw toKnownErr98(e);
     });
   }
   unmuteActor(data, opts) {
     return this._service.xrpc.call("app.bsky.graph.unmuteActor", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr95(e);
+      throw toKnownErr99(e);
     });
   }
   unmuteActorList(data, opts) {
     return this._service.xrpc.call("app.bsky.graph.unmuteActorList", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr96(e);
+      throw toKnownErr100(e);
     });
   }
 };
@@ -128003,22 +128356,22 @@ var NotificationNS = class {
   }
   getUnreadCount(params2, opts) {
     return this._service.xrpc.call("app.bsky.notification.getUnreadCount", params2, void 0, opts).catch((e) => {
-      throw toKnownErr97(e);
+      throw toKnownErr101(e);
     });
   }
   listNotifications(params2, opts) {
     return this._service.xrpc.call("app.bsky.notification.listNotifications", params2, void 0, opts).catch((e) => {
-      throw toKnownErr98(e);
+      throw toKnownErr102(e);
     });
   }
   registerPush(data, opts) {
     return this._service.xrpc.call("app.bsky.notification.registerPush", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr99(e);
+      throw toKnownErr103(e);
     });
   }
   updateSeen(data, opts) {
     return this._service.xrpc.call("app.bsky.notification.updateSeen", opts?.qp, data, opts).catch((e) => {
-      throw toKnownErr100(e);
+      throw toKnownErr104(e);
     });
   }
 };
@@ -128033,27 +128386,27 @@ var UnspeccedNS = class {
   }
   getPopular(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.getPopular", params2, void 0, opts).catch((e) => {
-      throw toKnownErr101(e);
+      throw toKnownErr105(e);
     });
   }
   getPopularFeedGenerators(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.getPopularFeedGenerators", params2, void 0, opts).catch((e) => {
-      throw toKnownErr102(e);
+      throw toKnownErr106(e);
     });
   }
   getTimelineSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.getTimelineSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr103(e);
+      throw toKnownErr107(e);
     });
   }
   searchActorsSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.searchActorsSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr104(e);
+      throw toKnownErr108(e);
     });
   }
   searchPostsSkeleton(params2, opts) {
     return this._service.xrpc.call("app.bsky.unspecced.searchPostsSkeleton", params2, void 0, opts).catch((e) => {
-      throw toKnownErr105(e);
+      throw toKnownErr109(e);
     });
   }
 };
@@ -128100,6 +128453,7 @@ var _AtpAgent = class {
         email: opts.email,
         emailConfirmed: false
       };
+      this._updateApiEndpoint(res.data.didDoc);
       return res;
     } catch (e) {
       this.session = void 0;
@@ -128126,6 +128480,7 @@ var _AtpAgent = class {
         email: res.data.email,
         emailConfirmed: res.data.emailConfirmed
       };
+      this._updateApiEndpoint(res.data.didDoc);
       return res;
     } catch (e) {
       this.session = void 0;
@@ -128199,7 +128554,7 @@ var _AtpAgent = class {
     if (!this.session?.refreshJwt) {
       return;
     }
-    const url = new URL(this.service.origin);
+    const url = new URL((this.pdsUrl || this.service).origin);
     url.pathname = `/xrpc/${REFRESH_SESSION}`;
     const res = await _AtpAgent.fetch(url.toString(), "POST", {
       authorization: `Bearer ${this.session.refreshJwt}`
@@ -128215,9 +128570,17 @@ var _AtpAgent = class {
         handle: res.body.handle,
         did: res.body.did
       };
+      this._updateApiEndpoint(res.body.didDoc);
       this._persistSession?.("update", this.session);
     }
   }
+  _updateApiEndpoint(didDoc) {
+    if (isValidDidDoc(didDoc)) {
+      const endpoint = getPdsEndpoint(didDoc);
+      this.pdsUrl = endpoint ? new URL(endpoint) : void 0;
+    }
+    this.api.xrpc.uri = this.pdsUrl || this.service;
+  }
 };
 var AtpAgent = _AtpAgent;
 AtpAgent.fetch = defaultFetchHandler;
@@ -129238,7 +129601,7 @@ var skeletonFromFeedGen = async (ctx, params2) => {
   if (!resolved) {
     throw new InvalidRequestError(`could not resolve did document: ${feedDid}`);
   }
-  const fgEndpoint = getFeedGen(resolved);
+  const fgEndpoint = getFeedGenEndpoint(resolved);
   if (!fgEndpoint) {
     throw new InvalidRequestError(`invalid feed generator service details in did document: ${feedDid}`);
   }
@@ -129313,7 +129676,7 @@ function getFeedGenerator_default(server, ctx) {
       if (!resolved) {
         throw new InvalidRequestError(`could not resolve did document: ${feedDid}`);
       }
-      const fgEndpoint = getFeedGen(resolved);
+      const fgEndpoint = getFeedGenEndpoint(resolved);
       if (!fgEndpoint) {
         throw new InvalidRequestError(`invalid feed generator service details in did document: ${feedDid}`);
       }
@@ -129563,6 +129926,18 @@ var schemaDict2 = {
     lexicon: 1,
     id: "com.atproto.admin.defs",
     defs: {
+      statusAttr: {
+        type: "object",
+        required: ["applied"],
+        properties: {
+          applied: {
+            type: "boolean"
+          },
+          ref: {
+            type: "string"
+          }
+        }
+      },
       actionView: {
         type: "object",
         required: [
@@ -129972,6 +130347,44 @@ var schemaDict2 = {
           }
         }
       },
+      accountView: {
+        type: "object",
+        required: ["did", "handle", "indexedAt"],
+        properties: {
+          did: {
+            type: "string",
+            format: "did"
+          },
+          handle: {
+            type: "string",
+            format: "handle"
+          },
+          email: {
+            type: "string"
+          },
+          indexedAt: {
+            type: "string",
+            format: "datetime"
+          },
+          invitedBy: {
+            type: "ref",
+            ref: "lex:com.atproto.server.defs#inviteCode"
+          },
+          invites: {
+            type: "array",
+            items: {
+              type: "ref",
+              ref: "lex:com.atproto.server.defs#inviteCode"
+            }
+          },
+          invitesDisabled: {
+            type: "boolean"
+          },
+          inviteNote: {
+            type: "string"
+          }
+        }
+      },
       repoViewNotFound: {
         type: "object",
         required: ["did"],
@@ -129992,6 +130405,24 @@ var schemaDict2 = {
           }
         }
       },
+      repoBlobRef: {
+        type: "object",
+        required: ["did", "cid"],
+        properties: {
+          did: {
+            type: "string",
+            format: "did"
+          },
+          cid: {
+            type: "string",
+            format: "cid"
+          },
+          recordUri: {
+            type: "string",
+            format: "at-uri"
+          }
+        }
+      },
       recordView: {
         type: "object",
         required: [
@@ -130274,6 +130705,33 @@ var schemaDict2 = {
       }
     }
   },
+  ComAtprotoAdminGetAccountInfo: {
+    lexicon: 1,
+    id: "com.atproto.admin.getAccountInfo",
+    defs: {
+      main: {
+        type: "query",
+        description: "View details about an account.",
+        parameters: {
+          type: "params",
+          required: ["did"],
+          properties: {
+            did: {
+              type: "string",
+              format: "did"
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "ref",
+            ref: "lex:com.atproto.admin.defs#accountView"
+          }
+        }
+      }
+    }
+  },
   ComAtprotoAdminGetInviteCodes: {
     lexicon: 1,
     id: "com.atproto.admin.getInviteCodes",
@@ -130568,6 +131026,54 @@ var schemaDict2 = {
       }
     }
   },
+  ComAtprotoAdminGetSubjectStatus: {
+    lexicon: 1,
+    id: "com.atproto.admin.getSubjectStatus",
+    defs: {
+      main: {
+        type: "query",
+        description: "Fetch the service-specific the admin status of a subject (account, record, or blob)",
+        parameters: {
+          type: "params",
+          properties: {
+            did: {
+              type: "string",
+              format: "did"
+            },
+            uri: {
+              type: "string",
+              format: "at-uri"
+            },
+            blob: {
+              type: "string",
+              format: "cid"
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["subject"],
+            properties: {
+              subject: {
+                type: "union",
+                refs: [
+                  "lex:com.atproto.admin.defs#repoRef",
+                  "lex:com.atproto.repo.strongRef",
+                  "lex:com.atproto.admin.defs#repoBlobRef"
+                ]
+              },
+              takedown: {
+                type: "ref",
+                ref: "lex:com.atproto.admin.defs#statusAttr"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   ComAtprotoAdminResolveModerationReports: {
     lexicon: 1,
     id: "com.atproto.admin.resolveModerationReports",
@@ -130660,9 +131166,6 @@ var schemaDict2 = {
             q: {
               type: "string"
             },
-            invitedBy: {
-              type: "string"
-            },
             limit: {
               type: "integer",
               minimum: 1,
@@ -130867,6 +131370,58 @@ var schemaDict2 = {
       }
     }
   },
+  ComAtprotoAdminUpdateSubjectStatus: {
+    lexicon: 1,
+    id: "com.atproto.admin.updateSubjectStatus",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Update the service-specific admin status of a subject (account, record, or blob)",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["subject"],
+            properties: {
+              subject: {
+                type: "union",
+                refs: [
+                  "lex:com.atproto.admin.defs#repoRef",
+                  "lex:com.atproto.repo.strongRef",
+                  "lex:com.atproto.admin.defs#repoBlobRef"
+                ]
+              },
+              takedown: {
+                type: "ref",
+                ref: "lex:com.atproto.admin.defs#statusAttr"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["subject"],
+            properties: {
+              subject: {
+                type: "union",
+                refs: [
+                  "lex:com.atproto.admin.defs#repoRef",
+                  "lex:com.atproto.repo.strongRef",
+                  "lex:com.atproto.admin.defs#repoBlobRef"
+                ]
+              },
+              takedown: {
+                type: "ref",
+                ref: "lex:com.atproto.admin.defs#statusAttr"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   ComAtprotoIdentityResolveHandle: {
     lexicon: 1,
     id: "com.atproto.identity.resolveHandle",
@@ -131164,7 +131719,9 @@ var schemaDict2 = {
                 ref: "lex:com.atproto.moderation.defs#reasonType"
               },
               reason: {
-                type: "string"
+                type: "string",
+                maxGraphemes: 2e3,
+                maxLength: 2e4
               },
               subject: {
                 type: "union",
@@ -131813,7 +132370,7 @@ var schemaDict2 = {
           encoding: "application/json",
           schema: {
             type: "object",
-            required: ["handle", "email", "password"],
+            required: ["handle"],
             properties: {
               email: {
                 type: "string"
@@ -131834,6 +132391,236 @@ var schemaDict2 = {
               },
               recoveryKey: {
                 type: "string"
+              },
+              plcOp: {
+                type: "unknown"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["accessJwt", "refreshJwt", "handle", "did"],
+            properties: {
+              accessJwt: {
+                type: "string"
+              },
+              refreshJwt: {
+                type: "string"
+              },
+              handle: {
+                type: "string",
+                format: "handle"
+              },
+              did: {
+                type: "string",
+                format: "did"
+              },
+              didDoc: {
+                type: "unknown"
+              }
+            }
+          }
+        },
+        errors: [
+          {
+            name: "InvalidHandle"
+          },
+          {
+            name: "InvalidPassword"
+          },
+          {
+            name: "InvalidInviteCode"
+          },
+          {
+            name: "HandleNotAvailable"
+          },
+          {
+            name: "UnsupportedDomain"
+          },
+          {
+            name: "UnresolvableDid"
+          },
+          {
+            name: "IncompatibleDidDoc"
+          }
+        ]
+      }
+    }
+  },
+  ComAtprotoServerCreateAppPassword: {
+    lexicon: 1,
+    id: "com.atproto.server.createAppPassword",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Create an app-specific password.",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["name"],
+            properties: {
+              name: {
+                type: "string"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "ref",
+            ref: "lex:com.atproto.server.createAppPassword#appPassword"
+          }
+        },
+        errors: [
+          {
+            name: "AccountTakedown"
+          }
+        ]
+      },
+      appPassword: {
+        type: "object",
+        required: ["name", "password", "createdAt"],
+        properties: {
+          name: {
+            type: "string"
+          },
+          password: {
+            type: "string"
+          },
+          createdAt: {
+            type: "string",
+            format: "datetime"
+          }
+        }
+      }
+    }
+  },
+  ComAtprotoServerCreateInviteCode: {
+    lexicon: 1,
+    id: "com.atproto.server.createInviteCode",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Create an invite code.",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["useCount"],
+            properties: {
+              useCount: {
+                type: "integer"
+              },
+              forAccount: {
+                type: "string",
+                format: "did"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["code"],
+            properties: {
+              code: {
+                type: "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  ComAtprotoServerCreateInviteCodes: {
+    lexicon: 1,
+    id: "com.atproto.server.createInviteCodes",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Create an invite code.",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["codeCount", "useCount"],
+            properties: {
+              codeCount: {
+                type: "integer",
+                default: 1
+              },
+              useCount: {
+                type: "integer"
+              },
+              forAccounts: {
+                type: "array",
+                items: {
+                  type: "string",
+                  format: "did"
+                }
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["codes"],
+            properties: {
+              codes: {
+                type: "array",
+                items: {
+                  type: "ref",
+                  ref: "lex:com.atproto.server.createInviteCodes#accountCodes"
+                }
+              }
+            }
+          }
+        }
+      },
+      accountCodes: {
+        type: "object",
+        required: ["account", "codes"],
+        properties: {
+          account: {
+            type: "string"
+          },
+          codes: {
+            type: "array",
+            items: {
+              type: "string"
+            }
+          }
+        }
+      }
+    }
+  },
+  ComAtprotoServerCreateSession: {
+    lexicon: 1,
+    id: "com.atproto.server.createSession",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Create an authentication session.",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["identifier", "password"],
+            properties: {
+              identifier: {
+                type: "string",
+                description: "Handle or other identifier supported by the server for the authenticating user."
+              },
+              password: {
+                type: "string"
               }
             }
           }
@@ -131857,230 +132644,9 @@ var schemaDict2 = {
               did: {
                 type: "string",
                 format: "did"
-              }
-            }
-          }
-        },
-        errors: [
-          {
-            name: "InvalidHandle"
-          },
-          {
-            name: "InvalidPassword"
-          },
-          {
-            name: "InvalidInviteCode"
-          },
-          {
-            name: "HandleNotAvailable"
-          },
-          {
-            name: "UnsupportedDomain"
-          },
-          {
-            name: "UnresolvableDid"
-          },
-          {
-            name: "IncompatibleDidDoc"
-          }
-        ]
-      }
-    }
-  },
-  ComAtprotoServerCreateAppPassword: {
-    lexicon: 1,
-    id: "com.atproto.server.createAppPassword",
-    defs: {
-      main: {
-        type: "procedure",
-        description: "Create an app-specific password.",
-        input: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["name"],
-            properties: {
-              name: {
-                type: "string"
-              }
-            }
-          }
-        },
-        output: {
-          encoding: "application/json",
-          schema: {
-            type: "ref",
-            ref: "lex:com.atproto.server.createAppPassword#appPassword"
-          }
-        },
-        errors: [
-          {
-            name: "AccountTakedown"
-          }
-        ]
-      },
-      appPassword: {
-        type: "object",
-        required: ["name", "password", "createdAt"],
-        properties: {
-          name: {
-            type: "string"
-          },
-          password: {
-            type: "string"
-          },
-          createdAt: {
-            type: "string",
-            format: "datetime"
-          }
-        }
-      }
-    }
-  },
-  ComAtprotoServerCreateInviteCode: {
-    lexicon: 1,
-    id: "com.atproto.server.createInviteCode",
-    defs: {
-      main: {
-        type: "procedure",
-        description: "Create an invite code.",
-        input: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["useCount"],
-            properties: {
-              useCount: {
-                type: "integer"
-              },
-              forAccount: {
-                type: "string",
-                format: "did"
-              }
-            }
-          }
-        },
-        output: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["code"],
-            properties: {
-              code: {
-                type: "string"
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  ComAtprotoServerCreateInviteCodes: {
-    lexicon: 1,
-    id: "com.atproto.server.createInviteCodes",
-    defs: {
-      main: {
-        type: "procedure",
-        description: "Create an invite code.",
-        input: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["codeCount", "useCount"],
-            properties: {
-              codeCount: {
-                type: "integer",
-                default: 1
               },
-              useCount: {
-                type: "integer"
-              },
-              forAccounts: {
-                type: "array",
-                items: {
-                  type: "string",
-                  format: "did"
-                }
-              }
-            }
-          }
-        },
-        output: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["codes"],
-            properties: {
-              codes: {
-                type: "array",
-                items: {
-                  type: "ref",
-                  ref: "lex:com.atproto.server.createInviteCodes#accountCodes"
-                }
-              }
-            }
-          }
-        }
-      },
-      accountCodes: {
-        type: "object",
-        required: ["account", "codes"],
-        properties: {
-          account: {
-            type: "string"
-          },
-          codes: {
-            type: "array",
-            items: {
-              type: "string"
-            }
-          }
-        }
-      }
-    }
-  },
-  ComAtprotoServerCreateSession: {
-    lexicon: 1,
-    id: "com.atproto.server.createSession",
-    defs: {
-      main: {
-        type: "procedure",
-        description: "Create an authentication session.",
-        input: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["identifier", "password"],
-            properties: {
-              identifier: {
-                type: "string",
-                description: "Handle or other identifier supported by the server for the authenticating user."
-              },
-              password: {
-                type: "string"
-              }
-            }
-          }
-        },
-        output: {
-          encoding: "application/json",
-          schema: {
-            type: "object",
-            required: ["accessJwt", "refreshJwt", "handle", "did"],
-            properties: {
-              accessJwt: {
-                type: "string"
-              },
-              refreshJwt: {
-                type: "string"
-              },
-              handle: {
-                type: "string",
-                format: "handle"
-              },
-              did: {
-                type: "string",
-                format: "did"
+              didDoc: {
+                type: "unknown"
               },
               email: {
                 type: "string"
@@ -132396,6 +132962,9 @@ var schemaDict2 = {
               did: {
                 type: "string",
                 format: "did"
+              },
+              didDoc: {
+                type: "unknown"
               }
             }
           }
@@ -132472,6 +133041,41 @@ var schemaDict2 = {
       }
     }
   },
+  ComAtprotoServerReserveSigningKey: {
+    lexicon: 1,
+    id: "com.atproto.server.reserveSigningKey",
+    defs: {
+      main: {
+        type: "procedure",
+        description: "Reserve a repo signing key for account creation.",
+        input: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            properties: {
+              did: {
+                type: "string",
+                description: "The did to reserve a new did:key for"
+              }
+            }
+          }
+        },
+        output: {
+          encoding: "application/json",
+          schema: {
+            type: "object",
+            required: ["signingKey"],
+            properties: {
+              signingKey: {
+                type: "string",
+                description: "Public signing key in the form of a did:key."
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   ComAtprotoServerResetPassword: {
     lexicon: 1,
     id: "com.atproto.server.resetPassword",
@@ -132889,7 +133493,7 @@ var schemaDict2 = {
       },
       repo: {
         type: "object",
-        required: ["did", "head"],
+        required: ["did", "head", "rev"],
         properties: {
           did: {
             type: "string",
@@ -132898,6 +133502,9 @@ var schemaDict2 = {
           head: {
             type: "string",
             format: "cid"
+          },
+          rev: {
+            type: "string"
           }
         }
       }
@@ -133298,6 +133905,10 @@ var schemaDict2 = {
             type: "string",
             format: "at-uri"
           },
+          blockingByList: {
+            type: "ref",
+            ref: "lex:app.bsky.graph.defs#listViewBasic"
+          },
           following: {
             type: "string",
             format: "at-uri"
@@ -136805,6 +137416,7 @@ var ids = {
   ComAtprotoAdminDisableAccountInvites: "com.atproto.admin.disableAccountInvites",
   ComAtprotoAdminDisableInviteCodes: "com.atproto.admin.disableInviteCodes",
   ComAtprotoAdminEnableAccountInvites: "com.atproto.admin.enableAccountInvites",
+  ComAtprotoAdminGetAccountInfo: "com.atproto.admin.getAccountInfo",
   ComAtprotoAdminGetInviteCodes: "com.atproto.admin.getInviteCodes",
   ComAtprotoAdminGetModerationAction: "com.atproto.admin.getModerationAction",
   ComAtprotoAdminGetModerationActions: "com.atproto.admin.getModerationActions",
@@ -136812,6 +137424,7 @@ var ids = {
   ComAtprotoAdminGetModerationReports: "com.atproto.admin.getModerationReports",
   ComAtprotoAdminGetRecord: "com.atproto.admin.getRecord",
   ComAtprotoAdminGetRepo: "com.atproto.admin.getRepo",
+  ComAtprotoAdminGetSubjectStatus: "com.atproto.admin.getSubjectStatus",
   ComAtprotoAdminResolveModerationReports: "com.atproto.admin.resolveModerationReports",
   ComAtprotoAdminReverseModerationAction: "com.atproto.admin.reverseModerationAction",
   ComAtprotoAdminSearchRepos: "com.atproto.admin.searchRepos",
@@ -136819,6 +137432,7 @@ var ids = {
   ComAtprotoAdminTakeModerationAction: "com.atproto.admin.takeModerationAction",
   ComAtprotoAdminUpdateAccountEmail: "com.atproto.admin.updateAccountEmail",
   ComAtprotoAdminUpdateAccountHandle: "com.atproto.admin.updateAccountHandle",
+  ComAtprotoAdminUpdateSubjectStatus: "com.atproto.admin.updateSubjectStatus",
   ComAtprotoIdentityResolveHandle: "com.atproto.identity.resolveHandle",
   ComAtprotoIdentityUpdateHandle: "com.atproto.identity.updateHandle",
   ComAtprotoLabelDefs: "com.atproto.label.defs",
@@ -136853,6 +137467,7 @@ var ids = {
   ComAtprotoServerRequestEmailConfirmation: "com.atproto.server.requestEmailConfirmation",
   ComAtprotoServerRequestEmailUpdate: "com.atproto.server.requestEmailUpdate",
   ComAtprotoServerRequestPasswordReset: "com.atproto.server.requestPasswordReset",
+  ComAtprotoServerReserveSigningKey: "com.atproto.server.reserveSigningKey",
   ComAtprotoServerResetPassword: "com.atproto.server.resetPassword",
   ComAtprotoServerRevokeAppPassword: "com.atproto.server.revokeAppPassword",
   ComAtprotoServerUpdateEmail: "com.atproto.server.updateEmail",
@@ -137057,9 +137672,9 @@ var threadgateToPostUri = (gateUri) => {
 function getPostThread_default(server, ctx) {
   const getPostThread = createPipeline(skeleton7, hydration7, noRules, presentation7);
   server.app.bsky.feed.getPostThread({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authOptionalAccessOrRoleVerifier,
     handler: async ({ params: params2, auth, res }) => {
-      const viewer = auth.credentials.did;
+      const viewer = "did" in auth.credentials ? auth.credentials.did : null;
       const db = ctx.db.getReplica("thread");
       const feedService = ctx.services.feed(db);
       const actorService = ctx.services.actor(db);
@@ -138468,23 +139083,20 @@ var skeleton18 = async (params2, ctx) => {
   if (params2.seenAt) {
     throw new InvalidRequestError("The seenAt parameter is unsupported");
   }
-  let notifBuilder = db.db.selectFrom("notification as notif").innerJoin("record", "record.uri", "notif.recordUri").innerJoin("actor as author", "author.did", "notif.author").where(notSoftDeletedClause(ref("record"))).where(notSoftDeletedClause(ref("author"))).where("notif.did", "=", viewer).where((clause) => clause.where("reasonSubject", "is", null).orWhereExists(db.db.selectFrom("record as subject").selectAll().whereRef("subject.uri", "=", ref("notif.reasonSubject")))).select([
+  let notifBuilder = db.db.selectFrom("notification as notif").where("notif.did", "=", viewer).where((clause) => clause.where("reasonSubject", "is", null).orWhereExists(db.db.selectFrom("record as subject").selectAll().whereRef("subject.uri", "=", ref("notif.reasonSubject")))).select([
+    "notif.author as authorDid",
     "notif.recordUri as uri",
     "notif.recordCid as cid",
-    "author.did as authorDid",
-    "author.handle as authorHandle",
-    "author.indexedAt as authorIndexedAt",
-    "author.takedownId as authorTakedownId",
     "notif.reason as reason",
     "notif.reasonSubject as reasonSubject",
-    "notif.sortAt as indexedAt",
-    "record.json as recordJson"
+    "notif.sortAt as indexedAt"
   ]);
   const keyset = new NotifsKeyset(ref("notif.sortAt"), ref("notif.recordCid"));
   notifBuilder = paginate(notifBuilder, {
     cursor,
     limit,
-    keyset
+    keyset,
+    tryIndex: true
   });
   const actorStateQuery = db.db.selectFrom("actor_state").selectAll().where("did", "=", viewer);
   const [notifs, actorState] = await Promise.all([
@@ -138499,17 +139111,18 @@ var skeleton18 = async (params2, ctx) => {
   };
 };
 var hydration18 = async (state, ctx) => {
-  const { graphService, actorService, labelService } = ctx;
+  const { graphService, actorService, labelService, db } = ctx;
   const { params: params2, notifs } = state;
   const { viewer } = params2;
   const dids = notifs.map((notif) => notif.authorDid);
   const uris = notifs.map((notif) => notif.uri);
-  const [actors, labels, bam] = await Promise.all([
+  const [actors, records, labels, bam] = await Promise.all([
     actorService.views.profiles(dids, viewer),
+    getRecordMap(db, uris),
     labelService.getLabelsForUris(uris),
     graphService.getBlockAndMuteState(dids.map((did2) => [viewer, did2]))
   ]);
-  return { ...state, actors, labels, bam };
+  return { ...state, actors, records, labels, bam };
 };
 var noBlockOrMutes = (state) => {
   const { viewer } = state.params;
@@ -138517,12 +139130,12 @@ var noBlockOrMutes = (state) => {
   return state;
 };
 var presentation18 = (state) => {
-  const { notifs, cursor, actors, labels, lastSeenNotifs } = state;
+  const { notifs, cursor, actors, records, labels, lastSeenNotifs } = state;
   const notifications = mapDefined(notifs, (notif) => {
     const author = actors[notif.authorDid];
-    if (!author)
+    const record = records[notif.uri];
+    if (!author || !record)
       return void 0;
-    const record = jsonStringToLex(notif.recordJson);
     const recordLabels = labels[notif.uri] ?? [];
     const recordSelfLabels = getSelfLabels({
       uri: notif.uri,
@@ -138543,6 +139156,16 @@ var presentation18 = (state) => {
   });
   return { notifications, cursor };
 };
+var getRecordMap = async (db, uris) => {
+  if (!uris.length)
+    return {};
+  const { ref } = db.db.dynamic;
+  const recordRows = await db.db.selectFrom("record").select(["uri", "json"]).where("uri", "in", uris).where(notSoftDeletedClause(ref("record"))).execute();
+  return recordRows.reduce((acc, { uri: uri2, json }) => {
+    acc[uri2] = jsonStringToLex(json);
+    return acc;
+  }, {});
+};
 var NotifsKeyset = class extends TimeCidKeyset {
   labelResult(result) {
     return { primary: result.indexedAt, secondary: result.cid };
@@ -138685,6 +139308,12 @@ var TAKEDOWN = "com.atproto.admin.defs#takedown";
 var FLAG = "com.atproto.admin.defs#flag";
 var ACKNOWLEDGE = "com.atproto.admin.defs#acknowledge";
 var ESCALATE = "com.atproto.admin.defs#escalate";
+function isRepoView(v) {
+  return isObj3(v) && hasProp3(v, "$type") && v.$type === "com.atproto.admin.defs#repoView";
+}
+function isRecordView(v) {
+  return isObj3(v) && hasProp3(v, "$type") && v.$type === "com.atproto.admin.defs#recordView";
+}
 
 // src/lexicon/types/com/atproto/moderation/defs.ts
 var REASONSPAM = "com.atproto.moderation.defs#reasonSpam";
@@ -138778,6 +139407,67 @@ function resolveModerationReports_default(server, ctx) {
   });
 }
 
+// src/util/retry.ts
+var import_axios3 = __toESM(require_axios2());
+async function retry(fn, opts = {}) {
+  const { max = 3, retryable = () => true } = opts;
+  let retries = 0;
+  let doneError;
+  while (!doneError) {
+    try {
+      if (retries)
+        await backoff(retries);
+      return await fn();
+    } catch (err) {
+      const willRetry = retries < max && retryable(err);
+      if (!willRetry)
+        doneError = err;
+      retries += 1;
+    }
+  }
+  throw doneError;
+}
+async function retryHttp(fn, opts = {}) {
+  return retry(fn, { retryable: retryableHttp, ...opts });
+}
+function retryableHttp(err) {
+  if (err instanceof XRPCError) {
+    if (err.status === 1 /* Unknown */)
+      return true;
+    return retryableHttpStatusCodes.has(err.status);
+  }
+  if (err instanceof import_axios3.AxiosError) {
+    if (!err.response)
+      return true;
+    return retryableHttpStatusCodes.has(err.response.status);
+  }
+  return false;
+}
+var retryableHttpStatusCodes = /* @__PURE__ */ new Set([
+  408,
+  425,
+  429,
+  500,
+  502,
+  503,
+  504,
+  522,
+  524
+]);
+async function backoff(n, multiplier = 50, max = 1e3) {
+  const exponentialMs = Math.pow(2, n) * multiplier;
+  const ms = Math.min(exponentialMs, max);
+  await wait(jitter2(ms));
+}
+function jitter2(value) {
+  const delta = value * 0.15;
+  return value + randomRange(-delta, delta);
+}
+function randomRange(from3, to) {
+  const rand = Math.random() * (to - from3);
+  return rand + from3;
+}
+
 // src/api/com/atproto/admin/reverseModerationAction.ts
 function reverseModerationAction_default(server, ctx) {
   server.com.atproto.admin.reverseModerationAction({
@@ -138787,7 +139477,7 @@ function reverseModerationAction_default(server, ctx) {
       const db = ctx.db.getPrimary();
       const moderationService = ctx.services.moderation(db);
       const { id, createdBy, reason } = input.body;
-      const moderationAction = await db.transaction(async (dbTxn) => {
+      const { result, restored } = await db.transaction(async (dbTxn) => {
         const moderationTxn = ctx.services.moderation(dbTxn);
         const labelTxn = ctx.services.label(dbTxn);
         const now = new Date();
@@ -138804,21 +139494,35 @@ function reverseModerationAction_default(server, ctx) {
         if (!access.moderator && existing.action === TAKEDOWN && existing.subjectType === "com.atproto.admin.defs#repoRef") {
           throw new AuthRequiredError("Must be a full moderator to reverse an account takedown");
         }
-        const result = await moderationTxn.revertAction({
+        const { result: result2, restored: restored2 } = await moderationTxn.revertAction({
           id,
           createdAt: now,
           createdBy,
           reason
         });
-        const { createLabelVals, negateLabelVals } = result;
+        const { createLabelVals, negateLabelVals } = result2;
         const negate = createLabelVals && createLabelVals.length > 0 ? createLabelVals.split(" ") : void 0;
         const create3 = negateLabelVals && negateLabelVals.length > 0 ? negateLabelVals.split(" ") : void 0;
-        await labelTxn.formatAndCreate(ctx.cfg.labelerDid, result.subjectUri ?? result.subjectDid, result.subjectCid, { create: create3, negate });
-        return result;
+        await labelTxn.formatAndCreate(ctx.cfg.labelerDid, result2.subjectUri ?? result2.subjectDid, result2.subjectCid, { create: create3, negate });
+        return { result: result2, restored: restored2 };
       });
+      if (restored) {
+        const { did: did2, subjects } = restored;
+        const agent = await ctx.pdsAdminAgent(did2);
+        const results = await Promise.allSettled(subjects.map((subject) => retryHttp(() => agent.api.com.atproto.admin.updateSubjectStatus({
+          subject,
+          takedown: {
+            applied: false
+          }
+        }))));
+        const hadFailure = results.some((r) => r.status === "rejected");
+        if (hadFailure) {
+          throw new UpstreamFailureError("failed to revert action on PDS");
+        }
+      }
       return {
         encoding: "application/json",
-        body: await moderationService.views.action(moderationAction)
+        body: await moderationService.views.action(result)
       };
     }
   });
@@ -138852,10 +139556,10 @@ function takeModerationAction_default(server, ctx) {
         throw new AuthRequiredError("Must be a full moderator to label content");
       }
       validateLabels([...createLabelVals ?? [], ...negateLabelVals ?? []]);
-      const moderationAction = await db.transaction(async (dbTxn) => {
+      const { result, takenDown } = await db.transaction(async (dbTxn) => {
         const moderationTxn = ctx.services.moderation(dbTxn);
         const labelTxn = ctx.services.label(dbTxn);
-        const result = await moderationTxn.logAction({
+        const result2 = await moderationTxn.logAction({
           action: getAction(action),
           subject: getSubject(subject),
           subjectBlobCids: subjectBlobCids?.map((cid2) => CID.parse(cid2)) ?? [],
@@ -138865,25 +139569,44 @@ function takeModerationAction_default(server, ctx) {
           reason,
           durationInHours
         });
-        if (result.action === TAKEDOWN && result.subjectType === "com.atproto.admin.defs#repoRef" && result.subjectDid) {
-          await moderationTxn.takedownRepo({
-            takedownId: result.id,
-            did: result.subjectDid
+        let takenDown2;
+        if (result2.action === TAKEDOWN && result2.subjectType === "com.atproto.admin.defs#repoRef" && result2.subjectDid) {
+          takenDown2 = await moderationTxn.takedownRepo({
+            takedownId: result2.id,
+            did: result2.subjectDid
           });
         }
-        if (result.action === TAKEDOWN && result.subjectType === "com.atproto.repo.strongRef" && result.subjectUri) {
-          await moderationTxn.takedownRecord({
-            takedownId: result.id,
-            uri: new AtUri(result.subjectUri),
+        if (result2.action === TAKEDOWN && result2.subjectType === "com.atproto.repo.strongRef" && result2.subjectUri && result2.subjectCid) {
+          takenDown2 = await moderationTxn.takedownRecord({
+            takedownId: result2.id,
+            uri: new AtUri(result2.subjectUri),
+            cid: CID.parse(result2.subjectCid),
             blobCids: subjectBlobCids?.map((cid2) => CID.parse(cid2)) ?? []
           });
         }
-        await labelTxn.formatAndCreate(ctx.cfg.labelerDid, result.subjectUri ?? result.subjectDid, result.subjectCid, { create: createLabelVals, negate: negateLabelVals });
-        return result;
+        await labelTxn.formatAndCreate(ctx.cfg.labelerDid, result2.subjectUri ?? result2.subjectDid, result2.subjectCid, { create: createLabelVals, negate: negateLabelVals });
+        return { result: result2, takenDown: takenDown2 };
       });
+      if (takenDown) {
+        const { did: did2, subjects } = takenDown;
+        if (did2 && subjects.length > 0) {
+          const agent = await ctx.pdsAdminAgent(did2);
+          const results = await Promise.allSettled(subjects.map((subject2) => retryHttp(() => agent.api.com.atproto.admin.updateSubjectStatus({
+            subject: subject2,
+            takedown: {
+              applied: true,
+              ref: result.id.toString()
+            }
+          }))));
+          const hadFailure = results.some((r) => r.status === "rejected");
+          if (hadFailure) {
+            throw new UpstreamFailureError("failed to apply action on PDS");
+          }
+        }
+      }
       return {
         encoding: "application/json",
-        body: await moderationService.views.action(moderationAction)
+        body: await moderationService.views.action(result)
       };
     }
   });
@@ -138906,10 +139629,7 @@ function searchRepos_default(server, ctx) {
     handler: async ({ params: params2 }) => {
       const db = ctx.db.getPrimary();
       const moderationService = ctx.services.moderation(db);
-      const { invitedBy, limit, cursor } = params2;
-      if (invitedBy) {
-        throw new InvalidRequestError("The invitedBy parameter is unsupported");
-      }
+      const { limit, cursor } = params2;
       const query = params2.q ?? params2.term;
       const { results, cursor: resCursor } = await ctx.services.actor(db).getSearchResults({ query, limit, cursor, includeSoftDeleted: true });
       return {
@@ -138923,20 +139643,59 @@ function searchRepos_default(server, ctx) {
   });
 }
 
+// src/api/com/atproto/admin/util.ts
+var getPdsAccountInfo = async (ctx, did2) => {
+  try {
+    const agent = await ctx.pdsAdminAgent(did2);
+    const res = await agent.api.com.atproto.admin.getAccountInfo({ did: did2 });
+    return res.data;
+  } catch (err) {
+    return null;
+  }
+};
+var addAccountInfoToRepoViewDetail = (repoView, accountInfo, includeEmail = false) => {
+  if (!accountInfo)
+    return repoView;
+  return {
+    ...repoView,
+    email: includeEmail ? accountInfo.email : void 0,
+    invitedBy: accountInfo.invitedBy,
+    invitesDisabled: accountInfo.invitesDisabled,
+    inviteNote: accountInfo.inviteNote,
+    invites: accountInfo.invites
+  };
+};
+var addAccountInfoToRepoView = (repoView, accountInfo, includeEmail = false) => {
+  if (!accountInfo)
+    return repoView;
+  return {
+    ...repoView,
+    email: includeEmail ? accountInfo.email : void 0,
+    invitedBy: accountInfo.invitedBy,
+    invitesDisabled: accountInfo.invitesDisabled,
+    inviteNote: accountInfo.inviteNote
+  };
+};
+
 // src/api/com/atproto/admin/getRecord.ts
 function getRecord_default(server, ctx) {
   server.com.atproto.admin.getRecord({
     auth: ctx.roleVerifier,
-    handler: async ({ params: params2 }) => {
+    handler: async ({ params: params2, auth }) => {
       const { uri: uri2, cid: cid2 } = params2;
       const db = ctx.db.getPrimary();
       const result = await db.db.selectFrom("record").selectAll().where("uri", "=", uri2).if(!!cid2, (qb) => qb.where("cid", "=", cid2 ?? "")).executeTakeFirst();
       if (!result) {
         throw new InvalidRequestError("Record not found", "RecordNotFound");
       }
+      const [record, accountInfo] = await Promise.all([
+        ctx.services.moderation(db).views.recordDetail(result),
+        getPdsAccountInfo(ctx, result.did)
+      ]);
+      record.repo = addAccountInfoToRepoView(record.repo, accountInfo, auth.credentials.moderator);
       return {
         encoding: "application/json",
-        body: await ctx.services.moderation(db).views.recordDetail(result)
+        body: record
       };
     }
   });
@@ -138946,16 +139705,21 @@ function getRecord_default(server, ctx) {
 function getRepo_default(server, ctx) {
   server.com.atproto.admin.getRepo({
     auth: ctx.roleVerifier,
-    handler: async ({ params: params2 }) => {
+    handler: async ({ params: params2, auth }) => {
       const { did: did2 } = params2;
       const db = ctx.db.getPrimary();
       const result = await ctx.services.actor(db).getActor(did2, true);
       if (!result) {
         throw new InvalidRequestError("Repo not found", "RepoNotFound");
       }
+      const [partialRepo, accountInfo] = await Promise.all([
+        ctx.services.moderation(db).views.repoDetail(result),
+        getPdsAccountInfo(ctx, result.did)
+      ]);
+      const repo = addAccountInfoToRepoViewDetail(partialRepo, accountInfo, auth.credentials.moderator);
       return {
         encoding: "application/json",
-        body: await ctx.services.moderation(db).views.repoDetail(result)
+        body: repo
       };
     }
   });
@@ -138965,14 +139729,23 @@ function getRepo_default(server, ctx) {
 function getModerationAction_default(server, ctx) {
   server.com.atproto.admin.getModerationAction({
     auth: ctx.roleVerifier,
-    handler: async ({ params: params2 }) => {
+    handler: async ({ params: params2, auth }) => {
       const { id } = params2;
       const db = ctx.db.getPrimary();
       const moderationService = ctx.services.moderation(db);
       const result = await moderationService.getActionOrThrow(id);
+      const [action, accountInfo] = await Promise.all([
+        moderationService.views.actionDetail(result),
+        getPdsAccountInfo(ctx, result.subjectDid)
+      ]);
+      if (isRepoView(action.subject)) {
+        action.subject = addAccountInfoToRepoView(action.subject, accountInfo, auth.credentials.moderator);
+      } else if (isRecordView(action.subject)) {
+        action.subject.repo = addAccountInfoToRepoView(action.subject.repo, accountInfo, auth.credentials.moderator);
+      }
       return {
         encoding: "application/json",
-        body: await moderationService.views.actionDetail(result)
+        body: action
       };
     }
   });
@@ -139006,14 +139779,23 @@ function getModerationActions_default(server, ctx) {
 function getModerationReport_default(server, ctx) {
   server.com.atproto.admin.getModerationReport({
     auth: ctx.roleVerifier,
-    handler: async ({ params: params2 }) => {
+    handler: async ({ params: params2, auth }) => {
       const { id } = params2;
       const db = ctx.db.getPrimary();
       const moderationService = ctx.services.moderation(db);
       const result = await moderationService.getReportOrThrow(id);
+      const [report, accountInfo] = await Promise.all([
+        moderationService.views.reportDetail(result),
+        getPdsAccountInfo(ctx, result.subjectDid)
+      ]);
+      if (isRepoView(report.subject)) {
+        report.subject = addAccountInfoToRepoView(report.subject, accountInfo, auth.credentials.moderator);
+      } else if (isRecordView(report.subject)) {
+        report.subject.repo = addAccountInfoToRepoView(report.subject.repo, accountInfo, auth.credentials.moderator);
+      }
       return {
         encoding: "application/json",
-        body: await moderationService.views.reportDetail(result)
+        body: report
       };
     }
   });
@@ -139152,6 +139934,14 @@ var createRouter2 = (ctx) => {
     res.json({
       "@context": ["https://www.w3.org/ns/did/v1"],
       id: ctx.cfg.serverDid,
+      verificationMethod: [
+        {
+          id: `${ctx.cfg.serverDid}#atproto`,
+          type: "Multikey",
+          controller: ctx.cfg.serverDid,
+          publicKeyMultibase: ctx.signingKey.did().replace("did:key:", "")
+        }
+      ],
       service: [
         {
           id: "#bsky_notif",
@@ -139182,69 +139972,16 @@ var subLogger = subsystemLogger("bsky:sub");
 var labelerLogger = subsystemLogger("bsky:labeler");
 var httpLogger = subsystemLogger("bsky");
 var loggerMiddleware = (0, import_pino_http.default)({
-  logger: httpLogger
-});
-
-// src/util/retry.ts
-var import_axios3 = __toESM(require_axios2());
-async function retry(fn, opts = {}) {
-  const { max = 3, retryable = () => true } = opts;
-  let retries = 0;
-  let doneError;
-  while (!doneError) {
-    try {
-      if (retries)
-        await backoff(retries);
-      return await fn();
-    } catch (err) {
-      const willRetry = retries < max && retryable(err);
-      if (!willRetry)
-        doneError = err;
-      retries += 1;
+  logger: httpLogger,
+  serializers: {
+    err: (err) => {
+      return {
+        code: err?.code,
+        message: err?.message
+      };
     }
   }
-  throw doneError;
-}
-async function retryHttp(fn, opts = {}) {
-  return retry(fn, { retryable: retryableHttp, ...opts });
-}
-function retryableHttp(err) {
-  if (err instanceof XRPCError) {
-    if (err.status === 1 /* Unknown */)
-      return true;
-    return retryableHttpStatusCodes.has(err.status);
-  }
-  if (err instanceof import_axios3.AxiosError) {
-    if (!err.response)
-      return true;
-    return retryableHttpStatusCodes.has(err.response.status);
-  }
-  return false;
-}
-var retryableHttpStatusCodes = /* @__PURE__ */ new Set([
-  408,
-  425,
-  429,
-  500,
-  502,
-  503,
-  504,
-  522,
-  524
-]);
-async function backoff(n, multiplier = 50, max = 1e3) {
-  const exponentialMs = Math.pow(2, n) * multiplier;
-  const ms = Math.min(exponentialMs, max);
-  await wait(jitter2(ms));
-}
-function jitter2(value) {
-  const delta = value * 0.15;
-  return value + randomRange(-delta, delta);
-}
-function randomRange(from3, to) {
-  const rand = Math.random() * (to - from3);
-  return rand + from3;
-}
+});
 
 // src/api/blob-resolver.ts
 var createRouter3 = (ctx) => {
@@ -139435,6 +140172,10 @@ var AdminNS2 = class {
     const nsid2 = "com.atproto.admin.enableAccountInvites";
     return this._server.xrpc.method(nsid2, cfg);
   }
+  getAccountInfo(cfg) {
+    const nsid2 = "com.atproto.admin.getAccountInfo";
+    return this._server.xrpc.method(nsid2, cfg);
+  }
   getInviteCodes(cfg) {
     const nsid2 = "com.atproto.admin.getInviteCodes";
     return this._server.xrpc.method(nsid2, cfg);
@@ -139463,6 +140204,10 @@ var AdminNS2 = class {
     const nsid2 = "com.atproto.admin.getRepo";
     return this._server.xrpc.method(nsid2, cfg);
   }
+  getSubjectStatus(cfg) {
+    const nsid2 = "com.atproto.admin.getSubjectStatus";
+    return this._server.xrpc.method(nsid2, cfg);
+  }
   resolveModerationReports(cfg) {
     const nsid2 = "com.atproto.admin.resolveModerationReports";
     return this._server.xrpc.method(nsid2, cfg);
@@ -139491,6 +140236,10 @@ var AdminNS2 = class {
     const nsid2 = "com.atproto.admin.updateAccountHandle";
     return this._server.xrpc.method(nsid2, cfg);
   }
+  updateSubjectStatus(cfg) {
+    const nsid2 = "com.atproto.admin.updateSubjectStatus";
+    return this._server.xrpc.method(nsid2, cfg);
+  }
 };
 var IdentityNS2 = class {
   constructor(server) {
@@ -139636,6 +140385,10 @@ var ServerNS2 = class {
     const nsid2 = "com.atproto.server.requestPasswordReset";
     return this._server.xrpc.method(nsid2, cfg);
   }
+  reserveSigningKey(cfg) {
+    const nsid2 = "com.atproto.server.reserveSigningKey";
+    return this._server.xrpc.method(nsid2, cfg);
+  }
   resetPassword(cfg) {
     const nsid2 = "com.atproto.server.resetPassword";
     return this._server.xrpc.method(nsid2, cfg);
@@ -140342,7 +141095,7 @@ var UnexpectedObjectError = class extends Error {
 
 // ../../node_modules/.pnpm/@ipld+car@3.2.3/node_modules/@ipld/car/esm/lib/reader.js
 var import_fs = __toESM(require("fs"), 1);
-var import_util77 = require("util");
+var import_util81 = require("util");
 
 // ../../node_modules/.pnpm/@ipld+car@3.2.3/node_modules/@ipld/car/esm/lib/decoder.js
 var import_varint2 = __toESM(require_varint(), 1);
@@ -140607,7 +141360,7 @@ async function decodeReaderComplete(reader) {
 }
 
 // ../../node_modules/.pnpm/@ipld+car@3.2.3/node_modules/@ipld/car/esm/lib/reader.js
-var fsread = (0, import_util77.promisify)(import_fs.default.read);
+var fsread = (0, import_util81.promisify)(import_fs.default.read);
 var CarReader2 = class extends CarReader {
   static async readRaw(fd, blockIndex) {
     const { cid: cid2, blockLength, blockOffset } = blockIndex;
@@ -140632,7 +141385,7 @@ var CarReader2 = class extends CarReader {
 
 // ../../node_modules/.pnpm/@ipld+car@3.2.3/node_modules/@ipld/car/esm/lib/writer.js
 var import_fs2 = __toESM(require("fs"), 1);
-var import_util78 = require("util");
+var import_util82 = require("util");
 
 // ../../node_modules/.pnpm/@ipld+car@3.2.3/node_modules/@ipld/car/esm/lib/encoder.js
 var import_varint3 = __toESM(require_varint(), 1);
@@ -140652,8 +141405,8 @@ var CarWriterOut = class {
 };
 
 // ../../node_modules/.pnpm/@ipld+car@3.2.3/node_modules/@ipld/car/esm/lib/writer.js
-var fsread2 = (0, import_util78.promisify)(import_fs2.default.read);
-var fswrite = (0, import_util78.promisify)(import_fs2.default.write);
+var fsread2 = (0, import_util82.promisify)(import_fs2.default.read);
+var fswrite = (0, import_util82.promisify)(import_fs2.default.write);
 
 // ../repo/src/util.ts
 async function* verifyIncomingCarBlocks(car) {
@@ -140667,7 +141420,7 @@ var readCar = async (bytes3) => {
   const roots = await car.getRoots();
   const blocks = new block_map_default();
   for await (const block of verifyIncomingCarBlocks(car.blocks())) {
-    await blocks.set(block.cid, block.bytes);
+    blocks.set(block.cid, block.bytes);
   }
   return {
     roots,
@@ -142180,27 +142933,43 @@ var BlockAndMuteState = class {
   constructor(items = []) {
     this.hasIdx = /* @__PURE__ */ new Map();
     this.blockIdx = /* @__PURE__ */ new Map();
+    this.blockListIdx = /* @__PURE__ */ new Map();
     this.muteIdx = /* @__PURE__ */ new Map();
     this.muteListIdx = /* @__PURE__ */ new Map();
     items.forEach((item) => this.add(item));
   }
   add(item) {
-    const blocking = item.blocking || item.blockingViaList;
-    if (blocking) {
+    if (item.source === item.target) {
+      return;
+    }
+    if (item.blocking) {
       const map = this.blockIdx.get(item.source) ?? /* @__PURE__ */ new Map();
-      map.set(item.target, blocking);
+      map.set(item.target, item.blocking);
       if (!this.blockIdx.has(item.source)) {
         this.blockIdx.set(item.source, map);
       }
     }
-    const blockedBy = item.blockedBy || item.blockedByViaList;
-    if (blockedBy) {
+    if (item.blockingViaList) {
+      const map = this.blockListIdx.get(item.source) ?? /* @__PURE__ */ new Map();
+      map.set(item.target, item.blockingViaList);
+      if (!this.blockListIdx.has(item.source)) {
+        this.blockListIdx.set(item.source, map);
+      }
+    }
+    if (item.blockedBy) {
       const map = this.blockIdx.get(item.target) ?? /* @__PURE__ */ new Map();
-      map.set(item.source, blockedBy);
+      map.set(item.source, item.blockedBy);
       if (!this.blockIdx.has(item.target)) {
         this.blockIdx.set(item.target, map);
       }
     }
+    if (item.blockedByViaList) {
+      const map = this.blockListIdx.get(item.target) ?? /* @__PURE__ */ new Map();
+      map.set(item.source, item.blockedByViaList);
+      if (!this.blockListIdx.has(item.target)) {
+        this.blockListIdx.set(item.target, map);
+      }
+    }
     if (item.muting) {
       const set2 = this.muteIdx.get(item.source) ?? /* @__PURE__ */ new Set();
       set2.add(item.target);
@@ -142225,7 +142994,7 @@ var BlockAndMuteState = class {
     return !!this.blocking(pair) || !!this.blockedBy(pair);
   }
   blocking(pair) {
-    return this.blockIdx.get(pair[0])?.get(pair[1]) ?? null;
+    return this.blockIdx.get(pair[0])?.get(pair[1]) ?? this.blockList(pair);
   }
   blockedBy(pair) {
     return this.blocking([pair[1], pair[0]]);
@@ -142233,6 +143002,9 @@ var BlockAndMuteState = class {
   mute(pair) {
     return !!this.muteIdx.get(pair[0])?.has(pair[1]) || !!this.muteList(pair);
   }
+  blockList(pair) {
+    return this.blockListIdx.get(pair[0])?.get(pair[1]) ?? null;
+  }
   muteList(pair) {
     return this.muteListIdx.get(pair[0])?.get(pair[1]) ?? null;
   }
@@ -142316,11 +143088,15 @@ var ActorViews = class {
       this.services.graph.getBlockAndMuteState(viewer ? dids.map((did2) => [viewer, did2]) : [], state?.bam)
     ]);
     const listUris = mapDefined(profiles, ({ did: did2 }) => {
-      const list = viewer && bam.muteList([viewer, did2]);
-      if (!list)
-        return;
-      return list;
-    });
+      const muteList = viewer && bam.muteList([viewer, did2]);
+      const blockList = viewer && bam.blockList([viewer, did2]);
+      const lists2 = [];
+      if (muteList)
+        lists2.push(muteList);
+      if (blockList)
+        lists2.push(blockList);
+      return lists2;
+    }).flat();
     const lists = await this.services.graph.getListViews(listUris, viewer);
     return { profilesDetailed: toMapByDid(profiles), labels, bam, lists };
   }
@@ -142335,6 +143111,8 @@ var ActorViews = class {
       const banner = prof?.bannerCid ? this.imgUriBuilder.getPresetUri("banner", prof.did, prof.bannerCid) : void 0;
       const mutedByListUri = viewer && bam.muteList([viewer, did2]);
       const mutedByList = mutedByListUri && lists[mutedByListUri] ? this.services.graph.formatListViewBasic(lists[mutedByListUri]) : void 0;
+      const blockingByListUri = viewer && bam.blockList([viewer, did2]);
+      const blockingByList = blockingByListUri && lists[blockingByListUri] ? this.services.graph.formatListViewBasic(lists[blockingByListUri]) : void 0;
       const actorLabels = labels[did2] ?? [];
       const selfLabels = getSelfLabels({
         uri: prof.profileUri,
@@ -142357,6 +143135,7 @@ var ActorViews = class {
           mutedByList,
           blockedBy: !!bam.blockedBy([viewer, did2]),
           blocking: bam.blocking([viewer, did2]) ?? void 0,
+          blockingByList,
           following: prof?.viewerFollowing && !bam.block([viewer, did2]) ? prof.viewerFollowing : void 0,
           followedBy: prof?.viewerFollowedBy && !bam.block([viewer, did2]) ? prof.viewerFollowedBy : void 0
         } : void 0,
@@ -142387,11 +143166,15 @@ var ActorViews = class {
       this.services.graph.getBlockAndMuteState(viewer ? dids.map((did2) => [viewer, did2]) : [], state?.bam)
     ]);
     const listUris = mapDefined(profiles, ({ did: did2 }) => {
-      const list = viewer && bam.muteList([viewer, did2]);
-      if (!list)
-        return;
-      return list;
-    });
+      const muteList = viewer && bam.muteList([viewer, did2]);
+      const blockList = viewer && bam.blockList([viewer, did2]);
+      const lists2 = [];
+      if (muteList)
+        lists2.push(muteList);
+      if (blockList)
+        lists2.push(blockList);
+      return lists2;
+    }).flat();
     const lists = await this.services.graph.getListViews(listUris, viewer);
     return { profiles: toMapByDid(profiles), labels, bam, lists };
   }
@@ -142405,6 +143188,8 @@ var ActorViews = class {
       const avatar = prof?.avatarCid ? this.imgUriBuilder.getPresetUri("avatar", prof.did, prof.avatarCid) : void 0;
       const mutedByListUri = viewer && bam.muteList([viewer, did2]);
       const mutedByList = mutedByListUri && lists[mutedByListUri] ? this.services.graph.formatListViewBasic(lists[mutedByListUri]) : void 0;
+      const blockingByListUri = viewer && bam.blockList([viewer, did2]);
+      const blockingByList = blockingByListUri && lists[blockingByListUri] ? this.services.graph.formatListViewBasic(lists[blockingByListUri]) : void 0;
       const actorLabels = labels[did2] ?? [];
       const selfLabels = getSelfLabels({
         uri: prof.profileUri,
@@ -142423,6 +143208,7 @@ var ActorViews = class {
           mutedByList,
           blockedBy: !!bam.blockedBy([viewer, did2]),
           blocking: bam.blocking([viewer, did2]) ?? void 0,
+          blockingByList,
           following: prof?.viewerFollowing && !bam.block([viewer, did2]) ? prof.viewerFollowing : void 0,
           followedBy: prof?.viewerFollowedBy && !bam.block([viewer, did2]) ? prof.viewerFollowedBy : void 0
         } : void 0,
@@ -142489,7 +143275,7 @@ var ActorService = class {
         qb = qb.orWhere("actor.did", "in", dids);
       }
       if (handles.length) {
-        qb = qb.orWhere("actor.handle", "in", handles);
+        qb = qb.orWhere("actor.handle", "in", handles.length === 1 ? [handles[0], handles[0]] : handles);
       }
       return qb;
     }).selectAll().execute();
@@ -143231,7 +144017,7 @@ var ModerationViews = class {
   async recordDetail(result) {
     const [record, reportResults, actionResults] = await Promise.all([
       this.record(result),
-      this.db.db.selectFrom("moderation_report").where("subjectType", "=", "com.atproto.repo.strongRef").where("subjectUri", "=", result.uri).orderBy("id", "desc").selectAll().execute(),
+      this.db.db.selectFrom("moderation_report").where("subjectType", "=", "com.atproto.repo.strongRef").where("subjectUri", "=", result.uri).leftJoin("actor", "actor.did", "moderation_report.subjectDid").orderBy("id", "desc").selectAll().execute(),
       this.db.db.selectFrom("moderation_action").where("subjectType", "=", "com.atproto.repo.strongRef").where("subjectUri", "=", result.uri).orderBy("id", "desc").selectAll().execute()
     ]);
     const [reports, actions, blobs, labels] = await Promise.all([
@@ -143676,17 +144462,46 @@ var ModerationService = class {
       createdBy,
       reason
     });
+    let restored;
     if (result.action === TAKEDOWN && result.subjectType === "com.atproto.admin.defs#repoRef" && result.subjectDid) {
       await this.reverseTakedownRepo({
         did: result.subjectDid
       });
+      restored = {
+        did: result.subjectDid,
+        subjects: [
+          {
+            $type: "com.atproto.admin.defs#repoRef",
+            did: result.subjectDid
+          }
+        ]
+      };
     }
     if (result.action === TAKEDOWN && result.subjectType === "com.atproto.repo.strongRef" && result.subjectUri) {
+      const uri2 = new AtUri(result.subjectUri);
       await this.reverseTakedownRecord({
-        uri: new AtUri(result.subjectUri)
+        uri: uri2
       });
+      const did2 = uri2.hostname;
+      const actionBlobs = await this.db.db.selectFrom("moderation_action_subject_blob").where("actionId", "=", id).select("cid").execute();
+      restored = {
+        did: did2,
+        subjects: [
+          {
+            $type: "com.atproto.repo.strongRef",
+            uri: result.subjectUri,
+            cid: result.subjectCid ?? ""
+          },
+          ...actionBlobs.map((row) => ({
+            $type: "com.atproto.admin.defs#repoBlobRef",
+            did: did2,
+            cid: row.cid,
+            recordUri: result.subjectUri
+          }))
+        ]
+      };
     }
-    return result;
+    return { result, restored };
   }
   async logReverseAction(info) {
     const { id, createdBy, reason, createdAt = new Date() } = info;
@@ -143701,23 +144516,51 @@ var ModerationService = class {
     return result;
   }
   async takedownRepo(info) {
-    await this.db.db.updateTable("actor").set({ takedownId: info.takedownId }).where("did", "=", info.did).where("takedownId", "is", null).executeTakeFirst();
+    const { takedownId, did: did2 } = info;
+    await this.db.db.updateTable("actor").set({ takedownId }).where("did", "=", did2).where("takedownId", "is", null).executeTakeFirst();
+    return {
+      did: did2,
+      subjects: [
+        {
+          $type: "com.atproto.admin.defs#repoRef",
+          did: did2
+        }
+      ]
+    };
   }
   async reverseTakedownRepo(info) {
     await this.db.db.updateTable("actor").set({ takedownId: null }).where("did", "=", info.did).execute();
   }
   async takedownRecord(info) {
+    const { takedownId, uri: uri2, cid: cid2, blobCids } = info;
+    const did2 = uri2.hostname;
     this.db.assertTransaction();
-    await this.db.db.updateTable("record").set({ takedownId: info.takedownId }).where("uri", "=", info.uri.toString()).where("takedownId", "is", null).executeTakeFirst();
-    if (info.blobCids) {
-      await Promise.all(info.blobCids.map(async (cid2) => {
+    await this.db.db.updateTable("record").set({ takedownId }).where("uri", "=", uri2.toString()).where("takedownId", "is", null).executeTakeFirst();
+    if (blobCids) {
+      await Promise.all(blobCids.map(async (cid3) => {
         const paths = ImageUriBuilder.presets.map((id) => {
-          const uri2 = this.imgUriBuilder.getPresetUri(id, info.uri.host, cid2);
-          return uri2.replace(this.imgUriBuilder.endpoint, "");
+          const imgUri = this.imgUriBuilder.getPresetUri(id, uri2.host, cid3);
+          return imgUri.replace(this.imgUriBuilder.endpoint, "");
         });
-        await this.imgInvalidator.invalidate(cid2.toString(), paths);
+        await this.imgInvalidator.invalidate(cid3.toString(), paths);
       }));
     }
+    return {
+      did: did2,
+      subjects: [
+        {
+          $type: "com.atproto.repo.strongRef",
+          uri: uri2.toString(),
+          cid: cid2.toString()
+        },
+        ...(blobCids || []).map((cid3) => ({
+          $type: "com.atproto.admin.defs#repoBlobRef",
+          did: did2,
+          cid: cid3.toString(),
+          recordUri: uri2.toString()
+        }))
+      ]
+    };
   }
   async reverseTakedownRecord(info) {
     this.db.assertTransaction();
@@ -143805,11 +144648,11 @@ var authVerifier = (idResolver, opts) => async (reqCtx) => {
   if (!jwtStr) {
     throw new AuthRequiredError("missing jwt", "MissingJwt");
   }
-  const did2 = await verifyJwt(jwtStr, opts.aud, async (did3) => {
-    const atprotoData = await idResolver.did.resolveAtprotoData(did3);
+  const payload = await verifyJwt(jwtStr, opts.aud, async (did2, forceRefresh) => {
+    const atprotoData = await idResolver.did.resolveAtprotoData(did2, forceRefresh);
     return atprotoData.signingKey;
   });
-  return { credentials: { did: did2 }, artifacts: { aud: opts.aud } };
+  return { credentials: { did: payload.iss }, artifacts: { aud: opts.aud } };
 };
 var authOptionalVerifier = (idResolver, opts) => async (reqCtx) => {
   if (!reqCtx.req.headers.authorization) {
@@ -143912,6 +144755,9 @@ var AppContext = class {
   get services() {
     return this.opts.services;
   }
+  get signingKey() {
+    return this.opts.signingKey;
+  }
   get plcClient() {
     return new plc.Client(this.cfg.didPlcUrl);
   }
@@ -143947,6 +144793,21 @@ var AppContext = class {
   get roleVerifier() {
     return roleVerifier(this.cfg);
   }
+  async serviceAuthJwt(aud) {
+    const iss = this.cfg.serverDid;
+    return createServiceJwt({
+      iss,
+      aud,
+      keypair: this.signingKey
+    });
+  }
+  async pdsAdminAgent(did2) {
+    const data = await this.idResolver.did.resolveAtprotoData(did2);
+    const agent = new AtpAgent({ service: data.pds });
+    const jwt = await this.serviceAuthJwt(did2);
+    agent.api.setHeader("authorization", `Bearer ${jwt}`);
+    return agent;
+  }
   get backgroundQueue() {
     return this.opts.backgroundQueue;
   }
@@ -143965,15 +144826,22 @@ var DidSqlCache = class {
     this.maxTTL = maxTTL;
     this.pQueue = new import_p_queue.default();
   }
-  async cacheDid(did2, doc) {
-    await this.db.db.insertInto("did_cache").values({ did: did2, doc, updatedAt: Date.now() }).onConflict((oc) => oc.column("did").doUpdateSet({ doc, updatedAt: Date.now() })).executeTakeFirst();
+  async cacheDid(did2, doc, prevResult) {
+    if (prevResult) {
+      await this.db.db.updateTable("did_cache").set({ doc, updatedAt: Date.now() }).where("did", "=", did2).where("updatedAt", "=", prevResult.updatedAt).execute();
+    } else {
+      await this.db.db.insertInto("did_cache").values({ did: did2, doc, updatedAt: Date.now() }).onConflict((oc) => oc.column("did").doUpdateSet({
+        doc: excluded(this.db.db, "doc"),
+        updatedAt: excluded(this.db.db, "updatedAt")
+      })).executeTakeFirst();
+    }
   }
-  async refreshCache(did2, getDoc) {
+  async refreshCache(did2, getDoc, prevResult) {
     this.pQueue?.add(async () => {
       try {
         const doc = await getDoc();
         if (doc) {
-          await this.cacheDid(did2, doc);
+          await this.cacheDid(did2, doc, prevResult);
         } else {
           await this.clearEntry(did2);
         }
@@ -143989,15 +144857,13 @@ var DidSqlCache = class {
     const now = Date.now();
     const updatedAt = new Date(res.updatedAt).getTime();
     const expired = now > updatedAt + this.maxTTL;
-    if (expired) {
-      return null;
-    }
     const stale = now > updatedAt + this.staleTTL;
     return {
       doc: res.doc,
       updatedAt,
       did: did2,
-      stale
+      stale,
+      expired
     };
   }
   async clearEntry(did2) {
@@ -144535,7 +145401,8 @@ __export(migrations_exports, {
   _20230830T205507322Z: () => T205507322Z_suggested_feeds_exports,
   _20230904T211011773Z: () => T211011773Z_block_lists_exports,
   _20230906T222220386Z: () => T222220386Z_thread_gating_exports,
-  _20230920T213858047Z: () => T213858047Z_add_tags_to_post_exports
+  _20230920T213858047Z: () => T213858047Z_add_tags_to_post_exports,
+  _20230929T192920807Z: () => T192920807Z_record_cursor_indexes_exports
 });
 
 // src/db/migrations/20230309T045948368Z-init.ts
@@ -145013,6 +145880,27 @@ async function down27(db) {
   await db.schema.alterTable("post").dropColumn("tags").execute();
 }
 
+// src/db/migrations/20230929T192920807Z-record-cursor-indexes.ts
+var T192920807Z_record_cursor_indexes_exports = {};
+__export(T192920807Z_record_cursor_indexes_exports, {
+  down: () => down28,
+  up: () => up28
+});
+async function up28(db) {
+  await db.schema.createIndex("like_creator_cursor_idx").on("like").columns(["creator", "sortAt", "cid"]).execute();
+  await db.schema.createIndex("follow_creator_cursor_idx").on("follow").columns(["creator", "sortAt", "cid"]).execute();
+  await db.schema.createIndex("follow_subject_cursor_idx").on("follow").columns(["subjectDid", "sortAt", "cid"]).execute();
+  await db.schema.dropIndex("like_creator_idx").execute();
+  await db.schema.dropIndex("follow_subjectdid_idx").execute();
+}
+async function down28(db) {
+  await db.schema.createIndex("like_creator_idx").on("like").column("creator").execute();
+  await db.schema.createIndex("follow_subjectdid_idx").on("follow").column("subjectDid").execute();
+  await db.schema.dropIndex("like_creator_cursor_idx").execute();
+  await db.schema.dropIndex("follow_creator_cursor_idx").execute();
+  await db.schema.dropIndex("follow_subject_cursor_idx").execute();
+}
+
 // src/db/migrations/provider.ts
 var CtxMigrationProvider = class {
   constructor(migrations, ctx) {
@@ -145574,9 +146462,9 @@ var handler2 = async (ctx, params2, requester) => {
   const db = ctx.db.getReplica("feed");
   const feedService = ctx.services.feed(db);
   const { ref } = db.db.dynamic;
-  const keyset = new FeedKeyset(ref("post.indexedAt"), ref("post.cid"));
+  const keyset = new FeedKeyset(ref("post.sortAt"), ref("post.cid"));
   const sortFrom = keyset.unpack(cursor)?.primary;
-  let postsQb = feedService.selectPostQb().innerJoin("follow", "follow.subjectDid", "post.creator").innerJoin("post_agg", "post_agg.uri", "post.uri").where("post_agg.likeCount", ">=", 5).where("follow.creator", "=", requester).where("post.indexedAt", ">", getFeedDateThreshold(sortFrom));
+  let postsQb = feedService.selectPostQb().innerJoin("follow", "follow.subjectDid", "post.creator").innerJoin("post_agg", "post_agg.uri", "post.uri").where("post_agg.likeCount", ">=", 5).where("follow.creator", "=", requester).where("post.sortAt", ">", getFeedDateThreshold(sortFrom));
   postsQb = paginate(postsQb, { limit, cursor, keyset, tryIndex: true });
   const feedItems = await postsQb.execute();
   return {
@@ -146723,11 +147611,9 @@ var IndexingService = class {
     const atpData = await this.idResolver.did.resolveAtprotoData(did2, true);
     const handleToDid = await this.idResolver.handle.resolve(atpData.handle);
     const handle2 = did2 === handleToDid ? atpData.handle.toLowerCase() : null;
-    if (actor && actor.handle !== handle2) {
-      const actorWithHandle = handle2 !== null ? await this.db.db.selectFrom("actor").where("handle", "=", handle2).selectAll().executeTakeFirst() : null;
-      if (handle2 && actorWithHandle && did2 !== actorWithHandle.did) {
-        await this.db.db.updateTable("actor").where("actor.did", "=", actorWithHandle.did).set({ handle: null }).execute();
-      }
+    const actorWithHandle = handle2 !== null ? await this.db.db.selectFrom("actor").where("handle", "=", handle2).selectAll().executeTakeFirst() : null;
+    if (handle2 && actorWithHandle && did2 !== actorWithHandle.did) {
+      await this.db.db.updateTable("actor").where("actor.did", "=", actorWithHandle.did).set({ handle: null }).execute();
     }
     const actorInfo = { handle: handle2, indexedAt: timestamp };
     await this.db.db.insertInto("actor").values({ did: did2, ...actorInfo }).onConflict((oc) => oc.column("did").doUpdateSet(actorInfo)).returning("did").executeTakeFirst();
@@ -146815,7 +147701,7 @@ var IndexingService = class {
   }
   async getActorIsHosted(did2) {
     const doc = await this.idResolver.did.resolve(did2, true);
-    const pds = doc && getPds(doc);
+    const pds = doc && getPdsEndpoint(doc);
     if (!pds)
       return false;
     const { api } = new AtpAgent({ service: pds });
@@ -147266,19 +148152,6 @@ function partitionId(key) {
 function partitionKey(p) {
   return `repo:${p}`;
 }
-function handleAllSettledErrors(results) {
-  const errors = results.filter(isRejected).map((res) => res.reason);
-  if (errors.length === 0) {
-    return;
-  }
-  if (errors.length === 1) {
-    throw errors[0];
-  }
-  throw new AggregateError(errors, "Multiple errors: " + errors.map((err) => err?.message).join("\n"));
-}
-function isRejected(result) {
-  return result.status === "rejected";
-}
 
 // src/lexicon/types/app/bsky/actor/profile.ts
 function isRecord2(v) {
@@ -147830,6 +148703,7 @@ var AutoModerator = class {
         await modSrvc.takedownRecord({
           takedownId: action.id,
           uri: uri2,
+          cid: recordCid,
           blobCids: takedownCids
         });
       });
@@ -148513,7 +149387,7 @@ var BskyAppView = class {
     this.app = opts.app;
   }
   static create(opts) {
-    const { db, config: config2, algos = {} } = opts;
+    const { db, config: config2, signingKey, algos = {} } = opts;
     let maybeImgInvalidator = opts.imgInvalidator;
     const app = (0, import_express7.default)();
     app.use((0, import_cors.default)());
@@ -148552,6 +149426,7 @@ var BskyAppView = class {
       cfg: config2,
       services,
       imgUriBuilder,
+      signingKey,
       idResolver,
       didCache,
       labelCache,