fix: Complete final TypedDict migration and resolve type errors

- Update reader.py UsageEntryMapper.map to use RawJSONData parameter
- Update data_processors.py flatten_nested_dict to use RawJSONData with proper casting
- Update test fixtures in test_display_controller.py to use proper BlockDict structure
- Update test fixtures in conftest.py sample_session_data to use RawJSONData
- Keep appropriate generic types for invalid test data and raw API structures
- Add proper type casting in recursive flatten_nested_dict calls
- All mypy type checking now passes without errors

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: PabloLION

src/claude_monitor/core/data_processors.py

@@ -12,6 +12,7 @@
     ExtractedTokens,
     FlattenedData,
     JSONSerializable,
+    RawJSONData,
     TokenSource,
 )
 from claude_monitor.utils.time_utils import TimezoneHandler
@@ -232,7 +233,7 @@ class DataConverter:
 
     @staticmethod
     def flatten_nested_dict(
-        data: dict[str, JSONSerializable], prefix: str = ""
+        data: RawJSONData, prefix: str = ""
     ) -> FlattenedData:
         """Flatten nested dictionary structure.
 
@@ -249,7 +250,7 @@ def flatten_nested_dict(
             new_key = f"{prefix}.{key}" if prefix else key
 
             if isinstance(value, dict):
-                result.update(DataConverter.flatten_nested_dict(value, new_key))
+                result.update(DataConverter.flatten_nested_dict(cast(RawJSONData, value), new_key))
             else:
                 # Use type: ignore for dynamic key assignment in TypedDict
                 result[new_key] = value  # type: ignore[literal-required]

src/claude_monitor/data/reader.py

@@ -23,7 +23,6 @@
     ClaudeJSONEntry,
     EntryData,
     ExtractedMetadata,
-    JSONSerializable,
     RawJSONData,
     SystemEntry,
     UserEntry,
@@ -409,13 +408,11 @@ def __init__(
         self.timezone_handler = timezone_handler
 
     def map(
-        self, data: dict[str, JSONSerializable], mode: CostMode
+        self, data: RawJSONData, mode: CostMode
     ) -> UsageEntry | None:
         """Map raw data to UsageEntry - compatibility interface."""
-        # Cast to RawJSONData since this is test compatibility interface
-        from typing import cast
         return _map_to_usage_entry(
-            cast(RawJSONData, data), mode, self.timezone_handler, self.pricing_calculator
+            data, mode, self.timezone_handler, self.pricing_calculator
         )
 
     def _has_valid_tokens(self, tokens: dict[str, int]) -> bool:

src/tests/conftest.py

@@ -1,12 +1,16 @@
 """Shared pytest fixtures for Claude Monitor tests."""
 
-from datetime import datetime, timezone
+from datetime import datetime
+from datetime import timezone
 from unittest.mock import Mock
 
 import pytest
 
-from claude_monitor.core.models import CostMode, UsageEntry
-from claude_monitor.types import AnalysisResult, JSONSerializable, RawJSONData
+from claude_monitor.core.models import CostMode
+from claude_monitor.core.models import UsageEntry
+from claude_monitor.types import AnalysisResult
+from claude_monitor.types import JSONSerializable
+from claude_monitor.types import RawJSONData
 
 
 @pytest.fixture
@@ -24,7 +28,9 @@ def mock_timezone_handler() -> Mock:
     mock.parse_timestamp.return_value = datetime(
         2024, 1, 1, 12, 0, 0, tzinfo=timezone.utc
     )
-    mock.ensure_utc.return_value = datetime(2024, 1, 1, 12, 0, 0, tzinfo=timezone.utc)
+    mock.ensure_utc.return_value = datetime(
+        2024, 1, 1, 12, 0, 0, tzinfo=timezone.utc
+    )
     return mock
 
 
@@ -323,7 +329,7 @@ def sample_monitoring_data() -> AnalysisResult:
 
 
 @pytest.fixture
-def sample_session_data() -> dict[str, JSONSerializable]:
+def sample_session_data() -> RawJSONData:
     """Sample session data for testing."""
     return {
         "id": "session_1",

src/tests/test_display_controller.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from claude_monitor.types import JSONSerializable
+from claude_monitor.types import BlockDict
 from claude_monitor.ui.display_controller import (
     DisplayController,
     LiveDisplayManager,
@@ -23,23 +23,69 @@ def controller(self) -> DisplayController:
             return DisplayController()
 
     @pytest.fixture
-    def sample_active_block(self) -> dict[str, JSONSerializable]:
+    def sample_active_block(self) -> BlockDict:
         """Sample active block data."""
         return {
+            "id": "test-block-1",
             "isActive": True,
+            "isGap": False,
             "totalTokens": 15000,
             "costUSD": 0.45,
             "sentMessagesCount": 12,
+            "models": ["claude-3-opus", "claude-3-5-sonnet"],
+            "durationMinutes": 120.0,
+            "entries_count": 2,
+            "tokenCounts": {
+                "inputTokens": 9000,
+                "outputTokens": 6000,
+                "cacheCreationInputTokens": 0,
+                "cacheReadInputTokens": 0,
+            },
             "perModelStats": {
-                "claude-3-opus": {"inputTokens": 5000, "outputTokens": 3000},
-                "claude-3-5-sonnet": {"inputTokens": 4000, "outputTokens": 3000},
+                "claude-3-opus": {
+                    "input_tokens": 5000,
+                    "output_tokens": 3000,
+                    "cache_creation_tokens": 0,
+                    "cache_read_tokens": 0,
+                    "cost_usd": 0.25,
+                    "entries_count": 1,
+                },
+                "claude-3-5-sonnet": {
+                    "input_tokens": 4000,
+                    "output_tokens": 3000,
+                    "cache_creation_tokens": 0,
+                    "cache_read_tokens": 0,
+                    "cost_usd": 0.20,
+                    "entries_count": 1,
+                },
             },
             "entries": [
-                {"timestamp": "2024-01-01T12:00:00Z", "tokens": 5000},
-                {"timestamp": "2024-01-01T12:30:00Z", "tokens": 10000},
+                {
+                    "timestamp": "2024-01-01T12:00:00Z",
+                    "inputTokens": 5000,
+                    "outputTokens": 3000,
+                    "cacheCreationTokens": 0,
+                    "cacheReadInputTokens": 0,
+                    "costUSD": 0.25,
+                    "model": "claude-3-opus",
+                    "messageId": "msg-1",
+                    "requestId": "req-1",
+                },
+                {
+                    "timestamp": "2024-01-01T12:30:00Z",
+                    "inputTokens": 4000,
+                    "outputTokens": 3000,
+                    "cacheCreationTokens": 0,
+                    "cacheReadInputTokens": 0,
+                    "costUSD": 0.20,
+                    "model": "claude-3-5-sonnet",
+                    "messageId": "msg-2",
+                    "requestId": "req-2",
+                },
             ],
             "startTime": "2024-01-01T11:00:00Z",
             "endTime": "2024-01-01T13:00:00Z",
+            "actualEndTime": "2024-01-01T12:45:00Z",
         }
 
     @pytest.fixture
@@ -64,7 +110,7 @@ def test_init(self, controller: DisplayController) -> None:
     def test_extract_session_data(
         self,
         controller: DisplayController,
-        sample_active_block: dict[str, JSONSerializable],
+        sample_active_block: BlockDict,
     ) -> None:
         """Test session data extraction."""
         result = controller._extract_session_data(sample_active_block)  # type: ignore[misc]