It ends tonight at 12am, get any extensions you want done this period now.
After speaking with the rule committee, 2 way players in the minors can be signed to extensions without having to come up to the majors. If a player is signed to a new 1 way contract but is on a 2 way contract then their current contract will be honoured.