Force Z-axis homing when doing screw or bed leveling, even when homing already exists

[albert-sun]

I've run into an issue multiple times where I've run bed leveling, then adjusted the screws, and then re-ran bed leveling - but because the Z-axis wasn't re-homed, the Z offset for the bed mesh was completely off. This is because Klipper thinks the Z-axis is already "homed" even though the screws could have changed between leveling runs. To the best of my understanding, this could cause issues where people continuously run the macro while adjusting their leveling, and then scratch their head because their Z offsets are completely off because their final bed is above or below where the initial Z homing was done.

This can be fixed by either modifying the CG28 macro, or creating a separate CG28-esque macro specifically for leveling macros. This macro would force Z-leveling even if the XYZ axes have been homed previously, ex:

[gcode_macro CG28]
gcode:
  {% if "xyz" not in printer.toolhead.homed_axes %}
      G28
  {% else %}
      G28 Z
  {% endif %}

I personally am in favor of replacing the original CG28 macro and just having it home Z all the time - it doesn't take that long and seems like it could solve a lot of weird edge cases with bed leveling.

[albert-sun]

I'm not 100% sure whether the homed axes get deleted after mesh calibration so need to check that out.

[steve8x8]

If someone thinks this should be handled in some way - I'd like to chime in.
After finishing z-level adjustment and clicking on the "save" icon, the device goes into a self-reset, while the nozzle is still pretty close to the bed. I'd like the print head to go to HOME between save and reset - if this is possible at all of course - to eliminate any slightest risk of the nozzle hitting the build plate (been there :'-( before).
Thanks for considering.