fix(events): Fix order event data structure mismatches across event handlers

Fixed critical issues where event handlers were expecting different data structures
than what was being emitted, causing order fill detection to fail:

OrderManager tracking.py:
- Added order_id directly to event payload for backward compatibility
- Modified fill_handler and terminal_handler to check both event_data.get("order_id")
  and event_data.get("order").id to handle different event structures
- Ensures bracket orders and other wait_for_fill patterns work correctly

RiskManager managed_trade.py:
- Changed from listening to ORDER_MODIFIED to ORDER_FILLED/CANCELLED/REJECTED
- ORDER_MODIFIED is for parameter changes (stop loss, limit price modifications)
- ORDER_FILLED/terminal events are for status changes (fills, cancellations)
- Updated handlers to use same pattern as OrderManager for consistency

This fixes the bracket order fill detection timeout issue where orders were
actually filling but the event wasn't being properly detected.

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

Co-Authored-By: Claude <[email protected]>

Author: TexasCoding

src/project_x_py/order_manager/tracking.py

@@ -188,6 +188,7 @@ async def _on_order_update(self, order_data: dict[str, Any] | list[Any]) -> None
                         order_obj = Order(**actual_order_data)
                         event_payload = {
                             "order": order_obj,
+                            "order_id": order_id,  # Add order_id for compatibility
                             "old_status": old_status,
                             "new_status": new_status,
                         }
@@ -398,17 +399,31 @@ async def fill_handler(event: Any) -> None:
             nonlocal is_filled
             # Extract data from Event object
             event_data = event.data if hasattr(event, "data") else event
-            if isinstance(event_data, dict) and event_data.get("order_id") == order_id:
-                is_filled = True
-                fill_event.set()
+            if isinstance(event_data, dict):
+                # Check both direct order_id and order.id from Order object
+                event_order_id = event_data.get("order_id")
+                if not event_order_id and "order" in event_data:
+                    order_obj = event_data.get("order")
+                    if hasattr(order_obj, "id"):
+                        event_order_id = order_obj.id
+                if event_order_id == order_id:
+                    is_filled = True
+                    fill_event.set()
 
         async def terminal_handler(event: Any) -> None:
             nonlocal is_filled
             # Extract data from Event object
             event_data = event.data if hasattr(event, "data") else event
-            if isinstance(event_data, dict) and event_data.get("order_id") == order_id:
-                is_filled = False
-                fill_event.set()
+            if isinstance(event_data, dict):
+                # Check both direct order_id and order.id from Order object
+                event_order_id = event_data.get("order_id")
+                if not event_order_id and "order" in event_data:
+                    order_obj = event_data.get("order")
+                    if hasattr(order_obj, "id"):
+                        event_order_id = order_obj.id
+                if event_order_id == order_id:
+                    is_filled = False
+                    fill_event.set()
 
         from project_x_py.event_bus import EventType
 

src/project_x_py/risk_manager/managed_trade.py

@@ -633,35 +633,56 @@ async def _wait_for_order_fill(
         fill_event = asyncio.Event()
         filled_successfully = False
 
-        async def order_update_handler(event_data: dict[str, Any]) -> None:
+        async def order_fill_handler(event: Any) -> None:
             nonlocal filled_successfully
-            # The event data for order_update is the Order object itself
-            updated_order: Order = event_data.get("data", {})
-            if updated_order and updated_order.id == order.id:
-                if updated_order.is_filled:
+            # Extract data from Event object
+            event_data = event.data if hasattr(event, "data") else event
+            if isinstance(event_data, dict):
+                # Check both direct order_id and order.id from Order object
+                event_order_id = event_data.get("order_id")
+                if not event_order_id and "order" in event_data:
+                    order_obj = event_data.get("order")
+                    if hasattr(order_obj, "id"):
+                        event_order_id = order_obj.id
+                if event_order_id == order.id:
                     filled_successfully = True
                     fill_event.set()
-                elif updated_order.is_terminal:
+
+        async def order_terminal_handler(event: Any) -> None:
+            nonlocal filled_successfully
+            # Extract data from Event object
+            event_data = event.data if hasattr(event, "data") else event
+            if isinstance(event_data, dict):
+                # Check both direct order_id and order.id from Order object
+                event_order_id = event_data.get("order_id")
+                if not event_order_id and "order" in event_data:
+                    order_obj = event_data.get("order")
+                    if hasattr(order_obj, "id"):
+                        event_order_id = order_obj.id
+                if event_order_id == order.id:
                     filled_successfully = False
                     fill_event.set()
 
-        await self.event_bus.on(EventType.ORDER_MODIFIED, order_update_handler)
+        await self.event_bus.on(EventType.ORDER_FILLED, order_fill_handler)
+        await self.event_bus.on(EventType.ORDER_CANCELLED, order_terminal_handler)
+        await self.event_bus.on(EventType.ORDER_REJECTED, order_terminal_handler)
 
         try:
             await asyncio.wait_for(fill_event.wait(), timeout=timeout_seconds)
         except TimeoutError:
             logger.warning(f"Timeout waiting for order {order.id} to fill via event.")
             filled_successfully = False
         finally:
-            # Important: Clean up the event handler to prevent memory leaks
-            # Assuming a `remove_callback` method exists on the event bus
+            # Important: Clean up the event handlers to prevent memory leaks
             if hasattr(self.event_bus, "remove_callback"):
                 await self.event_bus.remove_callback(
-                    EventType.ORDER_MODIFIED, order_update_handler
+                    EventType.ORDER_FILLED, order_fill_handler
                 )
-            elif hasattr(self.event_bus, "remove_listener"):
-                await self.event_bus.remove_listener(
-                    EventType.ORDER_MODIFIED, order_update_handler
+                await self.event_bus.remove_callback(
+                    EventType.ORDER_CANCELLED, order_terminal_handler
+                )
+                await self.event_bus.remove_callback(
+                    EventType.ORDER_REJECTED, order_terminal_handler
                 )
 
         return filled_successfully