Codex CLI is doing this fine. Maybe copy a page from their book.