Did Hashem tell Moses the future?

So, to my understanding, on Mount Sinai, Moses was given the 10 commandments, halakha, & the Torah. It’s not until Number, however, that it’s revealed that Moses would not enter the holy land.

So either he was told he wouldn’t enter the holy land & the reason, & he did it anyway

or

the story part of the Torah after when Moses was given the Torah was kept track of as it happened thereafter.

I will be asking a rabbi in the near future, but what do you all think?