[BUG] Model gives git recovery advice without checking which commits and files are affected, costing the user time

During a rebase conflict the model told the user to skip a commit, then separately warned that uncommitted work might be lost, then had to re-check where each change actually lived after the user's next action. Each step required another round trip, in a session where the user had already spent many hours on a small number of reviews.

Expected: inspect the rebase state (which commit, which files, what is committed vs uncommitted, what upstream already contains) once, then give one complete, correct instruction.