Merge branch 'main' into copilot/fix-send-chat-history-bug

Author: pontemonti

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py

@@ -569,8 +569,8 @@ async def send_chat_history(
                           Must have a valid activity with conversation.id, activity.id, and
                           activity.text.
             chat_history_messages: List of ChatHistoryMessage objects representing the chat
-                                   history. Can be empty - the request will still be sent to
-                                   register the user message from turn_context.activity.text.
+                                   history. May be empty - an empty list will still send a
+                                   request to the MCP platform with empty chat history.
             options: Optional ToolOptions instance containing optional parameters.
 
         Returns:
@@ -608,8 +608,8 @@ async def send_chat_history(
         if chat_history_messages is None:
             raise ValueError("chat_history_messages cannot be None")
 
-        # Empty chat_history_messages is allowed - the request will still be sent
-        # to register the user message from turn_context.activity.text in the MCP platform.
+        # Note: Empty chat_history_messages is allowed - we still send the request to MCP platform
+        # The platform needs to receive the request even with empty chat history
 
         # Extract required information from turn context
         if not turn_context.activity:

tests/tooling/services/test_send_chat_history.py

@@ -3,6 +3,7 @@
 
 """Unit tests for send_chat_history method in McpToolServerConfigurationService."""
 
+import json
 from datetime import UTC, datetime
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
@@ -147,7 +148,7 @@ async def test_send_chat_history_validates_chat_history_messages(
 
     @pytest.mark.asyncio
     async def test_send_chat_history_empty_list_sends_request(self, service, mock_turn_context):
-        """Test that send_chat_history still sends request for empty list to register user message."""
+        """Test that send_chat_history sends request to MCP platform even with empty list."""
         # Arrange
         mock_response = AsyncMock()
         mock_response.status = 200
@@ -164,11 +165,19 @@ async def test_send_chat_history_empty_list_sends_request(self, service, mock_tu
             # Act
             result = await service.send_chat_history(mock_turn_context, [])
 
-            # Assert - empty list should still make HTTP request to register user message
+            # Assert - empty list should still make HTTP request and return success
             assert result.succeeded is True
             assert len(result.errors) == 0
-            # Verify HTTP POST was called
+
+            # Verify HTTP request was actually made
             assert mock_session_instance.post.called
+            call_args = mock_session_instance.post.call_args
+            assert "real-time-threat-protection/chat-message" in call_args[0][0]
+
+            # Verify the payload contains an empty chat history
+            data = call_args[1]["data"]
+            payload = json.loads(data)
+            assert payload["chatHistory"] == []
 
     @pytest.mark.asyncio
     async def test_send_chat_history_validates_activity(self, service, chat_history_messages):