H1B amendment petition expires in 2019 & H1B visa stamped on passport and I94 expires in 2018 June

USA H1B Visa
1

Hi,

My H1B amendment petition for client A expires in 2019, however my H1B visa stamped on my passport expires on June 12 2018 and on I94 – June 22 2018. And I am still working with client A.

My questions are:

  1. Do I need to go for H1 B extension? Can I use my latest amendment petition 2019 to stay and work in US? Do I need to leave the country and come back with my new petition date stamped on my passport and get a new I 94 if I go with this option 1?

  2. If not option 1: Which H1 B expiry date is considered before which extension needs to be filed? Expiry data stamped on my visa OR I 94 date?

Also would I be able to leave my organization and work with another organization with a H1B transfer using my Amendment petition expiry date of 2019?

Thanks in advance .