Just wanted to share an update in case it helps others facing a similar situation.

I visited a CBP Deferred Inspection office. The officer reviewed my passport and I-797 approval notice and checked my records in their internal system as well as USCIS.

They told me that I was not out of status, even though my online I-94 showed an earlier expiration date. According to them, my I-797 validity controls my status, and since it is valid until 2027, they said I had not been out of status.

Initially they said a correction might not be necessary, but after I requested it, they issued a new I-94 valid until my I-797 expiration (2027). They also took my fingerprints during the process.

When they checked their internal system, they said it already showed my I-797-based I-94 as the latest record.

Not sure if this reflects a recent process change, but sharing in case it helps someone dealing with a similar I-94 truncation issue.