more generic storing of provider_specific_fields

Author: xzrderek

eval_protocol/mcp/execution/base_policy.py

@@ -199,8 +199,12 @@ async def _generate_live_tool_calls(
         if message.get("tool_calls"):
             assistant_message_for_history["tool_calls"] = message["tool_calls"]
 
-        if message.get("reasoning_details"):
-            assistant_message_for_history["reasoning_details"] = message["reasoning_details"]
+        # Preserve specific fields from provider_specific_fields if present
+        if message.get("provider_specific_fields"):
+            if message["provider_specific_fields"].get("reasoning_details"):
+                assistant_message_for_history["reasoning_details"] = message["provider_specific_fields"][
+                    "reasoning_details"
+                ]
 
         # Add to actual conversation history
         conversation_history.append(assistant_message_for_history)

eval_protocol/mcp/execution/policy.py

@@ -222,6 +222,7 @@ async def _make_llm_call(self, messages: List[Dict[str, Any]], tools: List[Dict[
             message_dict: Dict[str, Any] = {
                 "role": getattr(message_obj, "role", "assistant"),
                 "content": getattr(message_obj, "content", None),
+                "provider_specific_fields": getattr(message_obj, "provider_specific_fields", None),
                 "tool_calls": (
                     [
                         {
@@ -239,12 +240,6 @@ async def _make_llm_call(self, messages: List[Dict[str, Any]], tools: List[Dict[
                 ),
             }
 
-            provider_specific_fields = getattr(message_obj, "provider_specific_fields", None)
-            if isinstance(provider_specific_fields, dict):
-                for key, value in provider_specific_fields.items():
-                    if value is not None and key not in message_dict:
-                        message_dict[key] = value
-
             return {
                 "choices": [
                     {