--- 'astro': patch --- Refactor and improve Astro config loading flow