Conflicts (6 files): tests took the caller-migration side, then the358bed1renames (_level_boundaries -> _device_boundaries); run_refined_dfg.py keptae53fad(same jet_interval level= repair plus blocked_coarse_tables on the current-checkout path). Follow-up renames in 5 auto-merged tests; blocked_fine_tables imported from refinement_tables. Frozen drivers untouched (run_jet_circle_cv.py, check_projected_pairs.py remap_child, historical DFG path). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>