Update trade_manager.py

trade_manager.py

@@ -1,5 +1,5 @@
 # ============================================================
-# 🛡️ trade_manager.py (V35.3 - GEM-Architect: Math & Fee Sync Fixed)
+# 🛡️ trade_manager.py (V35.4 - GEM-Architect: FATAL FIX & ALL FEATURES)
 # ============================================================
 
 import asyncio
@@ -32,7 +32,7 @@ class TradeManager:
             "stagnation": {"total": 0, "good": 0, "saved": 0.0, "missed": 0.0}
         }
         self.execution_lock = asyncio.Lock()
-        print(f"🛡️ [TradeManager V35.3] True PnL Math Active.")
+        print(f"🛡️ [TradeManager V35.4] System Restoration Complete.")
 
     async def initialize_sentry_exchanges(self):
         print("🛡️ [TradeManager] Syncing state & Initializing Portfolio...")
@@ -316,9 +316,6 @@ class TradeManager:
                 await self.learning_hub.register_trade_outcome(trade_obj)
         except Exception: pass
 
-    # ==============================================================================
-    # 🔴 Exit Logic (MATH FIXED)
-    # ==============================================================================
     async def _execute_exit(self, symbol, price, reason, ai_scores=None):
         if symbol not in self.open_positions: return
         try:
@@ -326,24 +323,16 @@ class TradeManager:
             entry_price = float(trade['entry_price']); exit_price = float(price)
             entry_capital = float(trade.get('entry_capital', 100.0)); entry_fee = float(trade.get('entry_fee_usd', 0.0))
             
-            # 1. Gross Calculation
+            # Gross & Net Calculation
             exit_val_gross = (exit_price / entry_price) * entry_capital
-            
-            # 2. Fees
             exit_fee = exit_val_gross * self.FEE_RATE
             total_fees = entry_fee + exit_fee
             
-            # 3. PnL for Portfolio (Gross PnL so portfolio handles fees correctly)
-            # Gross PnL = Difference in Asset Value
             gross_pnl_usd = exit_val_gross - entry_capital
-            
-            # 4. PnL for Statistics (True Net PnL)
-            # True Net = Gross PnL - All Fees
             true_net_pnl_usd = gross_pnl_usd - total_fees
             true_net_pct = (true_net_pnl_usd / entry_capital) * 100
             
-            # ✅ Notify Portfolio with Gross PnL (Because it subtracts fees internally)
-            # Impact on Wallet = Gross PnL - Total Fees
+            # Update Portfolio with Gross PnL
             await self.smart_portfolio.register_closed_position(entry_capital, gross_pnl_usd, total_fees)
             
             trade.update({
@@ -351,7 +340,6 @@ class TradeManager:
                 'profit_pct': true_net_pct, 'net_pnl_usd': true_net_pnl_usd, 'fees_paid_usd': total_fees
             })
             
-            # Update Stats with TRUE NET
             portfolio = await self.r2.get_portfolio_state_async()
             portfolio['total_trades'] = portfolio.get('total_trades', 0) + 1
             if true_net_pnl_usd >= 0:
@@ -374,4 +362,16 @@ class TradeManager:
 
         except Exception as e:
             print(f"❌ [Exit Error] {e}"); traceback.print_exc()
-            if symbol not in self.open_positions: self.open_positions[symbol] = trade
+            if symbol not in self.open_positions: self.open_positions[symbol] = trade 
+
+    async def force_exit_by_manager(self, symbol, reason):
+        p = await self.data_manager.get_latest_price_async(symbol)
+        async with self.execution_lock: await self._execute_exit(symbol, p, reason)
+
+    # ✅ ADDED BACK: Startup/Shutdown hooks
+    async def start_sentry_loops(self):
+        await self.ensure_active_guardians()
+
+    async def stop_sentry_loops(self):
+        self.running = False
+        for task in self.sentry_tasks.values(): task.cancel()