merge-upstream

Sync Azure Codex fork with OpenAI Codex upstream while preserving Azure features