fix: normalize_datetime_to_server_timezone returns naive datetime

Complete the timezone handling fix by ensuring normalized datetimes are
naive (no tzinfo), matching the format of stored event timestamps.

This allows proper datetime comparison in event_service without TypeError.

Co-authored-by: openhands <openhands@all-hands.dev>

Author: jpshackelford

openhands-agent-server/openhands/agent_server/event_router.py

@@ -38,20 +38,25 @@
 
 def normalize_datetime_to_server_timezone(dt: datetime) -> datetime:
     """
-    Normalize datetime to server timezone for consistent comparison.
+    Normalize datetime to server timezone for consistent comparison with events.
 
-    If the datetime has timezone info, convert to server native timezone.
+    Event timestamps are stored as naive datetimes in server local time.
+    This function ensures filter datetimes are also naive in server local time
+    so they can be compared correctly.
+
+    If the datetime has timezone info, convert to server native timezone and
+    strip the tzinfo to make it naive.
     If it's naive (no timezone), assume it's already in server timezone.
 
     Args:
         dt: Input datetime (may be timezone-aware or naive)
 
     Returns:
-        Datetime in server native timezone (timezone-aware)
+        Naive datetime in server local time
     """
     if dt.tzinfo is not None:
-        # Timezone-aware: convert to server native timezone
-        return dt.astimezone(None)
+        # Timezone-aware: convert to server native timezone, then make naive
+        return dt.astimezone(None).replace(tzinfo=None)
     else:
         # Naive datetime: assume it's already in server timezone
         return dt

tests/agent_server/test_event_router_websocket.py

@@ -509,7 +509,7 @@ async def test_after_timestamp_passed_to_search_events(
     async def test_after_timestamp_timezone_aware_is_normalized(
         self, mock_websocket, mock_event_service, sample_conversation_id
     ):
-        """Test that timezone-aware timestamps are normalized to server timezone."""
+        """Test that timezone-aware timestamps are normalized to naive server time."""
         from datetime import datetime
         from typing import cast
 
@@ -554,14 +554,16 @@ async def test_after_timestamp_timezone_aware_is_normalized(
             )
 
         # search_events should be called with the normalized timestamp
-        # (converted to server local timezone, which is still tz-aware)
+        # (converted to server local timezone AND made naive for comparison)
         mock_event_service.search_events.assert_called_once()
         call_args = mock_event_service.search_events.call_args
         passed_timestamp = call_args.kwargs["timestamp__gte"]
-        # The timestamp should have been converted to local timezone
+        # The timestamp should be naive (no tzinfo)
         assert passed_timestamp is not None
-        # It should represent the same instant in time
-        assert passed_timestamp == test_timestamp.astimezone(None)
+        assert passed_timestamp.tzinfo is None
+        # It should represent the same instant in time (converted to local)
+        expected = test_timestamp.astimezone(None).replace(tzinfo=None)
+        assert passed_timestamp == expected
 
     @pytest.mark.asyncio
     async def test_after_timestamp_without_resend_all_no_effect(