refactor: cherry-pick type fixes from #7058 and #7068#7383

Copilot wants to merge 1 commit intomainnetlify/cli:mainfrom

copilot/fix-19c8e65a-f549-4e70-ac68-da9c90c5ae70netlify/cli:copilot/fix-19c8e65a-f549-4e70-ac68-da9c90c5ae70Copy head branch name to clipboard