回复：I-94，I-797和护照有效期

After you renew the passport:
You are H-1B, so it's not I-539, but only I102. (I-129 is to change I-797 date as well, which is not necessary, but if your employer doesn't mind, why not another full 3-year on I-797)
Or if your H1B visa stamp is still valid, you can drive to Mexico and re-enter and ask for a new I-94. (You need a valid, with at least one entry left H1b visa stamp for this)