@atproto/api 0.14.0-next.2 → 0.14.0-next.4

package/dist/util.d.ts

@@ -1,6 +1,6 @@
-import zod from 'zod';
-import { Nux } from './client/types/app/bsky/actor/defs';
+import { z } from 'zod';
 import { AppBskyActorDefs } from './client';
+import { Nux } from './client/types/app/bsky/actor/defs';
 export declare function sanitizeMutedWordValue(value: string): string;
 export declare function savedFeedsToUriArrays(savedFeeds: AppBskyActorDefs.SavedFeed[]): {
     pinned: string[];
@@ -17,12 +17,12 @@ export declare function validateSavedFeed(savedFeed: AppBskyActorDefs.SavedFeed)
 export type Did = `did:${string}`;
 export declare const isDid: (str: unknown) => str is Did;
 export declare const asDid: (value: string) => Did;
-export declare const nuxSchema: zod.ZodObject<{
-    id: zod.ZodString;
-    completed: zod.ZodBoolean;
-    data: zod.ZodOptional<zod.ZodString>;
-    expiresAt: zod.ZodOptional<zod.ZodString>;
-}, "strict", zod.ZodTypeAny, {
+export declare const nuxSchema: z.ZodObject<{
+    id: z.ZodString;
+    completed: z.ZodBoolean;
+    data: z.ZodOptional<z.ZodString>;
+    expiresAt: z.ZodOptional<z.ZodString>;
+}, "strict", z.ZodTypeAny, {
     id: string;
     completed: boolean;
     expiresAt?: string | undefined;

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,KAAK,CAAA;AAErB,OAAO,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,UAQnD;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE,GACvC;IACD,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB,CAkBA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,GACV,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAWpC;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,CAAC,SAAS,QAmBtE;AAED,MAAM,MAAM,GAAG,GAAG,OAAO,MAAM,EAAE,CAAA;AAGjC,eAAO,MAAM,KAAK,QAAS,OAAO,KAAG,GAAG,IAAI,GAKxB,CAAA;AAEpB,eAAO,MAAM,KAAK,UAAW,MAAM,KAAG,GAGrC,CAAA;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;EAOX,CAAA;AAEX,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,QAEnC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAA;AAExD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,UAQnD;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE,GACvC;IACD,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB,CAkBA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,GACV,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAWpC;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,CAAC,SAAS,QAmBtE;AAED,MAAM,MAAM,GAAG,GAAG,OAAO,MAAM,EAAE,CAAA;AAGjC,eAAO,MAAM,KAAK,QAAS,OAAO,KAAG,GAAG,IAAI,GAKxB,CAAA;AAEpB,eAAO,MAAM,KAAK,UAAW,MAAM,KAAG,GAGrC,CAAA;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;EAOX,CAAA;AAEX,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,QAEnC"}

package/dist/util.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nuxSchema = exports.asDid = exports.isDid = void 0;
 exports.sanitizeMutedWordValue = sanitizeMutedWordValue;
@@ -9,9 +6,9 @@ exports.savedFeedsToUriArrays = savedFeedsToUriArrays;
 exports.getSavedFeedType = getSavedFeedType;
 exports.validateSavedFeed = validateSavedFeed;
 exports.validateNux = validateNux;
-const syntax_1 = require("@atproto/syntax");
+const zod_1 = require("zod");
 const common_web_1 = require("@atproto/common-web");
-const zod_1 = __importDefault(require("zod"));
+const syntax_1 = require("@atproto/syntax");
 function sanitizeMutedWordValue(value) {
     return (value
         .trim()
@@ -81,12 +78,12 @@ const asDid = (value) => {
     throw new TypeError(`Invalid DID: ${value}`);
 };
 exports.asDid = asDid;
-exports.nuxSchema = zod_1.default
+exports.nuxSchema = zod_1.z
     .object({
-    id: zod_1.default.string().max(64),
-    completed: zod_1.default.boolean(),
-    data: zod_1.default.string().max(300).optional(),
-    expiresAt: zod_1.default.string().datetime().optional(),
+    id: zod_1.z.string().max(64),
+    completed: zod_1.z.boolean(),
+    data: zod_1.z.string().max(300).optional(),
+    expiresAt: zod_1.z.string().datetime().optional(),
 })
     .strict();
 function validateNux(nux) {

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -5,4 +5,5 @@ module.exports = {
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.0-next.2",
+  "version": "0.14.0-next.4",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -16,25 +16,25 @@
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "scripts": {
+    "codegen": "node ./scripts/generate-code.mjs && lex gen-api --yes ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
+    "build": "tsc --build tsconfig.build.json",
+    "test": "jest"
+  },
   "dependencies": {
+    "@atproto/common-web": "workspace:^",
+    "@atproto/lexicon": "workspace:^",
+    "@atproto/syntax": "workspace:^",
+    "@atproto/xrpc": "workspace:^",
     "await-lock": "^2.2.2",
     "multiformats": "^9.9.0",
     "tlds": "^1.234.0",
-    "zod": "^3.23.8",
-    "@atproto/common-web": "^0.3.2",
-    "@atproto/lexicon": "^0.4.5",
-    "@atproto/syntax": "^0.3.1",
-    "@atproto/xrpc": "^0.6.6"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@atproto/lex-cli": "workspace:^",
     "jest": "^28.1.2",
     "prettier": "^3.2.5",
-    "typescript": "^5.6.3",
-    "@atproto/lex-cli": "^0.5.5"
-  },
-  "scripts": {
-    "codegen": "node ./scripts/generate-code.mjs && lex gen-api --yes ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
-    "build": "tsc --build tsconfig.build.json",
-    "test": "jest"
+    "typescript": "^5.6.3"
   }
-}
+}

package/src/agent.ts

@@ -1,7 +1,7 @@
-import { TID } from '@atproto/common-web'
-import { AtUri, ensureValidDid } from '@atproto/syntax'
-import { buildFetchHandler, FetchHandler, XrpcClient } from '@atproto/xrpc'
 import AwaitLock from 'await-lock'
+import { TID, retry } from '@atproto/common-web'
+import { AtUri, ensureValidDid } from '@atproto/syntax'
+import { FetchHandler, XrpcClient, buildFetchHandler } from '@atproto/xrpc'
 import {
   AppBskyActorDefs,
   AppBskyActorProfile,
@@ -15,7 +15,7 @@ import {
 } from './client/index'
 import { schemas } from './client/lexicons'
 import { MutedWord, Nux } from './client/types/app/bsky/actor/defs'
-import { $Typed } from './client/util'
+import { $Typed, Un$Typed } from './client/util'
 import { BSKY_LABELER_DID } from './const'
 import { interpretLabelValueDefinitions } from './moderation'
 import { DEFAULT_LABEL_SETTINGS } from './moderation/const/labels'
@@ -24,6 +24,7 @@ import {
   LabelPreference,
   ModerationPrefs,
 } from './moderation/types'
+import * as predicate from './predicate'
 import { SessionManager } from './session-manager'
 import {
   AtpAgentGlobalOpts,
@@ -34,8 +35,8 @@ import {
   BskyThreadViewPreference,
 } from './types'
 import {
-  asDid,
   Did,
+  asDid,
   getSavedFeedType,
   isDid,
   sanitizeMutedWordValue,
@@ -439,59 +440,56 @@ export class Agent extends XrpcClient {
     })
   }
 
+  /**
+   * @note: Using this method will reset the whole profile record if it
+   * previously contained invalid values (wrt to the profile lexicon).
+   */
   async upsertProfile(
     updateFn: (
       existing: AppBskyActorProfile.Record | undefined,
-    ) => AppBskyActorProfile.Record | Promise<AppBskyActorProfile.Record>,
-  ) {
-    const repo = this.accountDid
+    ) =>
+      | Un$Typed<AppBskyActorProfile.Record>
+      | Promise<Un$Typed<AppBskyActorProfile.Record>>,
+  ): Promise<void> {
+    const upsert = async () => {
+      const repo = this.assertDid
+      const collection = 'app.bsky.actor.profile'
 
-    let retriesRemaining = 5
-    while (retriesRemaining >= 0) {
-      // fetch existing
       const existing = await this.com.atproto.repo
-        .getRecord({
-          repo,
-          collection: 'app.bsky.actor.profile',
-          rkey: 'self',
-        })
+        .getRecord({ repo, collection, rkey: 'self' })
         .catch((_) => undefined)
 
+      const existingRecord: AppBskyActorProfile.Record | undefined =
+        existing && predicate.isValidProfile(existing.data.value)
+          ? existing.data.value
+          : undefined
+
       // run the update
-      const updated = await updateFn(existing?.data.value)
-      if (updated) {
-        updated.$type = 'app.bsky.actor.profile'
-      }
+      const updated = await updateFn(existingRecord)
+
+      // validate the value returned by the update function
+      const validation = AppBskyActorProfile.validateRecord({
+        $type: collection,
+        ...updated,
+      })
 
-      // validate the record
-      const validation = AppBskyActorProfile.validateRecord(updated)
       if (!validation.success) {
         throw validation.error
       }
 
-      try {
-        // attempt the put
-        await this.com.atproto.repo.putRecord({
-          repo,
-          collection: 'app.bsky.actor.profile',
-          rkey: 'self',
-          record: updated,
-          swapRecord: existing?.data.cid || null,
-        })
-      } catch (e: unknown) {
-        if (
-          retriesRemaining > 0 &&
-          e instanceof ComAtprotoRepoPutRecord.InvalidSwapError
-        ) {
-          // try again
-          retriesRemaining--
-          continue
-        } else {
-          throw e
-        }
-      }
-      break
+      await this.com.atproto.repo.putRecord({
+        repo,
+        collection,
+        rkey: 'self',
+        record: validation.value,
+        swapRecord: existing?.data.cid || null,
+      })
     }
+
+    return retry(upsert, {
+      maxRetries: 5,
+      retryable: (e) => e instanceof ComAtprotoRepoPutRecord.InvalidSwapError,
+    })
   }
 
   async mute(actor: string) {
@@ -579,14 +577,14 @@ export class Agent extends XrpcClient {
     const res = await this.app.bsky.actor.getPreferences({})
     const labelPrefs: AppBskyActorDefs.ContentLabelPref[] = []
     for (const pref of res.data.preferences) {
-      if (AppBskyActorDefs.isValidAdultContentPref(pref)) {
+      if (predicate.isValidAdultContentPref(pref)) {
         // adult content preferences
         prefs.moderationPrefs.adultContentEnabled = pref.enabled
-      } else if (AppBskyActorDefs.isValidContentLabelPref(pref)) {
+      } else if (predicate.isValidContentLabelPref(pref)) {
         // content label preference
         const adjustedPref = adjustLegacyContentLabelPref(pref)
         labelPrefs.push(adjustedPref)
-      } else if (AppBskyActorDefs.isValidLabelersPref(pref)) {
+      } else if (predicate.isValidLabelersPref(pref)) {
         // labelers preferences
         prefs.moderationPrefs.labelers = this.appLabelers
           .map((did: string) => ({ did, labels: {} }))
@@ -596,29 +594,29 @@ export class Agent extends XrpcClient {
               labels: {},
             })),
           )
-      } else if (AppBskyActorDefs.isValidSavedFeedsPrefV2(pref)) {
+      } else if (predicate.isValidSavedFeedsPrefV2(pref)) {
         prefs.savedFeeds = pref.items
-      } else if (AppBskyActorDefs.isValidSavedFeedsPref(pref)) {
+      } else if (predicate.isValidSavedFeedsPref(pref)) {
         // saved and pinned feeds
         prefs.feeds.saved = pref.saved
         prefs.feeds.pinned = pref.pinned
-      } else if (AppBskyActorDefs.isValidPersonalDetailsPref(pref)) {
+      } else if (predicate.isValidPersonalDetailsPref(pref)) {
         // birth date (irl)
         if (pref.birthDate) {
           prefs.birthDate = new Date(pref.birthDate)
         }
-      } else if (AppBskyActorDefs.isValidFeedViewPref(pref)) {
+      } else if (predicate.isValidFeedViewPref(pref)) {
         // feed view preferences
         const { $type: _, feed, ...v } = pref
         prefs.feedViewPrefs[feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v }
-      } else if (AppBskyActorDefs.isValidThreadViewPref(pref)) {
+      } else if (predicate.isValidThreadViewPref(pref)) {
         // thread view preferences
         const { $type: _, ...v } = pref
         prefs.threadViewPrefs = { ...prefs.threadViewPrefs, ...v }
-      } else if (AppBskyActorDefs.isValidInterestsPref(pref)) {
+      } else if (predicate.isValidInterestsPref(pref)) {
         const { $type: _, ...v } = pref
         prefs.interests = { ...prefs.interests, ...v }
-      } else if (AppBskyActorDefs.isValidMutedWordsPref(pref)) {
+      } else if (predicate.isValidMutedWordsPref(pref)) {
         prefs.moderationPrefs.mutedWords = pref.items
 
         if (prefs.moderationPrefs.mutedWords.length) {
@@ -628,9 +626,9 @@ export class Agent extends XrpcClient {
               return word
             })
         }
-      } else if (AppBskyActorDefs.isValidHiddenPostsPref(pref)) {
+      } else if (predicate.isValidHiddenPostsPref(pref)) {
         prefs.moderationPrefs.hiddenPosts = pref.items
-      } else if (AppBskyActorDefs.isValidBskyAppStatePref(pref)) {
+      } else if (predicate.isValidBskyAppStatePref(pref)) {
         prefs.bskyAppState.queuedNudges = pref.queuedNudges || []
         prefs.bskyAppState.activeProgressGuide = pref.activeProgressGuide
         prefs.bskyAppState.nuxs = pref.nuxs || []
@@ -837,7 +835,7 @@ export class Agent extends XrpcClient {
   async setAdultContentEnabled(v: boolean) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const adultContentPref = prefs.findLast(
-        AppBskyActorDefs.isValidAdultContentPref,
+        predicate.isValidAdultContentPref,
       ) || {
         $type: 'app.bsky.actor.defs#adultContentPref',
         enabled: v,
@@ -861,7 +859,7 @@ export class Agent extends XrpcClient {
     }
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const labelPref = prefs
-        .filter(AppBskyActorDefs.isValidContentLabelPref)
+        .filter(predicate.isValidContentLabelPref)
         .findLast(
           (pref) => pref.label === key && pref.labelerDid === labelerDid,
         ) || {
@@ -888,7 +886,7 @@ export class Agent extends XrpcClient {
           // if it's a legacy label, double-write the legacy label
           if (legacyLabelValue) {
             legacyLabelPref = prefs
-              .filter(AppBskyActorDefs.isValidContentLabelPref)
+              .filter(predicate.isValidContentLabelPref)
               .findLast(
                 (pref) =>
                   pref.label === legacyLabelValue &&
@@ -929,9 +927,7 @@ export class Agent extends XrpcClient {
   async addLabeler(did: string) {
     const prefs = await this.updatePreferences(
       (prefs: AppBskyActorDefs.Preferences) => {
-        const labelersPref = prefs.findLast(
-          AppBskyActorDefs.isValidLabelersPref,
-        ) || {
+        const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
           $type: 'app.bsky.actor.defs#labelersPref',
           labelers: [],
         }
@@ -952,9 +948,7 @@ export class Agent extends XrpcClient {
   async removeLabeler(did: string) {
     const prefs = await this.updatePreferences(
       (prefs: AppBskyActorDefs.Preferences) => {
-        const labelersPref = prefs.findLast(
-          AppBskyActorDefs.isValidLabelersPref,
-        ) || {
+        const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
           $type: 'app.bsky.actor.defs#labelersPref',
           labelers: [],
         }
@@ -980,7 +974,7 @@ export class Agent extends XrpcClient {
     birthDate = birthDate instanceof Date ? birthDate.toISOString() : birthDate
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const personalDetailsPref = prefs.findLast(
-        AppBskyActorDefs.isValidPersonalDetailsPref,
+        predicate.isValidPersonalDetailsPref,
       ) || {
         $type: 'app.bsky.actor.defs#personalDetailsPref',
         birthDate,
@@ -997,7 +991,7 @@ export class Agent extends XrpcClient {
   async setFeedViewPrefs(feed: string, pref: Partial<BskyFeedViewPreference>) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const existing = prefs
-        .filter(AppBskyActorDefs.isValidFeedViewPref)
+        .filter(predicate.isValidFeedViewPref)
         .findLast((pref) => pref.feed === feed)
 
       return prefs
@@ -1013,7 +1007,7 @@ export class Agent extends XrpcClient {
 
   async setThreadViewPrefs(pref: Partial<BskyThreadViewPreference>) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(AppBskyActorDefs.isValidThreadViewPref)
+      const existing = prefs.findLast(predicate.isValidThreadViewPref)
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isThreadViewPref(p))
@@ -1027,7 +1021,7 @@ export class Agent extends XrpcClient {
 
   async setInterestsPref(pref: Partial<BskyInterestsPreference>) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(AppBskyActorDefs.isValidInterestsPref)
+      const existing = prefs.findLast(predicate.isValidInterestsPref)
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isInterestsPref(p))
@@ -1053,9 +1047,7 @@ export class Agent extends XrpcClient {
     if (!sanitizedValue) return
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let mutedWordsPref = prefs.findLast(
-        AppBskyActorDefs.isValidMutedWordsPref,
-      )
+      let mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       const newMutedWord: AppBskyActorDefs.MutedWord = {
         id: TID.nextStr(),
@@ -1112,9 +1104,7 @@ export class Agent extends XrpcClient {
    */
   async updateMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const mutedWordsPref = prefs.findLast(
-        AppBskyActorDefs.isValidMutedWordsPref,
-      )
+      const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
         mutedWordsPref.items = mutedWordsPref.items.map((existingItem) => {
@@ -1162,9 +1152,7 @@ export class Agent extends XrpcClient {
    */
   async removeMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const mutedWordsPref = prefs.findLast(
-        AppBskyActorDefs.isValidMutedWordsPref,
-      )
+      const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
         for (let i = 0; i < mutedWordsPref.items.length; i++) {
@@ -1213,7 +1201,7 @@ export class Agent extends XrpcClient {
   async bskyAppQueueNudges(nudges: string | string[]) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1231,7 +1219,7 @@ export class Agent extends XrpcClient {
   async bskyAppDismissNudges(nudges: string | string[]) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1250,16 +1238,14 @@ export class Agent extends XrpcClient {
   async bskyAppSetActiveProgressGuide(
     guide: AppBskyActorDefs.BskyAppProgressGuide | undefined,
   ) {
-    if (
-      guide &&
-      !AppBskyActorDefs.validateBskyAppProgressGuide(guide).success
-    ) {
-      throw new Error('Invalid progress guide')
+    if (guide) {
+      const result = AppBskyActorDefs.validateBskyAppProgressGuide(guide)
+      if (!result.success) throw result.error
     }
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1280,7 +1266,7 @@ export class Agent extends XrpcClient {
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1321,7 +1307,7 @@ export class Agent extends XrpcClient {
   async bskyAppRemoveNuxs(ids: string[]) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1371,7 +1357,7 @@ export class Agent extends XrpcClient {
 
   private async updateHiddenPost(postUri: string, action: 'hide' | 'unhide') {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const pref = prefs.findLast(AppBskyActorDefs.isValidHiddenPostsPref) || {
+      const pref = prefs.findLast(predicate.isValidHiddenPostsPref) || {
         $type: 'app.bsky.actor.defs#hiddenPostsPref',
         items: [],
       }
@@ -1400,9 +1386,7 @@ export class Agent extends XrpcClient {
   ): Promise<{ saved: string[]; pinned: string[] }> {
     let res
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const feedsPref = prefs.findLast(
-        AppBskyActorDefs.isValidSavedFeedsPref,
-      ) || {
+      const feedsPref = prefs.findLast(predicate.isValidSavedFeedsPref) || {
         $type: 'app.bsky.actor.defs#savedFeedsPref',
         saved: [],
         pinned: [],
@@ -1427,12 +1411,8 @@ export class Agent extends XrpcClient {
     let maybeMutatedSavedFeeds: AppBskyActorDefs.SavedFeed[] = []
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let existingV2Pref = prefs.findLast(
-        AppBskyActorDefs.isValidSavedFeedsPrefV2,
-      )
-      let existingV1Pref = prefs.findLast(
-        AppBskyActorDefs.isValidSavedFeedsPref,
-      )
+      let existingV2Pref = prefs.findLast(predicate.isValidSavedFeedsPrefV2)
+      let existingV1Pref = prefs.findLast(predicate.isValidSavedFeedsPref)
 
       if (existingV2Pref) {
         maybeMutatedSavedFeeds = cb(existingV2Pref.items)
@@ -1533,7 +1513,7 @@ function remapLegacyLabels(
 function prefsArrayToLabelerDids(
   prefs: AppBskyActorDefs.Preferences,
 ): string[] {
-  const labelersPref = prefs.findLast(AppBskyActorDefs.isValidLabelersPref)
+  const labelersPref = prefs.findLast(predicate.isValidLabelersPref)
   let dids: string[] = []
   if (labelersPref) {
     dids = (labelersPref as AppBskyActorDefs.LabelersPref).labelers.map(

package/src/atp-agent.ts

@@ -309,6 +309,7 @@ export class CredentialSession implements SessionManager {
         identifier: opts.identifier,
         password: opts.password,
         authFactorToken: opts.authFactorToken,
+        allowTakendown: opts.allowTakendown,
       })
       this.session = {
         accessJwt: res.data.accessJwt,