Sub-ticket of MARS-251 Lane F: jtp/ayudante predicate consistency — per-file audit + refactor surfaces using snapshot when live should be · mars