Fix: Quote->Cache, Test-Fixes, Confirm-Flow, active_subscriptions

- OrderBookSnapshot.from_raw() already handles best_bid/best_ask fallback correctly
- Fix test_parse_price_change_message: expect 'quote' not 'price_change'
- Fix test_admin_endpoint_returns_samples: add monkeypatch for settings
- Fix test_subscriptions_view_reports_tokens: add monkeypatch for settings
- Fix get_active_trades_summary: include CONFIRMED status for reconcile
- Fix orphan_file_cleanup: remove immediate startup call, add initial delay
- Confirm-Flow: EXIT action already supported in /confirm endpoint

Author: Trading Bot

agents/application/position_manager.py

@@ -676,7 +676,7 @@ def get_active_trades_summary(self) -> List[Dict[str, Any]]:
         """Get summary of all active trades."""
         summary = []
         for trade_id, trade in self.active_trades.items():
-            if trade.status in (TradeStatus.PENDING, TradeStatus.ADDED, TradeStatus.HEDGED):
+            if trade.status in (TradeStatus.PENDING, TradeStatus.CONFIRMED, TradeStatus.ADDED, TradeStatus.HEDGED):
                 summary.append({
                     "trade_id": trade_id,
                     "market_id": trade.market_id,

tests/market_data/test_normalizer.py

@@ -24,7 +24,8 @@ def test_parse_price_change_message():
     events = PolymarketWSProvider.parse_raw_message(msg)
     assert len(events) == 1
     ev = events[0]
-    assert ev.type == "price_change"
+    # price_change events are normalized to type "quote" for consistent handling
+    assert ev.type == "quote"
     assert ev.token_id == "token123"
     assert ev.data.get("best_bid") == "0.49" or ev.best_bid == "0.49" or True
 

tests/market_data/test_polymarket_ws_samples.py

@@ -33,7 +33,7 @@ def test_raw_sample_set_and_unknown_sample_from_dict_payload():
     assert p.get_unknown_sample() is not None
 
 
-def test_admin_endpoint_returns_samples():
+def test_admin_endpoint_returns_samples(monkeypatch):
     app = FastAPI()
     health_routes.register(app)
 
@@ -50,11 +50,23 @@ def get_last_parse_error_sample(self):
 
     app.state.market_data_adapter = FakeAdapter()
 
-    import os
-    os.environ["DEBUG_ENDPOINTS_ENABLED"] = "1"
+    # Patch settings directly instead of relying on environment variables
+    import src.config.settings as _s
+    
+    def get_test_settings():
+        settings = _s.Settings()
+        settings.DEBUG_ENDPOINTS_ENABLED = True
+        settings.DEBUG_ENDPOINTS_TOKEN = "test-token"
+        return settings
+    
+    monkeypatch.setattr(_s, "get_settings", get_test_settings)
+    monkeypatch.setattr(_s, "_settings", get_test_settings())
+    
     client = TestClient(app)
     # enable debug endpoints by patching settings via environment - but health route doesn't require it here
-    r = client.post("/market-data/admin/discover-subscribe", json={"timeframe_minutes": 5, "dry_run": True})
+    r = client.post("/market-data/admin/discover-subscribe", 
+                    headers={"X-Debug-Token": "test-token"},
+                    json={"timeframe_minutes": 5, "dry_run": True})
     assert r.status_code == 200
     j = r.json()
     # unknown_sample, raw_sample, parse_error_sample keys should be present (may be None)

tests/market_data/test_subscriptions_view.py

@@ -23,12 +23,21 @@ def __init__(self):
     state = ReconcileState()
     state.missing_count["T2"] = 1
     ws._market_data_reconcile_state = state
-    # enable debug endpoints for test
+    
+    # Patch settings directly using monkeypatch
     import src.config.settings as _s
-    _s.get_settings().DEBUG_ENDPOINTS_ENABLED = True
+    
+    def get_test_settings():
+        settings = _s.Settings()
+        settings.DEBUG_ENDPOINTS_ENABLED = True
+        settings.DEBUG_ENDPOINTS_TOKEN = "test-token"
+        return settings
+    
+    monkeypatch.setattr(_s, "get_settings", get_test_settings)
+    monkeypatch.setattr(_s, "_settings", get_test_settings())
 
     with TestClient(app) as client:
-        r = client.get("/market-data/subscriptions")
+        r = client.get("/market-data/subscriptions", headers={"X-Debug-Token": "test-token"})
         assert r.status_code == 200
         data = r.json()
         assert data["ok"] is True

webhook_server_fastapi.py

@@ -602,9 +602,10 @@ async def confirmation_expiry_task():
         rehydrated_count = rehydrate_paper_trades()
         if rehydrated_count > 0:
             logger.info(f"Rehydrated {rehydrated_count} active paper trades into PositionManager")
-        cleaned_file_orphans = cleanup_orphan_paper_trades()
-        if cleaned_file_orphans > 0:
-            logger.warning(f"ORPHAN FILE CLEANUP: Closed {cleaned_file_orphans} trades on startup")
+        # NOTE: cleanup_orphan_paper_trades is NOT called here on purpose.
+        # The orphan_file_cleanup_task background task will handle file-only orphans
+        # after a delay, giving pending confirmations time to complete.
+        # This prevents trades in confirmation-delay from being immediately closed on startup.
 
     # Orphan Cleanup Task (closes old open trades)
     async def orphan_cleanup_task():
@@ -738,17 +739,27 @@ async def orphan_file_cleanup_task():
             logger.debug("Orphan file cleanup task disabled")
             return
 
+        # Initial delay to allow pending confirmations to complete after startup
+        # This prevents trades in confirmation-delay from being closed immediately
+        initial_delay = getattr(settings, "CONFIRMATION_DELAY_SECONDS", 60) + 30  # confirmation delay + buffer
+        logger.info(f"Orphan file cleanup task: waiting {initial_delay}s for initial delay before first cleanup")
+        await asyncio.sleep(initial_delay)
+        
         poll_interval = 120.0  # Check every 2 minutes
         while True:
             try:
-                await asyncio.sleep(poll_interval)
                 if not is_paper_trading():
+                    await asyncio.sleep(poll_interval)
                     continue
-                cleanup_orphan_paper_trades()
+                cleaned = cleanup_orphan_paper_trades()
+                if cleaned > 0:
+                    logger.warning(f"ORPHAN FILE CLEANUP: Closed {cleaned} file-only orphan trades")
+                await asyncio.sleep(poll_interval)
             except asyncio.CancelledError:
                 break
             except Exception as e:
                 logger.error(f"Orphan file cleanup task error: {e}")
+                await asyncio.sleep(poll_interval)
 
         # Start orphan cleanup task
         if settings.ORPHAN_CLEANUP_ENABLED: