chore: merge origin/main into PR branch

# Conflicts:
#	tests/test_cli.py

Author: mldangelo-oai

tests/test_cli.py

@@ -575,7 +575,11 @@ def test_main_normalizes_windows_error_statuses(self, raw_returncode: int, monke
             }.get(cmd),
         )
         monkeypatch.setattr("promptfoo.cli.record_wrapper_used", lambda mode: None)
-        monkeypatch.setattr(subprocess, "run", MagicMock(return_value=subprocess.CompletedProcess([], raw_returncode)))
+        monkeypatch.setattr(
+            subprocess,
+            "run",
+            MagicMock(return_value=subprocess.CompletedProcess([], raw_returncode)),
+        )
 
         with pytest.raises(SystemExit) as exc_info:
             main()