[SDK] Migrate agent sugar to @bsky.app/sdk actions (#11382)

src/ageAssurance/components/RedirectOverlay.tsx

@@ -16,7 +16,7 @@ import {Trans} from '@lingui/react/macro'
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
 import {parseLinkingUrl} from '#/lib/parseLinkingUrl'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, useSession} from '#/state/session'
 import {atoms as a, platform, useBreakpoints, useTheme} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {Button, ButtonText} from '#/components/Button'
@@ -176,7 +176,7 @@ function Inner() {
   const t = useTheme()
   const ax = useAnalytics()
   const {_} = useLingui()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const polling = useRef(false)
   const unmounted = useRef(false)
   const [error, setError] = useState(false)
@@ -196,10 +196,10 @@ function Inner() {
         5,
         () => true,
         async () => {
-          if (!agent.session) return
+          if (!appviewClient.did) return
           if (unmounted.current) return
 
-          const data = await refetchAgeAssuranceServerState({agent})
+          const data = await refetchAgeAssuranceServerState({appviewClient})
 
           if (data?.state.status !== 'assured') {
             throw new Error(
@@ -214,7 +214,7 @@ function Inner() {
     )
       .then(async data => {
         if (!data) return
-        if (!agent.session) return
+        if (!appviewClient.did) return
         if (unmounted.current) return
 
         setSuccess(true)
@@ -230,7 +230,7 @@ function Inner() {
     return () => {
       unmounted.current = true
     }
-  }, [ax, agent])
+  }, [ax, appviewClient])
 
   if (success) {
     return (

src/ageAssurance/data.tsx

@@ -7,6 +7,8 @@ import {
   AtpAgent,
   type ChatBskyActorDeclaration,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
+import {getPreferences} from '@bsky.app/sdk'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
 import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'
 import {persistQueryClient} from '@tanstack/react-query-persist-client'
@@ -21,7 +23,7 @@ import {
   snoozeBirthdateUpdateAllowedForDid,
 } from '#/state/birthdate'
 import {fetchActorDeclarationRecord} from '#/state/queries/messages/actor-declaration'
-import {useAgent, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import {DEVICE_SIGNALS_SUPPORTED} from '#/ageAssurance/const'
 import * as debug from '#/ageAssurance/debug'
 import {logger} from '#/ageAssurance/logger'
@@ -37,6 +39,7 @@ import {
 } from '#/ageAssurance/util'
 import {IS_DEV} from '#/env'
 import {useGeolocation} from '#/geolocation'
+import {app} from '#/lexicons'
 import {device} from '#/storage'
 
 /**
@@ -63,12 +66,6 @@ const [, cacheHydrationPromise] = persistQueryClient({
   persister,
 })
 
-export function getDidFromAgentSession(agent: AtpAgent) {
-  const sessionManager = agent.sessionManager
-  if (!sessionManager || !sessionManager.did) return
-  return sessionManager.did
-}
-
 /*
  * Optimistic data
  */
@@ -187,7 +184,7 @@ export function useConfigQuery() {
 export function createServerStateQueryKey({did}: {did: string}) {
   return ['serverState', did]
 }
-export async function getServerState({agent}: {agent: AtpAgent}) {
+export async function getServerState({appviewClient}: {appviewClient: Client}) {
   if (debug.enabled && debug.serverState)
     return debug.resolve(debug.serverState)
   const geolocation = device.get(['mergedGeolocation'])
@@ -195,17 +192,21 @@ export async function getServerState({agent}: {agent: AtpAgent}) {
     logger.error(`getServerState: missing geolocation countryCode`)
     return null
   }
-  const {data} = await agent.app.bsky.ageassurance.getState({
+  const data = await appviewClient.call(app.bsky.ageassurance.getState, {
     countryCode: geolocation.countryCode,
     regionCode: geolocation.regionCode,
   })
-  const did = getDidFromAgentSession(agent)
+  const did = appviewClient.did
   if (data && did && createdAtCache.has(did)) {
     /*
      * If account was just created, just use the local cache if available. On
-     * subsequent reloads, the server should have the correct value.
+     * subsequent reloads, the server should have the correct value. The cache
+     * holds ISO datetime strings (written from `new Date().toISOString()`), so
+     * assert the branded DatetimeString at this boundary.
      */
-    data.metadata.accountCreatedAt = createdAtCache.get(did)
+    data.metadata.accountCreatedAt = createdAtCache.get(
+      did,
+    ) as typeof data.metadata.accountCreatedAt
   }
   return data ?? null
 }
@@ -218,8 +219,12 @@ export function getServerStateFromCache({
     createServerStateQueryKey({did}),
   )
 }
-export async function prefetchServerState({agent}: {agent: AtpAgent}) {
+export async function prefetchServerState({
-  const did = getDidFromAgentSession(agent)
+  appviewClient,
+}: {
+  appviewClient: Client
+}) {
+  const did = appviewClient.did
 
   if (!did) return
 
@@ -234,7 +239,7 @@ export async function prefetchServerState({agent}: {agent: AtpAgent}) {
 
   try {
     logger.debug(`prefetchServerState: resolving...`)
-    const res = await networkRetry(3, () => getServerState({agent}))
+    const res = await networkRetry(3, () => getServerState({appviewClient}))
     if (res) {
       qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
     }
@@ -245,11 +250,15 @@ export async function prefetchServerState({agent}: {agent: AtpAgent}) {
     })
   }
 }
-export async function refetchServerState({agent}: {agent: AtpAgent}) {
+export async function refetchServerState({
-  const did = getDidFromAgentSession(agent)
+  appviewClient,
+}: {
+  appviewClient: Client
+}) {
+  const did = appviewClient.did
   if (!did) return
   logger.debug(`refetchServerState: fetching...`)
-  const res = await networkRetry(3, () => getServerState({agent}))
+  const res = await networkRetry(3, () => getServerState({appviewClient}))
   if (res) {
     qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
       createServerStateQueryKey({did}),
@@ -279,8 +288,8 @@ export function usePatchServerState() {
   )
 }
 export function useServerStateQuery() {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
-  const did = getDidFromAgentSession(agent)
+  const did = appviewClient.did
   const query = useQuery(
     {
       enabled: !!did,
@@ -290,7 +299,7 @@ export function useServerStateQuery() {
       },
       queryKey: createServerStateQueryKey({did: did!}),
       async queryFn() {
-        return getServerState({agent})
+        return getServerState({appviewClient})
       },
     },
     qc,
@@ -342,15 +351,15 @@ export function createOtherRequiredDataQueryKey({did}: {did: string}) {
   return ['otherRequiredData', did]
 }
 async function getOtherRequiredData({
-  agent,
+  accountClient,
 }: {
-  agent: AtpAgent
+  accountClient: Client
 }): Promise<OtherRequiredData> {
   if (debug.enabled) return debug.resolve(debug.otherRequiredData)
-  const did = getDidFromAgentSession(agent)
+  const did = accountClient.did
   const [prefs, actorDeclaration] = await Promise.all([
-    agent.getPreferences(),
+    accountClient.call(getPreferences),
-    fetchActorDeclarationRecord({did, agent}),
+    fetchActorDeclarationRecord({did, client: accountClient}),
   ])
   const data: OtherRequiredData = {
     birthdate: prefs.birthDate ? prefs.birthDate.toISOString() : undefined,
@@ -426,8 +435,12 @@ export function setOtherRequiredDataActorDeclarationCache({
     next,
   )
 }
-export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
+export async function prefetchOtherRequiredData({
-  const did = getDidFromAgentSession(agent)
+  accountClient,
+}: {
+  accountClient: Client
+}) {
+  const did = accountClient.did
 
   if (!did) return
 
@@ -442,7 +455,9 @@ export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
 
   try {
     logger.debug(`prefetchOtherRequiredData: resolving...`)
-    const res = await networkRetry(3, () => getOtherRequiredData({agent}))
+    const res = await networkRetry(3, () =>
+      getOtherRequiredData({accountClient}),
+    )
     qc.setQueryData<OtherRequiredData>(qk, res)
   } catch (err) {
     const e = err as Error
@@ -471,8 +486,8 @@ export function usePatchOtherRequiredData() {
   )
 }
 export function useOtherRequiredDataQuery() {
-  const agent = useAgent()
+  const accountClient = usePdsClient()
-  const did = getDidFromAgentSession(agent)
+  const did = accountClient.did
   return useQuery(
     {
       enabled: !!did,
@@ -482,7 +497,7 @@ export function useOtherRequiredDataQuery() {
       },
       queryKey: createOtherRequiredDataQueryKey({did: did!}),
       async queryFn() {
-        return getOtherRequiredData({agent})
+        return getOtherRequiredData({accountClient})
       },
     },
     qc,
@@ -577,8 +592,12 @@ export function setDeviceSignalsForRegion({
     prev => ({...prev, [regionKey]: signals}),
   )
 }
-export async function prefetchDeviceSignals({agent}: {agent: AtpAgent}) {
+export async function prefetchDeviceSignals({
-  const did = getDidFromAgentSession(agent)
+  appviewClient,
+}: {
+  appviewClient: Client
+}) {
+  const did = appviewClient.did
   if (!did) return
 
   /**
@@ -613,8 +632,8 @@ export async function prefetchDeviceSignals({agent}: {agent: AtpAgent}) {
    */
 }
 export function useDeviceSignalsQuery() {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
-  const did = getDidFromAgentSession(agent)
+  const did = appviewClient.did
   const {data: config} = useConfigQuery()
   const geolocation = useGeolocation()
   /*
@@ -659,13 +678,19 @@ export function useDeviceSignalsQuery() {
 /**
  * Helper to prefetch all age assurance data from the server.
  */
-export function prefetchAgeAssuranceServerData({agent}: {agent: AtpAgent}) {
+export function prefetchAgeAssuranceServerData({
+  appviewClient,
+  accountClient,
+}: {
+  appviewClient: Client
+  accountClient: Client
+}) {
   return Promise.allSettled([
     // config fetch initiated at the top of the App.platform.tsx files, awaited here
     configPrefetchPromise,
-    prefetchServerState({agent}),
+    prefetchServerState({appviewClient}),
-    prefetchOtherRequiredData({agent}),
+    prefetchOtherRequiredData({accountClient}),
-    prefetchDeviceSignals({agent}),
+    prefetchDeviceSignals({appviewClient}),
   ])
 }
 

src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx

@@ -6,7 +6,7 @@ import {Trans} from '@lingui/react/macro'
 
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
-import {useAgent} from '#/state/session'
+import {useAppviewClient} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {Button, ButtonText} from '#/components/Button'
@@ -84,7 +84,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
   const t = useTheme()
   const ax = useAnalytics()
   const {_} = useLingui()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   const polling = useRef(false)
   const unmounted = useRef(false)
   const control = useAgeAssuranceRedirectDialogControl()
@@ -104,10 +104,10 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
         5,
         () => true,
         async () => {
-          if (!agent.session) return
+          if (!appviewClient.did) return
           if (unmounted.current) return
 
-          const data = await refetchAgeAssuranceServerState({agent})
+          const data = await refetchAgeAssuranceServerState({appviewClient})
 
           if (data?.state.status !== 'assured') {
             throw new Error(
@@ -122,7 +122,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
     )
       .then(async data => {
         if (!data) return
-        if (!agent.session) return
+        if (!appviewClient.did) return
         if (unmounted.current) return
 
         setSuccess(true)
@@ -138,7 +138,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
     return () => {
       unmounted.current = true
     }
-  }, [ax, agent, control])
+  }, [ax, appviewClient, control])
 
   if (success) {
     return (

src/components/contacts/screens/GetContacts.tsx

@@ -2,24 +2,21 @@ import {useContext} from 'react'
 import {Alert, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as Contacts from 'expo-contacts'
-import type AtpAgent from '@atproto/api'
+import {type Un$Typed} from '@atproto/lex'
-import {
-  type AppBskyActorProfile,
-  AppBskyContactImportContacts,
-  type Un$Typed,
-} from '@atproto/api'
 import {type Client} from '@atproto/lex'
+import {toDatetimeString} from '@atproto/syntax'
+import {upsertProfile} from '@bsky.app/sdk'
 import {msg, t} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {findContactsStatusQueryKey} from '#/state/queries/find-contacts'
-import {useAgent, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
 import {
   Context as OnboardingContext,
   type OnboardingAction,
@@ -32,6 +29,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 import {
   contactsWithPhoneNumbersOnly,
   filterMatchedNumbers,
@@ -56,8 +54,8 @@ export function GetContacts({
 }) {
   const {_} = useLingui()
   const ax = useAnalytics()
-  const agent = useAgent()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const insets = useSafeAreaInsets()
   const gutters = useGutters([0, 'wide'])
   const queryClient = useQueryClient()
@@ -75,7 +73,7 @@ export function GetContacts({
        */
       if (context === 'Onboarding' && maybeOnboardingContext) {
         try {
-          await createProfileRecord(agent, pdsClient, maybeOnboardingContext)
+          await createProfileRecord(pdsClient, maybeOnboardingContext)
         } catch (error) {
           logger.debug('Error creating profile record:', {safeMessage: error})
         }
@@ -88,13 +86,13 @@ export function GetContacts({
       )
 
       if (phoneNumbers.length > 0) {
-        const res = await agent.app.bsky.contact.importContacts({
+        const res = await appviewClient.call(app.bsky.contact.importContacts, {
           token: state.token,
           contacts: phoneNumbers.slice(0, MAX_UPLOAD_COUNT),
         })
 
         return {
-          matches: res.data.matchesAndContactIndexes,
+          matches: res.matchesAndContactIndexes,
           indexToContactId,
         }
       } else {
@@ -151,29 +149,30 @@ export function GetContacts({
           ),
           {type: 'error'},
         )
-      } else if (
+        return
-        err instanceof AppBskyContactImportContacts.TooManyContactsError
+      }
-      ) {
+      switch (matchXrpcError(err, app.bsky.contact.importContacts)) {
-        Toast.show(
+        case 'TooManyContacts':
-          _(
+          Toast.show(
-            msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
+            _(
-          ),
+              msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
-          {type: 'error'},
+            ),
-        )
+            {type: 'error'},
-      } else if (
+          )
-        err instanceof AppBskyContactImportContacts.InvalidTokenError
+          break
-      ) {
+        case 'InvalidToken':
-        Toast.show(
+          Toast.show(
-          _(
+            _(
-            msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
+              msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
-          ),
+            ),
-          {type: 'error'},
+            {type: 'error'},
-        )
+          )
-      } else {
+          break
-        logger.error('Error uploading contacts', {safeMessage: err})
+        default:
-        Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
+          logger.error('Error uploading contacts', {safeMessage: err})
-          type: 'error',
+          Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
-        })
+            type: 'error',
+          })
       }
     },
   })
@@ -328,7 +327,6 @@ function showPermissionDeniedAlert() {
  * Copied from `#/screens/Onboarding/StepFinished/index.tsx`
  */
 async function createProfileRecord(
-  agent: AtpAgent,
   pdsClient: Client,
   onboardingContext: {
     state: OnboardingState
@@ -342,19 +340,21 @@ async function createProfileRecord(
       ? uploadBlob(pdsClient, imageUri, imageMime)
       : undefined
 
-  await agent.upsertProfile(async existing => {
+  await pdsClient.call(upsertProfile, async existing => {
-    let next: Un$Typed<AppBskyActorProfile.Record> = existing ?? {}
+    let next: Un$Typed<app.bsky.actor.profile.Main> = existing ?? {}
 
     if (blobPromise) {
       const res = await blobPromise
       if (res.blob) {
-        next.avatar = toLegacyBlobRef(res.blob)
+        next.avatar = res.blob
       }
     }
 
     next.displayName = ''
 
-    next.createdAt = new Date().toISOString()
+    if (!next.createdAt) {
+      next.createdAt = toDatetimeString(new Date())
+    }
     return next
   })
 }

src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx

@@ -6,7 +6,6 @@ import {
   type AtIdentifierString,
   AtUri,
   type AtUriString,
-  type DidString,
   toDatetimeString,
 } from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
@@ -86,8 +85,7 @@ export function CreateListFromStarterPackDialog({
               items.map(item => {
                 const listitemRecord: $Typed<app.bsky.graph.listitem.Main> = {
                   $type: 'app.bsky.graph.listitem',
-                  // the list view is still legacy-typed, so its strings are unbranded
+                  subject: item.subject.did,
-                  subject: item.subject.did as DidString,
                   list: listUri as AtUriString,
                   createdAt: toDatetimeString(new Date()),
                 }

src/features/liveEvents/preferences.ts

@@ -1,12 +1,12 @@
 import {useEffect} from 'react'
-import {type Agent, AppBskyActorDefs, asPredicate} from '@atproto/api'
+import {getPreferences, updateLiveEventPreferences} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {
   preferencesQueryKey,
   usePreferencesQuery,
 } from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {useAnalytics} from '#/analytics'
 import * as env from '#/env'
 import {IS_WEB} from '#/env'
@@ -14,10 +14,11 @@ import {
   type LiveEventFeed,
   type LiveEventFeedMetricContext,
 } from '#/features/liveEvents/types'
+import {type app} from '#/lexicons'
 
 export type LiveEventPreferencesAction = Parameters<
-  Agent['updateLiveEventPreferences']
+  typeof updateLiveEventPreferences
->[0] & {
+>[1] & {
   /**
    * Flag that is internal to this hook, do not set when updating prefs
    */
@@ -38,7 +39,7 @@ export function useLiveEventPreferences() {
 
 function useWebOnlyDebugLiveEventPreferences() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   useEffect(() => {
     if (env.IS_DEV && IS_WEB && typeof window !== 'undefined') {
@@ -46,14 +47,14 @@ function useWebOnlyDebugLiveEventPreferences() {
       window.__updateLiveEventPreferences = async (
         action: LiveEventPreferencesAction,
       ) => {
-        await agent.updateLiveEventPreferences(action)
+        await pdsClient.call(updateLiveEventPreferences, action)
         // triggers a refetch
         await queryClient.invalidateQueries({
           queryKey: preferencesQueryKey,
         })
       }
     }
-  }, [agent, queryClient])
+  }, [pdsClient, queryClient])
 }
 
 export function useUpdateLiveEventPreferences(props: {
@@ -65,10 +66,10 @@ export function useUpdateLiveEventPreferences(props: {
 }) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation<
-    AppBskyActorDefs.LiveEventPreferences,
+    app.bsky.actor.defs.LiveEventPreferences,
     Error,
     LiveEventPreferencesAction,
     {undoAction: LiveEventPreferencesAction | null}
@@ -108,10 +109,14 @@ export function useUpdateLiveEventPreferences(props: {
       }
     },
     mutationFn: async action => {
-      const updated = await agent.updateLiveEventPreferences(action)
+      /*
-      const prefs = updated.find(p =>
+       * The SDK action returns void, so after applying the update we read the
-        asPredicate(AppBskyActorDefs.validateLiveEventPreferences)(p),
+       * fresh, interpreted preferences back to obtain the updated
-      )
+       * `liveEventPreferences` (the SDK extracts it from the raw prefs array for
+       * us, replacing the old `asPredicate(...).find(...)` lookup).
+       */
+      await pdsClient.call(updateLiveEventPreferences, action)
+      const {liveEventPreferences: prefs} = await pdsClient.call(getPreferences)
 
       switch (action.type) {
         case 'hideFeed':
@@ -138,7 +143,7 @@ export function useUpdateLiveEventPreferences(props: {
           break
         }
         case 'toggleHideAllFeeds': {
-          if (prefs!.hideAllFeeds) {
+          if (prefs.hideAllFeeds) {
             ax.metric('liveEvents:hideAllFeedBanners', {
               context: props.metricContext,
             })
@@ -156,7 +161,7 @@ export function useUpdateLiveEventPreferences(props: {
         queryKey: preferencesQueryKey,
       })
 
-      return prefs!
+      return prefs
     },
   })
 }

src/lib/api/legacy-blob.ts

@@ -1,16 +0,0 @@
-import {BlobRef} from '@atproto/api'
-import {type BlobRef as LexBlobRef} from '@atproto/lex'
-
-/**
- * Bridge a lex blob ref (the plain-JSON `{$type: 'blob', ref, mimeType, size}`
- * that {@link uploadBlob} now returns) back to the legacy `BlobRef` class
- * instance.
- *
- * Only needed where a blob is handed to a legacy agent write: the legacy
- * lexicon blob validator checks `value instanceof BlobRef`, so a plain lex
- * blob fails validation, and the legacy serializer would put the wrong shape
- * on the wire. Drop each call as its write moves to the lex client.
- */
-export function toLegacyBlobRef(blob: LexBlobRef): BlobRef {
-  return BlobRef.fromJsonRef(blob as Parameters<typeof BlobRef.fromJsonRef>[0])
-}

src/screens/Onboarding/StepFinished/index.tsx

@@ -1,21 +1,19 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorProfile,
-  type AppBskyGraphDefs,
-  AppBskyGraphStarterpack,
-  type Un$Typed,
-} from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {type AtUriString} from '@atproto/syntax'
+import {type Un$Typed} from '@atproto/lex'
+import {type AtUriString, toDatetimeString} from '@atproto/syntax'
+import {
+  overwriteSavedFeeds,
+  setInterestsPref,
+  upsertProfile,
+} from '@bsky.app/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {
   BSKY_APP_ACCOUNT_DID,
   DISCOVER_SAVED_FEED,
@@ -28,7 +26,7 @@ import {useSetHasCheckedForStarterPack} from '#/state/preferences/used-starter-p
 import {getAllListMembers} from '#/state/queries/list-members'
 import {preferencesQueryKey} from '#/state/queries/preferences'
 import {RQKEY as profileRQKey} from '#/state/queries/profile'
-import {useAgent, useAppviewClient, usePdsClient} from '#/state/session'
+import {useAppviewClient, usePdsClient} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {
   useActiveStarterPack,
@@ -50,6 +48,7 @@ import {ArrowRight_Stroke2_Corner0_Rounded as ArrowRight} from '#/components/ico
 import {Loader} from '#/components/Loader'
 import {useAnalytics} from '#/analytics'
 import {IS_WEB} from '#/env'
+import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
 import {ValuePropositionPager} from './ValuePropositionPager'
 
@@ -59,9 +58,8 @@ export function StepFinished() {
   const onboardDispatch = useOnboardingDispatch()
   const [saving, setSaving] = useState(false)
   const queryClient = useQueryClient()
-  const agent = useAgent()
-  const appviewClient = useAppviewClient()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const requestNotificationsPermission = useRequestNotificationsPermission()
   const activeStarterPack = useActiveStarterPack()
   const setActiveStarterPack = useSetActiveStarterPack()
@@ -71,15 +69,15 @@ export function StepFinished() {
   const finishOnboarding = useCallback(async () => {
     setSaving(true)
 
-    let starterPack: AppBskyGraphDefs.StarterPackView | undefined
+    let starterPack: app.bsky.graph.defs.StarterPackView | undefined
-    let listItems: AppBskyGraphDefs.ListItemView[] | undefined
+    let listItems: app.bsky.graph.defs.ListItemView[] | undefined
 
     if (activeStarterPack?.uri) {
       try {
-        const spRes = await agent.app.bsky.graph.getStarterPack({
+        const spRes = await appviewClient.call(app.bsky.graph.getStarterPack, {
-          starterPack: activeStarterPack.uri,
+          starterPack: activeStarterPack.uri as AtUriString,
         })
-        starterPack = spRes.data.starterPack
+        starterPack = spRes.starterPack
       } catch (e) {
         logger.error('Failed to fetch starter pack', {safeMessage: e})
         // don't tell the user, just get them through onboarding.
@@ -109,19 +107,15 @@ export function StepFinished() {
           appviewClient,
           [BSKY_APP_ACCOUNT_DID, ...(listItems?.map(i => i.subject.did) ?? [])],
           starterPack
-            ? // the starter pack view is still legacy-typed
+            ? {uri: starterPack.uri, cid: starterPack.cid}
-              {
-                uri: starterPack.uri as AtUriString,
-                cid: starterPack.cid,
-              }
             : undefined,
         ),
         (async () => {
           // Interests need to get saved first, then we can write the feeds to prefs
-          await agent.setInterestsPref({tags: selectedInterests})
+          await pdsClient.call(setInterestsPref, {tags: selectedInterests})
 
           // Default feeds that every user should have pinned when landing in the app
-          const feedsToSave: AppBskyActorDefs.SavedFeed[] = [
+          const feedsToSave: app.bsky.actor.defs.SavedFeed[] = [
             {
               ...DISCOVER_SAVED_FEED,
               id: TID.nextStr(),
@@ -140,7 +134,7 @@ export function StepFinished() {
           if (starterPack && starterPack.feeds?.length) {
             feedsToSave.push(
               ...starterPack.feeds.map(f => ({
-                type: 'feed',
+                type: 'feed' as const,
                 value: f.uri,
                 pinned: true,
                 id: TID.nextStr(),
@@ -148,7 +142,7 @@ export function StepFinished() {
             )
           }
 
-          await agent.overwriteSavedFeeds(feedsToSave)
+          await pdsClient.call(overwriteSavedFeeds, feedsToSave)
         })(),
         (async () => {
           const {imageUri, imageMime} = profileStepResults
@@ -157,13 +151,13 @@ export function StepFinished() {
               ? uploadBlob(pdsClient, imageUri, imageMime)
               : undefined
 
-          await agent.upsertProfile(async existing => {
+          await pdsClient.call(upsertProfile, async existing => {
-            let next: Un$Typed<AppBskyActorProfile.Record> = existing ?? {}
+            let next: Un$Typed<app.bsky.actor.profile.Main> = existing ?? {}
 
             if (blobPromise) {
               const res = await blobPromise
               if (res.blob) {
-                next.avatar = toLegacyBlobRef(res.blob)
+                next.avatar = res.blob
               }
             }
 
@@ -177,7 +171,7 @@ export function StepFinished() {
             next.displayName = ''
 
             if (!next.createdAt) {
-              next.createdAt = new Date().toISOString()
+              next.createdAt = toDatetimeString(new Date())
             }
             return next
           })
@@ -204,7 +198,7 @@ export function StepFinished() {
         queryKey: preferencesQueryKey,
       }),
       queryClient.invalidateQueries({
-        queryKey: profileRQKey(agent.session?.did ?? ''),
+        queryKey: profileRQKey(pdsClient.did ?? ''),
       }),
     ]).catch(e => {
       logger.error(e)
@@ -221,10 +215,7 @@ export function StepFinished() {
       usedStarterPack: Boolean(starterPack),
       starterPackName:
         starterPack &&
-        bsky.dangerousIsType<AppBskyGraphStarterpack.Record>(
+        bsky.isType(app.bsky.graph.starterpack, starterPack.record)
-          starterPack.record,
-          AppBskyGraphStarterpack.isRecord,
-        )
           ? starterPack.record.name
           : undefined,
       starterPackCreator: starterPack?.creator.did,
@@ -242,9 +233,8 @@ export function StepFinished() {
   }, [
     ax,
     queryClient,
-    agent,
-    appviewClient,
     pdsClient,
+    appviewClient,
     dispatch,
     onboardDispatch,
     activeStarterPack,

src/screens/Settings/InterestsSettings.tsx

@@ -1,5 +1,6 @@
 import {useMemo, useState} from 'react'
 import {type TextStyle, View, type ViewStyle} from 'react-native'
+import {setInterestsPref} from '@bsky.app/sdk'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
@@ -23,7 +24,7 @@ import {createGetSuggestedUsersForDiscoverQueryKey} from '#/state/queries/trendi
 import {createGetSuggestedUsersForExploreQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForExploreQuery'
 import {createGetSuggestedUsersForSeeMoreQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery'
 import {createSuggestedStarterPacksQueryKey} from '#/state/queries/useSuggestedStarterPacksQuery'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {atoms as a, useGutters, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Divider} from '#/components/Divider'
@@ -88,7 +89,7 @@ function Inner({
   setIsSaving: (isSaving: boolean) => void
 }) {
   const {_} = useLingui()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const qc = useQueryClient()
   const interestsDisplayNames = useInterestsDisplayNames()
   const preselectedInterests = useMemo(
@@ -110,7 +111,7 @@ function Inner({
       setIsSaving(true)
 
       try {
-        await agent.setInterestsPref({tags: interests})
+        await pdsClient.call(setInterestsPref, {tags: interests})
         qc.setQueriesData(
           {queryKey: preferencesQueryKey},
           (old?: UsePreferencesQueryResponse) => {
@@ -157,7 +158,7 @@ function Inner({
         setIsSaving(false)
       }
     }, 1500)
-  }, [_, agent, setIsSaving, qc, preselectedInterests])
+  }, [_, pdsClient, setIsSaving, qc, preselectedInterests])
 
   const onChangeInterests = async (interests: string[]) => {
     setInterests(interests)

src/screens/Settings/Settings.tsx

@@ -2,6 +2,7 @@ import {useState} from 'react'
 import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native'
 import {useReducedMotion} from 'react-native-reanimated'
 import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
+import {removeNuxs} from '@bsky.app/sdk'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -21,7 +22,7 @@ import {clearStorage} from '#/state/persisted'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useDeleteActorDeclaration} from '#/state/queries/messages/actor-declaration'
 import {useProfileQuery, useProfilesQuery} from '#/state/queries/profile'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 import {type SessionAccount, useSession, useSessionApi} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -385,7 +386,7 @@ function ProfilePreview({
 
 function DevOptions() {
   const {t: l} = useLingui()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const [override, setOverride] = useStorage(device, [
     'policyUpdateDebugOverride',
   ])
@@ -560,7 +561,7 @@ function DevOptions() {
           <Button
             onPress={() => {
               device.set([PolicyUpdate202508], false)
-              void agent.bskyAppRemoveNuxs([PolicyUpdate202508])
+              void pdsClient.call(removeNuxs, [PolicyUpdate202508])
               Toast.show(`Done`, {
                 type: 'info',
               })

src/state/birthdate.ts

@@ -1,9 +1,10 @@
 import {useMemo} from 'react'
+import {setPersonalDetails} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
 import {preferencesQueryKey} from '#/state/queries/preferences'
-import {useAgent, usePdsClient, useSession} from '#/state/session'
+import {usePdsClient, useSession} from '#/state/session'
 import {usePatchAgeAssuranceOtherRequiredData} from '#/ageAssurance'
 import {isUnderAge} from '#/ageAssurance/util'
 import {IS_DEV} from '#/env'
@@ -54,14 +55,14 @@ export function useIsBirthdateUpdateAllowed() {
 
 export function useBirthdateMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const {currentAccount} = useSession()
   const pdsClient = usePdsClient()
   const patchOtherRequiredData = usePatchAgeAssuranceOtherRequiredData()
 
   return useMutation<void, unknown, {birthDate: Date}>({
     mutationFn: async ({birthDate}: {birthDate: Date}) => {
       const bday = birthDate.toISOString()
-      await agent.setPersonalDetails({birthDate: bday})
+      await pdsClient.call(setPersonalDetails, {birthDate})
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -80,7 +81,9 @@ export function useBirthdateMutation() {
        * birthdate, which may change the user's age assurance access level.
        */
       void patchOtherRequiredData({birthdate: bday})
-      snoozeBirthdateUpdateAllowedForDid(agent.sessionManager.did!)
+      if (currentAccount) {
+        snoozeBirthdateUpdateAllowedForDid(currentAccount.did)
+      }
     },
   })
 }

src/state/queries/labeler.ts

@@ -1,4 +1,6 @@
 import {type AppBskyLabelerDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
+import {addLabeler, removeLabeler} from '@bsky.app/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import {z} from 'zod'
 
@@ -9,7 +11,7 @@ import {
   usePreferencesQuery,
 } from '#/state/queries/preferences'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAgent, usePdsClient} from '#/state/session'
 
 const labelerInfoQueryKeyRoot = 'labeler-info'
 export const labelerInfoQueryKey = (did: string) => [
@@ -78,11 +80,13 @@ export function useLabelersDetailedInfoQuery({dids}: {dids: string[]}) {
 
 export function useRemoveLabelersMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     async mutationFn({dids}: {dids: string[]}) {
-      await Promise.all(dids.map(did => agent.removeLabeler(did)))
+      await Promise.all(
+        dids.map(did => client.call(removeLabeler, did as DidString)),
+      )
     },
     async onSuccess() {
       await queryClient.invalidateQueries({
@@ -95,6 +99,7 @@ export function useRemoveLabelersMutation() {
 export function useLabelerSubscriptionMutation() {
   const queryClient = useQueryClient()
   const agent = useAgent()
+  const pdsClient = usePdsClient()
   const preferences = usePreferencesQuery()
 
   return useMutation({
@@ -136,7 +141,11 @@ export function useLabelerSubscriptionMutation() {
         }
       }
       if (invalidLabelers.length) {
-        await Promise.all(invalidLabelers.map(did => agent.removeLabeler(did)))
+        await Promise.all(
+          invalidLabelers.map(did =>
+            pdsClient.call(removeLabeler, did as DidString),
+          ),
+        )
       }
 
       if (subscribe) {
@@ -144,9 +153,9 @@ export function useLabelerSubscriptionMutation() {
         if (labelerCount >= MAX_LABELERS) {
           throw new Error('MAX_LABELERS')
         }
-        await agent.addLabeler(did)
+        await pdsClient.call(addLabeler, did as DidString)
       } else {
-        await agent.removeLabeler(did)
+        await pdsClient.call(removeLabeler, did as DidString)
       }
     },
     async onSuccess() {

src/state/queries/like.ts

@@ -1,22 +1,27 @@
+import {type AtUriString} from '@atproto/syntax'
+import {deleteLike, like} from '@bsky.app/sdk'
 import {useMutation} from '@tanstack/react-query'
 
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
 
 export function useLikeMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation({
     mutationFn: async ({uri, cid}: {uri: string; cid: string}) => {
-      const res = await agent.like(uri, cid)
+      const res = await pdsClient.call(like, {
+        uri: uri as AtUriString,
+        cid,
+      })
       return {uri: res.uri}
     },
   })
 }
 
 export function useUnlikeMutation() {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation({
     mutationFn: async ({uri}: {uri: string}) => {
-      await agent.deleteLike(uri)
+      await pdsClient.call(deleteLike, uri as AtUriString)
     },
   })
 }

src/state/queries/list-members.ts

@@ -61,7 +61,7 @@ export function useAllListMembersQuery(uri?: string) {
 export async function getAllListMembers(client: Client, uri: string) {
   let hasMore = true
   let cursor: string | undefined
-  const listItems: AppBskyGraphDefs.ListItemView[] = []
+  const listItems: app.bsky.graph.defs.ListItemView[] = []
   // We want to cap this at 6 pages, just for anything weird happening with the api
   let i = 0
   while (hasMore && i < 6) {

src/state/queries/list.ts

@@ -6,6 +6,12 @@ import {
   type AtUriString,
   toDatetimeString,
 } from '@atproto/syntax'
+import {
+  blockActorList,
+  muteActorList,
+  unblockActorList,
+  unmuteActorList,
+} from '@bsky.app/sdk'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
@@ -13,12 +19,7 @@ import {uploadBlob} from '#/lib/api'
 import {until} from '#/lib/async/until'
 import {type ImageMeta} from '#/state/gallery'
 import {STALE} from '#/state/queries'
-import {
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
-  useAgent,
-  useAppviewClient,
-  usePdsClient,
-  useSession,
-} from '#/state/session'
 import {app, com} from '#/lexicons'
 import {FEED_INFO_RQKEY_ROOT} from './feed'
 import {invalidate as invalidateMyLists} from './my-lists'
@@ -255,15 +256,13 @@ export function useListDeleteMutation() {
 
 export function useListMuteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
   return useMutation<void, Error, {uri: string; mute: boolean}>({
     mutationFn: async ({uri, mute}) => {
-      // `muteModList`/`unmuteModList` are preference writes, migrated in wave B
       if (mute) {
-        await agent.muteModList(uri)
+        await appviewClient.call(muteActorList, {list: uri as AtUriString})
       } else {
-        await agent.unmuteModList(uri)
+        await appviewClient.call(unmuteActorList, {list: uri as AtUriString})
       }
 
       await whenAppViewReady(appviewClient, uri, v => {
@@ -280,15 +279,14 @@ export function useListMuteMutation() {
 
 export function useListBlockMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const appviewClient = useAppviewClient()
+  const pdsClient = usePdsClient()
   return useMutation<void, Error, {uri: string; block: boolean}>({
     mutationFn: async ({uri, block}) => {
-      // `blockModList`/`unblockModList` write a block record, migrated in wave B
       if (block) {
-        await agent.blockModList(uri)
+        await pdsClient.call(blockActorList, {list: uri as AtUriString})
       } else {
-        await agent.unblockModList(uri)
+        await pdsClient.call(unblockActorList, {list: uri as AtUriString})
       }
 
       await whenAppViewReady(appviewClient, uri, v => {

src/state/queries/messages/actor-declaration.ts

@@ -1,15 +1,12 @@
-import type AtpAgent from '@atproto/api'
+import {type AppBskyActorDefs} from '@atproto/api'
-import {
+import {type Client} from '@atproto/lex'
-  type AppBskyActorDefs,
-  type ChatBskyActorDeclaration,
-} from '@atproto/api'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
 import {usePdsClient, useSession} from '#/state/session'
 import {resolveAllowGroupInvites} from '#/components/dms/util'
-import {com} from '#/lexicons'
+import {chat, com} from '#/lexicons'
 import {RQKEY as PROFILE_RKEY} from '../profile'
 
 export function useUpdateActorDeclaration({
@@ -119,25 +116,16 @@ export function useDeleteActorDeclaration() {
   })
 }
 
-/*
- * Still takes the legacy agent: its only caller is `getOtherRequiredData` in
- * `#/ageAssurance/data`, which is blocked on `getPreferences` and so cannot
- * hand over a lex client yet.
- */
 export async function fetchActorDeclarationRecord({
-  agent,
+  client,
   did,
 }: {
-  agent: AtpAgent
+  client: Client
   did?: string
 }) {
   if (!did) return
-  const res = await agent.com.atproto.repo
+  const res = await client
-    .getRecord({
+    .get(chat.bsky.actor.declaration, {repo: did as DidString, rkey: 'self'})
-      repo: did,
-      collection: 'chat.bsky.actor.declaration',
-      rkey: 'self',
-    })
     .catch(_e => undefined)
-  return res?.data.value as ChatBskyActorDeclaration.Main
+  return res?.value
 }

src/state/queries/nuxs/index.ts

@@ -1,3 +1,4 @@
+import {removeNuxs, upsertNux} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {type AppNux, type Nux} from '#/state/queries/nuxs/definitions'
@@ -6,7 +7,8 @@ import {
   preferencesQueryKey,
   usePreferencesQuery,
 } from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {type app} from '#/lexicons'
 
 export {Nux} from '#/state/queries/nuxs/definitions'
 
@@ -42,11 +44,11 @@ export function useNuxs():
 
   // if (__DEV__) {
   //   const queryClient = useQueryClient()
-  //   const agent = useAgent()
+  //   const pdsClient = usePdsClient()
 
   //   // @ts-ignore
   //   window.clearNux = async (ids: string[]) => {
-  //     await agent.bskyAppRemoveNuxs(ids)
+  //     await pdsClient.call(removeNuxs, ids)
   //     // triggers a refetch
   //     await queryClient.invalidateQueries({
   //       queryKey: preferencesQueryKey,
@@ -97,12 +99,19 @@ export function useNux<T extends Nux>(
 
 export function useSaveNux() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     retry: 3,
     mutationFn: async (nux: AppNux) => {
-      await agent.bskyAppUpsertNux(serializeAppNux(nux))
+      /*
+       * `serializeAppNux` still returns the legacy `Nux`, whose strings are
+       * unbranded; it is validated against the same schema the action expects.
+       */
+      await pdsClient.call(
+        upsertNux,
+        serializeAppNux(nux) as app.bsky.actor.defs.Nux,
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -113,12 +122,12 @@ export function useSaveNux() {
 
 export function useResetNuxs() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
 
   return useMutation({
     retry: 3,
     mutationFn: async (ids: string[]) => {
-      await agent.bskyAppRemoveNuxs(ids)
+      await pdsClient.call(removeNuxs, ids)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,

src/state/queries/pinned-post.ts

@@ -6,7 +6,7 @@ import {useMutation, useQueryClient} from '@tanstack/react-query'
 import {logger} from '#/logger'
 import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed'
 import * as Toast from '#/components/Toast'
-import {app} from '#/lexicons'
+import {app, type com} from '#/lexicons'
 import {updatePostShadow} from '../cache/post-shadow'
 import {useAppviewClient, useSession} from '../session'
 import {useProfileUpdateMutation} from './profile'
@@ -47,7 +47,11 @@ export function usePinnedPostMutation() {
           profile,
           updates: existing => {
             existing.pinnedPost = pinCurrentPost
-              ? {uri: postUri, cid: postCid}
+              ? // the caller's uri/cid are unbranded strings
+                ({
+                  uri: postUri,
+                  cid: postCid,
+                } as com.atproto.repo.strongRef.Main)
               : undefined
             return existing
           },

src/state/queries/post-interaction-settings.ts

@@ -1,8 +1,9 @@
-import {type AppBskyActorDefs} from '@atproto/api'
+import {setPostInteractionSettings} from '@bsky.app/sdk'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {preferencesQueryKey} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
+import {usePdsClient} from '#/state/session'
+import {type app} from '#/lexicons'
 
 export function usePostInteractionSettingsMutation({
   onError,
@@ -12,10 +13,10 @@ export function usePostInteractionSettingsMutation({
   onSettled?: () => void
 } = {}) {
   const qc = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
   return useMutation({
-    async mutationFn(props: AppBskyActorDefs.PostInteractionSettingsPref) {
+    async mutationFn(props: app.bsky.actor.defs.PostInteractionSettingsPref) {
-      await agent.setPostInteractionSettings(props)
+      await client.call(setPostInteractionSettings, props)
     },
     async onSuccess() {
       await qc.invalidateQueries({

src/state/queries/post.ts

@@ -1,5 +1,7 @@
 import {useCallback} from 'react'
 import {type AppBskyActorDefs, type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {type AtUriString} from '@atproto/syntax'
+import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky.app/sdk'
 import {
   type QueryClient,
   useMutation,
@@ -10,10 +12,16 @@ import {
 import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue'
 import {updatePostShadow} from '#/state/cache/post-shadow'
 import {type Shadow} from '#/state/cache/types'
-import {useAgent, useSession} from '#/state/session'
+import {
+  useAgent,
+  useAppviewClient,
+  usePdsClient,
+  useSession,
+} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {useAnalytics} from '#/analytics'
 import {type Metrics, toClout} from '#/analytics/metrics'
+import {app} from '#/lexicons'
 import {useIsThreadMuted, useSetThreadMute} from '../cache/thread-mutes'
 import {findProfileQueryData} from './profile'
 
@@ -184,7 +192,7 @@ function usePostLikeMutation(
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
   const postAuthor = post.author
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<
     {uri: string}, // responds with the uri of the like
@@ -215,7 +223,11 @@ function usePostLikeMutation(
             : undefined,
         feedDescriptor: feedDescriptor,
       })
-      return agent.like(uri, cid, via)
+      return pdsClient.call(like, {
+        uri: uri as AtUriString,
+        cid: cid,
+        via: via ? {uri: via.uri as AtUriString, cid: via.cid} : undefined,
+      })
     },
   })
 }
@@ -225,7 +237,7 @@ function usePostUnlikeMutation(
   logContext: Metrics['post:unlike']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<void, Error, {postUri: string; likeUri: string}>({
     mutationFn: ({postUri, likeUri}) => {
@@ -235,7 +247,7 @@ function usePostUnlikeMutation(
         logContext,
         feedDescriptor,
       })
-      return agent.deleteLike(likeUri)
+      return pdsClient.call(deleteLike, likeUri as AtUriString)
     },
   })
 }
@@ -309,7 +321,7 @@ function usePostRepostMutation(
   logContext: Metrics['post:repost']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<
     {uri: string}, // responds with the uri of the repost
@@ -323,7 +335,11 @@ function usePostRepostMutation(
         logContext,
         feedDescriptor,
       })
-      return agent.repost(uri, cid, via)
+      return pdsClient.call(repost, {
+        uri: uri as AtUriString,
+        cid: cid,
+        via: via ? {uri: via.uri as AtUriString, cid: via.cid} : undefined,
+      })
     },
   })
 }
@@ -333,7 +349,7 @@ function usePostUnrepostMutation(
   logContext: Metrics['post:unrepost']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const ax = useAnalytics()
   return useMutation<void, Error, {postUri: string; repostUri: string}>({
     mutationFn: ({postUri, repostUri}) => {
@@ -343,17 +359,17 @@ function usePostUnrepostMutation(
         logContext,
         feedDescriptor,
       })
-      return agent.deleteRepost(repostUri)
+      return pdsClient.call(deleteRepost, repostUri as AtUriString)
     },
   })
 }
 
 export function usePostDeleteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation<void, Error, {uri: string}>({
     mutationFn: async ({uri}) => {
-      await agent.deletePost(uri)
+      await pdsClient.call(deletePost, uri as AtUriString)
     },
     onSuccess(_, variables) {
       updatePostShadow(queryClient, variables.uri, {isDeleted: true})
@@ -407,23 +423,29 @@ export function useThreadMuteMutationQueue(
 }
 
 function useThreadMuteMutation() {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   return useMutation<
     {},
     Error,
     {uri: string} // the root post's uri
   >({
-    mutationFn: ({uri}) => {
+    mutationFn: async ({uri}) => {
-      return agent.api.app.bsky.graph.muteThread({root: uri})
+      await appviewClient.call(app.bsky.graph.muteThread, {
+        root: uri as AtUriString,
+      })
+      return {}
     },
   })
 }
 
 function useThreadUnmuteMutation() {
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
   return useMutation<{}, Error, {uri: string}>({
-    mutationFn: ({uri}) => {
+    mutationFn: async ({uri}) => {
-      return agent.api.app.bsky.graph.unmuteThread({root: uri})
+      await appviewClient.call(app.bsky.graph.unmuteThread, {
+        root: uri as AtUriString,
+      })
+      return {}
     },
   })
 }

src/state/queries/preferences/index.ts

@@ -1,9 +1,28 @@
 import {useCallback} from 'react'
+import {type AppBskyActorDefs} from '@atproto/api'
+import {type DidString} from '@atproto/syntax'
 import {
-  type AppBskyActorDefs,
+  addSavedFeeds,
   type BskyFeedViewPreference,
-  type LabelPreference,
+  dismissNudges,
-} from '@atproto/api'
+  getPreferences,
+  overwriteSavedFeeds,
+  queueNudges,
+  removeMutedWord,
+  removeMutedWords,
+  removeSavedFeeds,
+  setActiveProgressGuide,
+  setAdultContentEnabled,
+  setContentLabelPref,
+  setFeedViewPrefs,
+  setIsBetaUser,
+  setThreadViewPrefs,
+  setVerificationPrefs,
+  updateMutedWord,
+  updateSavedFeeds,
+  upsertMutedWords,
+} from '@bsky.app/sdk'
+import {type LabelPreference} from '@bsky.app/sdk/moderation'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
@@ -20,11 +39,12 @@ import {
   type UsePreferencesQueryResponse,
 } from '#/state/queries/preferences/types'
 import {createQueryKey} from '#/state/queries/util'
-import {useAgent} from '#/state/session'
+import {useAgent, usePdsClient} from '#/state/session'
 import {saveLabelers} from '#/state/session/moderation'
 import {useAgeAssurance} from '#/ageAssurance'
 import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
 import {useAnalytics} from '#/analytics'
+import {app} from '#/lexicons'
 
 export * from '#/state/queries/preferences/const'
 export * from '#/state/queries/preferences/moderation'
@@ -37,6 +57,7 @@ export const preferencesQueryKey = createQueryKey(
 )
 
 export function usePreferencesQuery() {
+  const client = usePdsClient()
   const agent = useAgent()
   const aa = useAgeAssurance()
 
@@ -47,18 +68,34 @@ export function usePreferencesQuery() {
     queryKey: preferencesQueryKey,
     gcTime: GCTIME.INFINITY,
     queryFn: async () => {
-      if (!agent.did) {
+      if (!client.did) {
         return DEFAULT_LOGGED_OUT_PREFERENCES
       } else {
-        const res = await agent.getPreferences()
+        const res = await client.call(getPreferences)
+
+        const labelerDids = res.moderationPrefs.labelers.map(l => l.did)
 
         // save to local storage to ensure there are labels on initial requests
-        saveLabelers(
+        saveLabelers(client.did, labelerDids)
-          agent.did,
-          res.moderationPrefs.labelers.map(l => l.did),
-        )
 
-        const preferences: UsePreferencesQueryResponse = {
+        /*
+         * `BskyAgent.getPreferences` used to call `configureLabelers` itself,
+         * so subscribing to a labeler took effect on the very next appview
+         * read. The sdk action has no such side effect, and appview reads still
+         * inherit `atproto-accept-labelers` from the agent's fetch handler, so
+         * apply the subscriptions there rather than on the wrapping client -
+         * setting them on both would emit the header twice.
+         */
+        agent.configureLabelers(labelerDids)
+
+        /*
+         * The sdk's `BskyPreferences` is field-for-field identical to the
+         * legacy one that `UsePreferencesQueryResponse` is still derived from;
+         * only its strings are branded (`AtUriString`, `DidString`). Cast at
+         * this one seam so every downstream consumer of the response - notably
+         * the `moderationPrefs` readers - keeps its current types.
+         */
+        const preferences = {
           ...res,
           savedFeeds: res.savedFeeds.filter(f => f.type !== 'unknown'),
           /**
@@ -74,7 +111,7 @@ export function usePreferencesQuery() {
             ...(res.threadViewPrefs ?? {}),
           },
           userAge: res.birthDate ? getAge(res.birthDate) : undefined,
-        }
+        } as UsePreferencesQueryResponse
         return preferences
       }
     },
@@ -113,11 +150,11 @@ export function usePreferencesQuery() {
 
 export function useClearPreferencesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async () => {
-      await agent.app.bsky.actor.putPreferences({preferences: []})
+      await client.call(app.bsky.actor.putPreferences, {preferences: []})
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -128,7 +165,7 @@ export function useClearPreferencesMutation() {
 
 export function usePreferencesSetContentLabelMutation() {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const client = usePdsClient()
   const queryClient = useQueryClient()
 
   return useMutation<
@@ -137,7 +174,11 @@ export function usePreferencesSetContentLabelMutation() {
     {label: string; visibility: LabelPreference; labelerDid: string | undefined}
   >({
     mutationFn: async ({label, visibility, labelerDid}) => {
-      await agent.setContentLabelPref(label, visibility, labelerDid)
+      await client.call(setContentLabelPref, {
+        key: label,
+        value: visibility,
+        labelerDid: labelerDid as DidString | undefined,
+      })
       ax.metric('moderation:changeLabelPreference', {preference: visibility})
       // triggers a refetch
       await queryClient.invalidateQueries({
@@ -149,7 +190,7 @@ export function usePreferencesSetContentLabelMutation() {
 
 export function useSetContentLabelMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async ({
@@ -161,7 +202,11 @@ export function useSetContentLabelMutation() {
       visibility: LabelPreference
       labelerDid?: string
     }) => {
-      await agent.setContentLabelPref(label, visibility, labelerDid)
+      await client.call(setContentLabelPref, {
+        key: label,
+        value: visibility,
+        labelerDid: labelerDid as DidString | undefined,
+      })
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -172,11 +217,11 @@ export function useSetContentLabelMutation() {
 
 export function usePreferencesSetAdultContentMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, {enabled: boolean}>({
     mutationFn: async ({enabled}) => {
-      await agent.setAdultContentEnabled(enabled)
+      await client.call(setAdultContentEnabled, enabled)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -187,7 +232,7 @@ export function usePreferencesSetAdultContentMutation() {
 
 export function useSetFeedViewPreferencesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, Partial<BskyFeedViewPreference>>({
     mutationFn: async prefs => {
@@ -195,7 +240,7 @@ export function useSetFeedViewPreferencesMutation() {
        * special handling here, merged into `feedViewPrefs` above, since
        * following was previously called `home`
        */
-      await agent.setFeedViewPrefs('home', prefs)
+      await client.call(setFeedViewPrefs, {feed: 'home', ...prefs})
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -212,11 +257,11 @@ export function useSetThreadViewPreferencesMutation({
   onError?: (error: unknown) => void
 }) {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, Partial<ThreadViewPreferences>>({
     mutationFn: async prefs => {
-      await agent.setThreadViewPrefs(prefs)
+      await client.call(setThreadViewPrefs, prefs)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -229,11 +274,11 @@ export function useSetThreadViewPreferencesMutation({
 
 export function useOverwriteSavedFeedsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, AppBskyActorDefs.SavedFeed[]>({
     mutationFn: async savedFeeds => {
-      await agent.overwriteSavedFeeds(savedFeeds)
+      await client.call(overwriteSavedFeeds, savedFeeds)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -244,7 +289,7 @@ export function useOverwriteSavedFeedsMutation() {
 
 export function useAddSavedFeedsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<
     void,
@@ -252,7 +297,7 @@ export function useAddSavedFeedsMutation() {
     Pick<AppBskyActorDefs.SavedFeed, 'type' | 'value' | 'pinned'>[]
   >({
     mutationFn: async savedFeeds => {
-      await agent.addSavedFeeds(savedFeeds)
+      await client.call(addSavedFeeds, savedFeeds)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -263,11 +308,11 @@ export function useAddSavedFeedsMutation() {
 
 export function useRemoveFeedMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, Pick<AppBskyActorDefs.SavedFeed, 'id'>>({
     mutationFn: async savedFeed => {
-      await agent.removeSavedFeeds([savedFeed.id])
+      await client.call(removeSavedFeeds, [savedFeed.id])
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -278,7 +323,7 @@ export function useRemoveFeedMutation() {
 
 export function useReplaceForYouWithDiscoverFeedMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async ({
@@ -289,10 +334,10 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
       discoverFeedConfig: AppBskyActorDefs.SavedFeed | undefined
     }) => {
       if (forYouFeedConfig) {
-        await agent.removeSavedFeeds([forYouFeedConfig.id])
+        await client.call(removeSavedFeeds, [forYouFeedConfig.id])
       }
       if (!discoverFeedConfig) {
-        await agent.addSavedFeeds([
+        await client.call(addSavedFeeds, [
           {
             type: 'feed',
             value: PROD_DEFAULT_FEED('whats-hot'),
@@ -300,7 +345,7 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
           },
         ])
       } else {
-        await agent.updateSavedFeeds([
+        await client.call(updateSavedFeeds, [
           {
             ...discoverFeedConfig,
             pinned: true,
@@ -317,11 +362,11 @@ export function useReplaceForYouWithDiscoverFeedMutation() {
 
 export function useUpdateSavedFeedsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, AppBskyActorDefs.SavedFeed[]>({
     mutationFn: async feeds => {
-      await agent.updateSavedFeeds(feeds)
+      await client.call(updateSavedFeeds, feeds)
 
       // triggers a refetch
       await queryClient.invalidateQueries({
@@ -333,11 +378,14 @@ export function useUpdateSavedFeedsMutation() {
 
 export function useUpsertMutedWordsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => {
-      await agent.upsertMutedWords(mutedWords)
+      await client.call(
+        upsertMutedWords,
+        mutedWords as app.bsky.actor.defs.MutedWord[],
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -348,11 +396,14 @@ export function useUpsertMutedWordsMutation() {
 
 export function useUpdateMutedWordMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => {
-      await agent.updateMutedWord(mutedWord)
+      await client.call(
+        updateMutedWord,
+        mutedWord as app.bsky.actor.defs.MutedWord,
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -363,11 +414,14 @@ export function useUpdateMutedWordMutation() {
 
 export function useRemoveMutedWordMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => {
-      await agent.removeMutedWord(mutedWord)
+      await client.call(
+        removeMutedWord,
+        mutedWord as app.bsky.actor.defs.MutedWord,
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -378,11 +432,14 @@ export function useRemoveMutedWordMutation() {
 
 export function useRemoveMutedWordsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => {
-      await agent.removeMutedWords(mutedWords)
+      await client.call(
+        removeMutedWords,
+        mutedWords as app.bsky.actor.defs.MutedWord[],
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -393,11 +450,11 @@ export function useRemoveMutedWordsMutation() {
 
 export function useQueueNudgesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (nudges: string | string[]) => {
-      await agent.bskyAppQueueNudges(nudges)
+      await client.call(queueNudges, Array.isArray(nudges) ? nudges : [nudges])
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -408,11 +465,14 @@ export function useQueueNudgesMutation() {
 
 export function useDismissNudgesMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (nudges: string | string[]) => {
-      await agent.bskyAppDismissNudges(nudges)
+      await client.call(
+        dismissNudges,
+        Array.isArray(nudges) ? nudges : [nudges],
+      )
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -423,13 +483,13 @@ export function useDismissNudgesMutation() {
 
 export function useSetActiveProgressGuideMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (
       guide: AppBskyActorDefs.BskyAppProgressGuide | undefined,
     ) => {
-      await agent.bskyAppSetActiveProgressGuide(guide)
+      await client.call(setActiveProgressGuide, guide)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -440,11 +500,11 @@ export function useSetActiveProgressGuideMutation() {
 
 export function useSetIsBetaUserMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation({
     mutationFn: async (isBetaUser: boolean) => {
-      await agent.setIsBetaUser(isBetaUser)
+      await client.call(setIsBetaUser, isBetaUser)
       // triggers a refetch
       await queryClient.invalidateQueries({
         queryKey: preferencesQueryKey,
@@ -456,11 +516,11 @@ export function useSetIsBetaUserMutation() {
 export function useSetVerificationPrefsMutation() {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const client = usePdsClient()
 
   return useMutation<void, unknown, AppBskyActorDefs.VerificationPrefs>({
     mutationFn: async prefs => {
-      await agent.setVerificationPrefs(prefs)
+      await client.call(setVerificationPrefs, prefs)
       if (prefs.hideBadges) {
         ax.metric('verification:settings:hideBadges', {})
       } else {

src/state/queries/profile.ts

@@ -3,17 +3,24 @@ import {
   type AppBskyActorDefs,
   type AppBskyActorGetProfile,
   type AppBskyActorGetProfiles,
-  type AppBskyActorProfile,
   type AppBskyGraphGetFollows,
-  type AtpAgent,
   AtUri,
   type Un$Typed,
 } from '@atproto/api'
+import {type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
+  type AtUriString,
   type DidString,
   toDatetimeString,
 } from '@atproto/syntax'
+import {
+  deleteFollow,
+  follow,
+  muteActor,
+  unmuteActor,
+  upsertProfile,
+} from '@bsky.app/sdk'
 import {
   type InfiniteData,
   keepPreviousData,
@@ -24,7 +31,6 @@ import {
 } from '@tanstack/react-query'
 
 import {uploadBlob} from '#/lib/api'
-import {toLegacyBlobRef} from '#/lib/api/legacy-blob'
 import {until} from '#/lib/async/until'
 import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue'
 import {updateProfileShadow} from '#/state/cache/profile-shadow'
@@ -38,7 +44,7 @@ import {
   useUnstableProfileViewCache,
 } from '#/state/queries/unstable-profile-cache'
 import {useUpdateProfileVerificationCache} from '#/state/queries/verification/useUpdateProfileVerificationCache'
-import {useAgent, usePdsClient, useSession} from '#/state/session'
+import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
 import {useAnalytics} from '#/analytics'
 import {type Metrics, toClout} from '#/analytics/metrics'
@@ -74,7 +80,7 @@ export function useProfileQuery({
   did: string | undefined
   staleTime?: number
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const {getUnstableProfile} = useUnstableProfileViewCache()
   return useQuery<AppBskyActorDefs.ProfileViewDetailed>({
     // WARNING
@@ -85,8 +91,9 @@ export function useProfileQuery({
     refetchOnWindowFocus: true,
     queryKey: RQKEY(did ?? ''),
     queryFn: async () => {
-      const res = await agent.getProfile({actor: did ?? ''})
+      return await client.call(app.bsky.actor.getProfile, {
-      return res.data
+        actor: (did ?? '') as AtIdentifierString,
+      })
     },
     placeholderData: () => {
       if (!did) return
@@ -103,21 +110,22 @@ export function useProfilesQuery({
   handles: string[]
   maintainData?: boolean
 }) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   return useQuery({
     enabled: handles.length > 0,
     staleTime: STALE.MINUTES.FIVE,
     queryKey: profilesQueryKey(handles),
     queryFn: async () => {
-      const res = await agent.getProfiles({actors: handles})
+      return await client.call(app.bsky.actor.getProfiles, {
-      return res.data
+        actors: handles as AtIdentifierString[],
+      })
     },
     placeholderData: maintainData ? keepPreviousData : undefined,
   })
 }
 
 export function usePrefetchProfileQuery() {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const prefetchProfileQuery = useCallback(
     async (did: string) => {
@@ -125,12 +133,13 @@ export function usePrefetchProfileQuery() {
         staleTime: STALE.SECONDS.THIRTY,
         queryKey: RQKEY(did),
         queryFn: async () => {
-          const res = await agent.getProfile({actor: did || ''})
+          return await client.call(app.bsky.actor.getProfile, {
-          return res.data
+            actor: (did || '') as AtIdentifierString,
+          })
         },
       })
     },
-    [queryClient, agent],
+    [queryClient, client],
   )
   return prefetchProfileQuery
 }
@@ -138,18 +147,18 @@ export function usePrefetchProfileQuery() {
 interface ProfileUpdateParams {
   profile: AppBskyActorDefs.ProfileViewDetailed
   updates:
-    | Un$Typed<AppBskyActorProfile.Record>
+    | Un$Typed<app.bsky.actor.profile.Main>
     | ((
-        existing: Un$Typed<AppBskyActorProfile.Record>,
+        existing: Un$Typed<app.bsky.actor.profile.Main>,
-      ) => Un$Typed<AppBskyActorProfile.Record>)
+      ) => Un$Typed<app.bsky.actor.profile.Main>)
   newUserAvatar?: ImageMeta | undefined | null
   newUserBanner?: ImageMeta | undefined | null
   checkCommitted?: (res: AppBskyActorGetProfile.Response) => boolean
 }
 export function useProfileUpdateMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
   const pdsClient = usePdsClient()
+  const appviewClient = useAppviewClient()
   const updateProfileVerificationCache = useUpdateProfileVerificationCache()
   return useMutation<void, Error, ProfileUpdateParams>({
     mutationFn: async ({
@@ -175,8 +184,8 @@ export function useProfileUpdateMutation() {
           newUserBanner.mime,
         )
       }
-      await agent.upsertProfile(async existing => {
+      await pdsClient.call(upsertProfile, async existing => {
-        let next: Un$Typed<AppBskyActorProfile.Record> = existing || {}
+        let next: Un$Typed<app.bsky.actor.profile.Main> = existing || {}
         if (typeof updates === 'function') {
           next = updates(next)
         } else {
@@ -188,20 +197,20 @@ export function useProfileUpdateMutation() {
         }
         if (newUserAvatarPromise) {
           const res = await newUserAvatarPromise
-          next.avatar = toLegacyBlobRef(res.blob)
+          next.avatar = res.blob
         } else if (newUserAvatar === null) {
           next.avatar = undefined
         }
         if (newUserBannerPromise) {
           const res = await newUserBannerPromise
-          next.banner = toLegacyBlobRef(res.blob)
+          next.banner = res.blob
         } else if (newUserBanner === null) {
           next.banner = undefined
         }
         return next
       })
       await whenAppViewReady(
-        agent,
+        appviewClient,
         profile.did,
         checkCommitted ||
           (res => {
@@ -252,7 +261,7 @@ export function useProfileFollowMutationQueue(
   position?: number,
   contextProfileDid?: string,
 ) {
-  const agent = useAgent()
+  const client = useAppviewClient()
   const queryClient = useQueryClient()
   const {currentAccount} = useSession()
   const did = profile.did
@@ -333,12 +342,12 @@ export function useProfileFollowMutationQueue(
       }
 
       if (finalFollowingUri) {
-        void agent.app.bsky.graph
+        void client
-          .getSuggestedFollowsByActor({
+          .call(app.bsky.graph.getSuggestedFollowsByActor, {
-            actor: did,
+            actor: did as AtIdentifierString,
           })
           .then(res => {
-            const dids = res.data.suggestions
+            const dids = res.suggestions
               .filter(a => !a.viewer?.following)
               .map(a => a.did)
               .slice(0, 8)
@@ -375,7 +384,7 @@ function useProfileFollowMutation(
 ) {
   const ax = useAnalytics()
   const {currentAccount} = useSession()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   const queryClient = useQueryClient()
   const {captureAction} = useProgressGuideControls()
 
@@ -400,7 +409,7 @@ function useProfileFollowMutation(
         position,
         contextProfileDid,
       })
-      return await agent.follow(did)
+      return await pdsClient.call(follow, {did: did as DidString})
     },
   })
 }
@@ -409,11 +418,11 @@ function useProfileUnfollowMutation(
   logContext: Metrics['profile:unfollow']['logContext'],
 ) {
   const ax = useAnalytics()
-  const agent = useAgent()
+  const pdsClient = usePdsClient()
   return useMutation<void, Error, {did: string; followUri: string}>({
     mutationFn: async ({followUri}) => {
       ax.metric('profile:unfollow', {logContext})
-      return await agent.deleteFollow(followUri)
+      return await pdsClient.call(deleteFollow, followUri as AtUriString)
     },
   })
 }
@@ -423,7 +432,7 @@ export function useProfileMuteMutationQueue(
 ) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const did = profile.did
+  const did = profile.did as DidString
   const initialMuted = profile.viewer?.muted
   const muteMutation = useProfileMuteMutation()
   const unmuteMutation = useProfileUnmuteMutation()
@@ -432,15 +441,11 @@ export function useProfileMuteMutationQueue(
     initialState: initialMuted,
     runMutation: async (_prevMuted, shouldMute) => {
       if (shouldMute) {
-        await muteMutation.mutateAsync({
+        await muteMutation.mutateAsync({did})
-          did,
-        })
         ax.metric('profile:mute', {})
         return true
       } else {
-        await unmuteMutation.mutateAsync({
+        await unmuteMutation.mutateAsync({did})
-          did,
-        })
         ax.metric('profile:unmute', {})
         return false
       }
@@ -485,7 +490,7 @@ export function useProfileMuteRepostsMutationQueue(
 ) {
   const ax = useAnalytics()
   const queryClient = useQueryClient()
-  const did = profile.did
+  const did = profile.did as DidString
   const initialMutedOnlyReposts = !!profile.viewer?.mutedOnlyReposts
   const muteRepostsMutation = useProfileMuteRepostsMutation()
   const unmuteMutation = useProfileUnmuteMutation()
@@ -494,15 +499,11 @@ export function useProfileMuteRepostsMutationQueue(
     initialState: initialMutedOnlyReposts,
     runMutation: async (_prevMutedOnlyReposts, shouldMute) => {
       if (shouldMute) {
-        await muteRepostsMutation.mutateAsync({
+        await muteRepostsMutation.mutateAsync({did})
-          did,
-        })
         ax.metric('profile:muteReposts', {})
         return true
       } else {
-        await unmuteMutation.mutateAsync({
+        await unmuteMutation.mutateAsync({did})
-          did,
-        })
         ax.metric('profile:unmuteReposts', {})
         return false
       }
@@ -536,10 +537,10 @@ export function useProfileMuteRepostsMutationQueue(
 
 function useProfileMuteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
-  return useMutation<void, Error, {did: string}>({
+  return useMutation({
-    mutationFn: async ({did}) => {
+    mutationFn: async ({did}: {did: DidString}) => {
-      await agent.mute(did)
+      await appviewClient.call(muteActor, {actor: did})
     },
     onSuccess() {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_MUTED()})
@@ -549,10 +550,14 @@ function useProfileMuteMutation() {
 
 function useProfileMuteRepostsMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
-  return useMutation<void, Error, {did: string}>({
+  return useMutation({
-    mutationFn: async ({did}) => {
+    mutationFn: async ({did}: {did: DidString}) => {
-      await agent.mute(did, {onlyReposts: true})
+      await appviewClient.call(muteActor, {
+        actor: did,
+        // @ts-expect-error missing from this SDK version, remove this
+        onlyReposts: true,
+      })
     },
     onSuccess() {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_MUTED()})
@@ -562,10 +567,10 @@ function useProfileMuteRepostsMutation() {
 
 function useProfileUnmuteMutation() {
   const queryClient = useQueryClient()
-  const agent = useAgent()
+  const appviewClient = useAppviewClient()
-  return useMutation<void, Error, {did: string}>({
+  return useMutation({
-    mutationFn: async ({did}) => {
+    mutationFn: async ({did}: {did: DidString}) => {
-      await agent.unmute(did)
+      await appviewClient.call(unmuteActor, {actor: did})
     },
     onSuccess() {
       void queryClient.invalidateQueries({queryKey: RQKEY_MY_MUTED()})
@@ -679,7 +684,7 @@ function useProfileUnblockMutation() {
 }
 
 async function whenAppViewReady(
-  agent: AtpAgent,
+  client: Client,
   actor: string,
   fn: (res: AppBskyActorGetProfile.Response) => boolean,
 ) {
@@ -687,7 +692,17 @@ async function whenAppViewReady(
     5, // 5 tries
     1e3, // 1s delay between tries
     fn,
-    () => agent.app.bsky.actor.getProfile({actor}),
+    /*
+     * `checkCommitted` callbacks are still written against the legacy
+     * `Response` envelope, so wrap the lex output until those consumers move.
+     */
+    async () => ({
+      success: true,
+      headers: {},
+      data: await client.call(app.bsky.actor.getProfile, {
+        actor: actor as AtIdentifierString,
+      }),
+    }),
   )
 }
 

src/state/session/create-account.ts

@@ -1,7 +1,12 @@
-import {type AppBskyActorProfile, type Un$Typed} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {type Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
+import {toDatetimeString} from '@atproto/syntax'
+import {
+  overwriteSavedFeeds,
+  setPersonalDetails,
+  upsertProfile,
+} from '@bsky.app/sdk'
 
 import {networkRetry} from '#/lib/async/retry'
 import {
@@ -21,8 +26,8 @@ import {
 } from '#/ageAssurance/data'
 import {unsafeGetAndComputeAgeAssurance} from '#/ageAssurance/state'
 import {features} from '#/analytics'
-import {type BskyAppAgent} from './bridge-agent'
+import {type app} from '#/lexicons'
-import {agentToPdsClient} from './clients'
+import {agentToAppviewClient, agentToPdsClient} from './clients'
 import {configureModerationForAccount} from './moderation'
 import {
   buildBundle,
@@ -88,7 +93,7 @@ export async function createSessionBundleAndCreateAccount(
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
   configureModerationForAccount(bundle.agent, earlyAccount)
 
-  const createdAt = new Date().toISOString()
+  const createdAt = toDatetimeString(new Date())
   const birthdate = birthDate.toISOString()
 
   /*
@@ -100,22 +105,23 @@ export async function createSessionBundleAndCreateAccount(
   setCreatedAtForDid({did: earlyAccount.did, createdAt})
   setBirthdateForDid({did: earlyAccount.did, birthdate})
   snoozeBirthdateUpdateAllowedForDid(earlyAccount.did)
+  // Post-signup writes all target the account's own repo and actor store.
+  const pdsClient = agentToPdsClient(bundle.agent)
   // Start the prefetch after seeding its synchronous birthdate inputs.
-  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+  const aa = prefetchAgeAssuranceServerData({
+    appviewClient: agentToAppviewClient(bundle.agent),
+    accountClient: pdsClient,
+  })
 
   const isProd = Boolean(IS_PROD_SERVICE(service))
   const postSignupTasks: Promise<unknown>[] = [
-    savePersonalDetails(bundle.agent, birthdate),
+    savePersonalDetails(pdsClient, birthDate),
-    initializeProfile(bundle.agent, {handle, createdAt, isProd}),
+    initializeProfile(pdsClient, {handle, createdAt, isProd}),
   ]
   if (isProd) {
     postSignupTasks.push(
-      initializeSavedFeeds(bundle.agent),
+      initializeSavedFeeds(pdsClient),
-      restrictChatAfterAgeAssurance(
+      restrictChatAfterAgeAssurance(aa, pdsClient, earlyAccount.did),
-        aa,
-        agentToPdsClient(bundle.agent),
-        earlyAccount.did,
-      ),
     )
   }
   // Post-signup writes are not required to enter onboarding.
@@ -170,41 +176,41 @@ function snapshotNewAccount(
   }
 }
 
-function savePersonalDetails(agent: BskyAppAgent, birthDate: string) {
+function savePersonalDetails(client: Client, birthDate: Date) {
   return retryPostSignupTask('set birthDate', 3, () =>
-    agent.setPersonalDetails({birthDate}),
+    client.call(setPersonalDetails, {birthDate}),
   )
 }
 
 function initializeProfile(
-  agent: BskyAppAgent,
+  client: Client,
   {
     handle,
     createdAt,
     isProd,
   }: {
     handle: string
-    createdAt: string
+    createdAt: ReturnType<typeof toDatetimeString>
     isProd: boolean
   },
 ) {
   return retryPostSignupTask('set initial profile', 3, () =>
-    agent.upsertProfile(prev => {
+    client.call(upsertProfile, prev => {
-      const next: Un$Typed<AppBskyActorProfile.Record> = prev || {}
+      const next: Partial<app.bsky.actor.profile.Main> = prev || {}
       if (isProd) {
         next.displayName = handle
         next.createdAt = createdAt
       } else {
-        next.createdAt = prev?.createdAt || new Date().toISOString()
+        next.createdAt = prev?.createdAt || toDatetimeString(new Date())
       }
       return next
     }),
   )
 }
 
-function initializeSavedFeeds(agent: BskyAppAgent) {
+function initializeSavedFeeds(client: Client) {
   return retryPostSignupTask('set initial feeds', 1, () =>
-    agent.overwriteSavedFeeds([
+    client.call(overwriteSavedFeeds, [
       {...DISCOVER_SAVED_FEED, id: TID.nextStr()},
       {...TIMELINE_SAVED_FEED, id: TID.nextStr()},
     ]),

src/state/session/session-core.ts

@@ -13,6 +13,7 @@ import {
   createPublicAgent,
   PasswordSessionManager,
 } from './bridge-agent'
+import {agentToAppviewClient, agentToPdsClient} from './clients'
 import {addSessionErrorLog} from './logging'
 import {configureModerationForAccount} from './moderation'
 import {networkAwareFetch} from './network'
@@ -290,7 +291,10 @@ export async function createSessionBundleAndResume(
     ) ?? storedAccount
 
   configureModerationForAccount(bundle.agent, earlyAccount)
-  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+  const aa = prefetchAgeAssuranceServerData({
+    appviewClient: agentToAppviewClient(bundle.agent),
+    accountClient: agentToPdsClient(bundle.agent),
+  })
 
   /*
    * The proxy header is applied after the PDS-targeting setup above, so those
@@ -355,7 +359,10 @@ export async function createSessionBundleAndLogin(
 
   const gates = features.refresh({strategy: 'prefer-fresh-gates'})
   configureModerationForAccount(bundle.agent, earlyAccount)
-  const aa = prefetchAgeAssuranceServerData({agent: bundle.agent})
+  const aa = prefetchAgeAssuranceServerData({
+    appviewClient: agentToAppviewClient(bundle.agent),
+    accountClient: agentToPdsClient(bundle.agent),
+  })
 
   bundle.agent.configureProxy(BLUESKY_PROXY_HEADER.get())