Keep the local #964 terminal single-flight implementation when resolving the TerminalSettings conflict; PR #967 is represented in history through origin/main.