backtest-kit 7.0.2 → 7.2.0

package/build/index.mjs

@@ -4750,8 +4750,7 @@ const TIMEOUT_SYMBOL = Symbol('timeout');
  * The framework will retry on the next tick.
  */
 const CALL_SIGNAL_SYNC_OPEN_FN = trycatch(async (timestamp, currentPrice, pendingSignal, self) => {
-    const publicSignal = TO_PUBLIC_SIGNAL(pendingSignal, currentPrice);
-    const pnl = toProfitLossDto(pendingSignal, currentPrice);
+    const publicSignal = TO_PUBLIC_SIGNAL("pending", pendingSignal, currentPrice);
     return await self.params.onSignalSync({
         action: "signal-open",
         symbol: self.params.execution.context.symbol,
@@ -4762,10 +4761,12 @@ const CALL_SIGNAL_SYNC_OPEN_FN = trycatch(async (timestamp, currentPrice, pendin
         signalId: pendingSignal.id,
         timestamp,
         signal: publicSignal,
+        maxDrawdown: publicSignal.maxDrawdown,
+        peakProfit: publicSignal.peakProfit,
         cost: pendingSignal.cost,
         currentPrice,
         position: publicSignal.position,
-        pnl,
+        pnl: publicSignal.pnl,
         priceOpen: publicSignal.priceOpen,
         priceTakeProfit: publicSignal.priceTakeProfit,
         priceStopLoss: publicSignal.priceStopLoss,
@@ -4789,8 +4790,7 @@ const CALL_SIGNAL_SYNC_OPEN_FN = trycatch(async (timestamp, currentPrice, pendin
  * strategy state is NOT mutated. The framework will retry on the next tick.
  */
 const CALL_SIGNAL_SYNC_CLOSE_FN = trycatch(async (timestamp, currentPrice, closeReason, signal, self) => {
-    const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
-    const pnl = toProfitLossDto(signal, currentPrice);
+    const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
     return await self.params.onSignalSync({
         action: "signal-close",
         symbol: self.params.execution.context.symbol,
@@ -4801,8 +4801,10 @@ const CALL_SIGNAL_SYNC_CLOSE_FN = trycatch(async (timestamp, currentPrice, close
         signalId: signal.id,
         timestamp,
         signal: publicSignal,
+        maxDrawdown: publicSignal.maxDrawdown,
+        peakProfit: publicSignal.peakProfit,
         currentPrice,
-        pnl,
+        pnl: publicSignal.pnl,
         position: publicSignal.position,
         priceOpen: publicSignal.priceOpen,
         priceTakeProfit: publicSignal.priceTakeProfit,
@@ -4863,10 +4865,9 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
     if (!self._pendingSignal) {
         return;
     }
-    // Get public signal data for commit events (contains effective and original SL/TP)
-    const publicSignal = TO_PUBLIC_SIGNAL(self._pendingSignal, currentPrice);
     for (const commit of queue) {
         if (commit.action === "partial-profit") {
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", self._pendingSignal, commit.currentPrice);
             await CALL_COMMIT_FN(self, {
                 action: "partial-profit",
                 symbol: commit.symbol,
@@ -4876,7 +4877,10 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
                 backtest: commit.backtest,
                 percentToClose: commit.percentToClose,
                 currentPrice: commit.currentPrice,
-                pnl: toProfitLossDto(self._pendingSignal, commit.currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 timestamp,
                 totalEntries: publicSignal.totalEntries,
                 totalPartials: publicSignal.totalPartials,
@@ -4895,6 +4899,7 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
             continue;
         }
         if (commit.action === "partial-loss") {
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", self._pendingSignal, commit.currentPrice);
             await CALL_COMMIT_FN(self, {
                 action: "partial-loss",
                 symbol: commit.symbol,
@@ -4904,7 +4909,10 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
                 backtest: commit.backtest,
                 percentToClose: commit.percentToClose,
                 currentPrice: commit.currentPrice,
-                pnl: toProfitLossDto(self._pendingSignal, commit.currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 timestamp,
                 totalEntries: publicSignal.totalEntries,
                 totalPartials: publicSignal.totalPartials,
@@ -4923,6 +4931,7 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
             continue;
         }
         if (commit.action === "breakeven") {
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", self._pendingSignal, commit.currentPrice);
             await CALL_COMMIT_FN(self, {
                 action: "breakeven",
                 symbol: commit.symbol,
@@ -4931,7 +4940,10 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
                 frameName: self.params.frameName,
                 backtest: commit.backtest,
                 currentPrice: commit.currentPrice,
-                pnl: toProfitLossDto(self._pendingSignal, commit.currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 timestamp,
                 totalEntries: publicSignal.totalEntries,
                 totalPartials: publicSignal.totalPartials,
@@ -4950,6 +4962,7 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
             continue;
         }
         if (commit.action === "trailing-stop") {
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", self._pendingSignal, commit.currentPrice);
             await CALL_COMMIT_FN(self, {
                 action: "trailing-stop",
                 symbol: commit.symbol,
@@ -4959,7 +4972,10 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
                 backtest: commit.backtest,
                 percentShift: commit.percentShift,
                 currentPrice: commit.currentPrice,
-                pnl: toProfitLossDto(self._pendingSignal, commit.currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 timestamp,
                 totalEntries: publicSignal.totalEntries,
                 totalPartials: publicSignal.totalPartials,
@@ -4978,6 +4994,7 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
             continue;
         }
         if (commit.action === "trailing-take") {
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", self._pendingSignal, commit.currentPrice);
             await CALL_COMMIT_FN(self, {
                 action: "trailing-take",
                 symbol: commit.symbol,
@@ -4987,7 +5004,10 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
                 backtest: commit.backtest,
                 percentShift: commit.percentShift,
                 currentPrice: commit.currentPrice,
-                pnl: toProfitLossDto(self._pendingSignal, commit.currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 timestamp,
                 totalEntries: publicSignal.totalEntries,
                 totalPartials: publicSignal.totalPartials,
@@ -5006,6 +5026,7 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
             continue;
         }
         if (commit.action === "average-buy") {
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", self._pendingSignal, commit.currentPrice);
             const effectivePriceOpen = getEffectivePriceOpen(self._pendingSignal);
             await CALL_COMMIT_FN(self, {
                 action: "average-buy",
@@ -5017,7 +5038,10 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
                 currentPrice: commit.currentPrice,
                 cost: commit.cost,
                 effectivePriceOpen,
-                pnl: toProfitLossDto(self._pendingSignal, commit.currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 timestamp,
                 totalEntries: publicSignal.totalEntries,
                 totalPartials: publicSignal.totalPartials,
@@ -5037,6 +5061,8 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
         }
     }
 };
+/** Zero PNL constant for scheduled signals (which don't have priceOpen or PNL yet) */
+const ZERO_PNL$1 = { pnlPercentage: 0, priceOpen: 0, priceClose: 0, pnlCost: 0, pnlEntries: 0 };
 /**
  * Converts internal signal to public API format.
  *
@@ -5084,7 +5110,7 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, currentPrice, timestamp) => {
  * // publicSignal._trailingPriceTakeProfit = undefined (hidden from external API)
  * ```
  */
-const TO_PUBLIC_SIGNAL = (signal, currentPrice) => {
+const TO_PUBLIC_SIGNAL = (type, signal, currentPrice) => {
     const hasTrailingSL = "_trailingPriceStopLoss" in signal && signal._trailingPriceStopLoss !== undefined;
     const hasTrailingTP = "_trailingPriceTakeProfit" in signal && signal._trailingPriceTakeProfit !== undefined;
     const partialExecuted = "_partial" in signal
@@ -5092,11 +5118,14 @@ const TO_PUBLIC_SIGNAL = (signal, currentPrice) => {
         : 0;
     const totalEntries = ("_entry" in signal && Array.isArray(signal._entry))
         ? signal._entry.length
-        : 1;
+        : type === "scheduled" ? 0 : 1;
     const totalPartials = ("_partial" in signal && Array.isArray(signal._partial))
         ? signal._partial.length
         : 0;
-    const effectivePriceOpen = "_entry" in signal ? getEffectivePriceOpen(signal) : signal.priceOpen;
+    const pnl = type === "scheduled" ? ZERO_PNL$1 : toProfitLossDto(signal, currentPrice);
+    const maxDrawdown = type === "scheduled" ? ZERO_PNL$1 : ("_fall" in signal ? !!signal["_fall"] ? ({ ...signal._fall }) : ZERO_PNL$1 : ZERO_PNL$1);
+    const peakProfit = type === "scheduled" ? ZERO_PNL$1 : ("_peak" in signal ? signal["_peak"] ? ({ ...signal._peak }) : ZERO_PNL$1 : ZERO_PNL$1);
+    const effectivePriceOpen = type === "scheduled" ? signal.priceOpen : "_entry" in signal ? signal["_entry"] ? getEffectivePriceOpen(signal) : signal.priceOpen : signal.priceOpen;
     return {
         ...structuredClone(signal),
         priceOpen: effectivePriceOpen,
@@ -5105,10 +5134,12 @@ const TO_PUBLIC_SIGNAL = (signal, currentPrice) => {
         originalPriceOpen: signal.priceOpen,
         originalPriceStopLoss: signal.priceStopLoss,
         originalPriceTakeProfit: signal.priceTakeProfit,
+        maxDrawdown,
+        peakProfit,
         partialExecuted,
         totalEntries,
         totalPartials,
-        pnl: toProfitLossDto(signal, currentPrice),
+        pnl,
     };
 };
 const GET_SIGNAL_FN = trycatch(async (self) => {
@@ -5173,8 +5204,8 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
                 timestamp: currentTime,
                 _isScheduled: false,
                 _entry: [{ price: signal.priceOpen, cost: signal.cost ?? GLOBAL_CONFIG.CC_POSITION_ENTRY_COST, timestamp: currentTime }],
-                _peak: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
-                _fall: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
+                _peak: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
+                _fall: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
             };
             // Валидируем сигнал перед возвратом
             validatePendingSignal(signalRow, currentPrice);
@@ -5199,8 +5230,8 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
             timestamp: currentTime,
             _isScheduled: true,
             _entry: [{ price: signal.priceOpen, cost: signal.cost ?? GLOBAL_CONFIG.CC_POSITION_ENTRY_COST, timestamp: currentTime }],
-            _peak: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
-            _fall: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
+            _peak: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
+            _fall: { price: signal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
         };
         // Валидируем сигнал перед возвратом
         validateScheduledSignal(scheduledSignalRow, currentPrice);
@@ -5222,8 +5253,8 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
         timestamp: currentTime,
         _isScheduled: false,
         _entry: [{ price: currentPrice, cost: signal.cost ?? GLOBAL_CONFIG.CC_POSITION_ENTRY_COST, timestamp: currentTime }],
-        _peak: { price: currentPrice, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
-        _fall: { price: currentPrice, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
+        _peak: { price: currentPrice, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
+        _fall: { price: currentPrice, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
     };
     // Валидируем сигнал перед возвратом
     validatePendingSignal(signalRow, currentPrice);
@@ -5827,7 +5858,7 @@ const CHECK_SCHEDULED_SIGNAL_TIMEOUT_FN = async (self, scheduled, currentPrice)
     await CALL_CANCEL_CALLBACKS_FN(self, self.params.execution.context.symbol, scheduled, currentPrice, currentTime, self.params.execution.context.backtest);
     const result = {
         action: "cancelled",
-        signal: TO_PUBLIC_SIGNAL(scheduled, currentPrice),
+        signal: TO_PUBLIC_SIGNAL("scheduled", scheduled, currentPrice),
         currentPrice: currentPrice,
         closeTimestamp: currentTime,
         strategyName: self.params.method.context.strategyName,
@@ -5883,7 +5914,7 @@ const CANCEL_SCHEDULED_SIGNAL_BY_STOPLOSS_FN = async (self, scheduled, currentPr
     await CALL_CANCEL_CALLBACKS_FN(self, self.params.execution.context.symbol, scheduled, currentPrice, currentTime, self.params.execution.context.backtest);
     const result = {
         action: "cancelled",
-        signal: TO_PUBLIC_SIGNAL(scheduled, currentPrice),
+        signal: TO_PUBLIC_SIGNAL("scheduled", scheduled, currentPrice),
         currentPrice: currentPrice,
         closeTimestamp: currentTime,
         strategyName: self.params.method.context.strategyName,
@@ -5934,8 +5965,8 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
         ...scheduled,
         pendingAt: activationTime,
         _isScheduled: false,
-        _peak: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0 },
-        _fall: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0 },
+        _peak: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0, pnlEntries: 0, priceClose: 0, priceOpen: 0 },
+        _fall: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0, pnlEntries: 0, priceClose: 0, priceOpen: 0 },
     };
     // Sync open: if external system rejects — cancel scheduled signal instead of opening
     const syncOpenAllowed = await CALL_SIGNAL_SYNC_OPEN_FN(activationTime, activatedSignal.priceOpen, activatedSignal, self);
@@ -5945,6 +5976,7 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
             signalId: scheduled.id,
         });
         await self.setScheduledSignal(null);
+        const publicSignal = TO_PUBLIC_SIGNAL("scheduled", scheduled, scheduled.priceOpen);
         await CALL_COMMIT_FN(self, {
             action: "cancel-scheduled",
             symbol: self.params.execution.context.symbol,
@@ -5957,7 +5989,10 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
             totalEntries: scheduled._entry?.length ?? 1,
             totalPartials: scheduled._partial?.length ?? 0,
             originalPriceOpen: scheduled.priceOpen,
-            pnl: toProfitLossDto(scheduled, scheduled.priceOpen),
+            pnl: publicSignal.pnl,
+            maxDrawdown: publicSignal.maxDrawdown,
+            peakProfit: publicSignal.peakProfit,
+            signal: publicSignal,
             note: scheduled.note,
         });
         return null;
@@ -5968,7 +6003,7 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
     await CALL_OPEN_CALLBACKS_FN(self, self.params.execution.context.symbol, self._pendingSignal, self._pendingSignal.priceOpen, activationTime, self.params.execution.context.backtest);
     const result = {
         action: "opened",
-        signal: TO_PUBLIC_SIGNAL(self._pendingSignal, self._pendingSignal.priceOpen),
+        signal: TO_PUBLIC_SIGNAL("pending", self._pendingSignal, self._pendingSignal.priceOpen),
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
         frameName: self.params.method.context.frameName,
@@ -5982,7 +6017,7 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
 };
 const CALL_SCHEDULE_PING_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, scheduled, timestamp, backtest, currentPrice) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(scheduled, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("scheduled", scheduled, currentPrice);
         // Call system onSchedulePing callback first (emits to pingSubject)
         await self.params.onSchedulePing(self.params.execution.context.symbol, self.params.method.context.strategyName, self.params.method.context.exchangeName, publicSignal, currentPrice, self.params.execution.context.backtest, timestamp);
         // Call user onSchedulePing callback only if signal is still active (not cancelled, not activated)
@@ -6008,7 +6043,7 @@ const CALL_SCHEDULE_PING_CALLBACKS_FN = trycatch(beginTime(async (self, symbol,
 });
 const CALL_ACTIVE_PING_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, pending, timestamp, backtest, currentPrice) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(pending, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", pending, currentPrice);
         // Call system onActivePing callback first (emits to activePingSubject)
         await self.params.onActivePing(self.params.execution.context.symbol, self.params.method.context.strategyName, self.params.method.context.exchangeName, publicSignal, currentPrice, self.params.execution.context.backtest, timestamp);
         // Call user onActivePing callback only if signal is still active (not closed)
@@ -6056,7 +6091,7 @@ const CALL_IDLE_PING_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, time
 const CALL_ACTIVE_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
         if (self.params.callbacks?.onActive) {
-            const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
             await self.params.callbacks.onActive(self.params.execution.context.symbol, publicSignal, currentPrice, self.params.execution.context.backtest);
         }
     }, {
@@ -6079,7 +6114,7 @@ const CALL_ACTIVE_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal,
 const CALL_SCHEDULE_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
         if (self.params.callbacks?.onSchedule) {
-            const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("scheduled", signal, currentPrice);
             await self.params.callbacks.onSchedule(self.params.execution.context.symbol, publicSignal, currentPrice, self.params.execution.context.backtest);
         }
     }, {
@@ -6102,7 +6137,7 @@ const CALL_SCHEDULE_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signa
 const CALL_CANCEL_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
         if (self.params.callbacks?.onCancel) {
-            const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("scheduled", signal, currentPrice);
             await self.params.callbacks.onCancel(self.params.execution.context.symbol, publicSignal, currentPrice, self.params.execution.context.backtest);
         }
     }, {
@@ -6125,7 +6160,7 @@ const CALL_CANCEL_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal,
 const CALL_OPEN_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, priceOpen, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
         if (self.params.callbacks?.onOpen) {
-            const publicSignal = TO_PUBLIC_SIGNAL(signal, priceOpen);
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, priceOpen);
             await self.params.callbacks.onOpen(self.params.execution.context.symbol, publicSignal, priceOpen, self.params.execution.context.backtest);
         }
     }, {
@@ -6148,7 +6183,7 @@ const CALL_OPEN_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, p
 const CALL_CLOSE_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
         if (self.params.callbacks?.onClose) {
-            const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
             await self.params.callbacks.onClose(self.params.execution.context.symbol, publicSignal, currentPrice, self.params.execution.context.backtest);
         }
     }, {
@@ -6271,7 +6306,7 @@ const CALL_RISK_REMOVE_SIGNAL_FN = trycatch(beginTime(async (self, symbol, times
 });
 const CALL_PARTIAL_CLEAR_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
         await self.params.partial.clear(symbol, publicSignal, currentPrice, backtest);
     }, {
         when: new Date(timestamp),
@@ -6293,7 +6328,7 @@ const CALL_PARTIAL_CLEAR_FN = trycatch(beginTime(async (self, symbol, signal, cu
 const CALL_RISK_CHECK_SIGNAL_FN = trycatch(beginTime(async (self, symbol, pendingSignal, currentPrice, timestamp, backtest) => {
     return await ExecutionContextService.runInContext(async () => {
         return await self.params.risk.checkSignal({
-            currentSignal: TO_PUBLIC_SIGNAL(pendingSignal, currentPrice),
+            currentSignal: TO_PUBLIC_SIGNAL("scheduled", pendingSignal, currentPrice),
             symbol: symbol,
             strategyName: self.params.method.context.strategyName,
             exchangeName: self.params.method.context.exchangeName,
@@ -6322,7 +6357,7 @@ const CALL_RISK_CHECK_SIGNAL_FN = trycatch(beginTime(async (self, symbol, pendin
 });
 const CALL_PARTIAL_PROFIT_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, percentTp, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
         await self.params.partial.profit(symbol, publicSignal, currentPrice, percentTp, backtest, new Date(timestamp));
         if (self.params.callbacks?.onPartialProfit) {
             await self.params.callbacks.onPartialProfit(symbol, publicSignal, currentPrice, percentTp, backtest);
@@ -6346,7 +6381,7 @@ const CALL_PARTIAL_PROFIT_CALLBACKS_FN = trycatch(beginTime(async (self, symbol,
 });
 const CALL_PARTIAL_LOSS_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, percentSl, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
         await self.params.partial.loss(symbol, publicSignal, currentPrice, percentSl, backtest, new Date(timestamp));
         if (self.params.callbacks?.onPartialLoss) {
             await self.params.callbacks.onPartialLoss(symbol, publicSignal, currentPrice, percentSl, backtest);
@@ -6370,7 +6405,7 @@ const CALL_PARTIAL_LOSS_CALLBACKS_FN = trycatch(beginTime(async (self, symbol, s
 });
 const CALL_BREAKEVEN_CHECK_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
         const isBreakeven = await self.params.breakeven.check(symbol, publicSignal, currentPrice, backtest, new Date(timestamp));
         if (self.params.callbacks?.onBreakeven) {
             isBreakeven && await self.params.callbacks.onBreakeven(symbol, publicSignal, currentPrice, backtest);
@@ -6394,7 +6429,7 @@ const CALL_BREAKEVEN_CHECK_FN = trycatch(beginTime(async (self, symbol, signal,
 });
 const CALL_BREAKEVEN_CLEAR_FN = trycatch(beginTime(async (self, symbol, signal, currentPrice, timestamp, backtest) => {
     await ExecutionContextService.runInContext(async () => {
-        const publicSignal = TO_PUBLIC_SIGNAL(signal, currentPrice);
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
         await self.params.breakeven.clear(symbol, publicSignal, currentPrice, backtest);
     }, {
         when: new Date(timestamp),
@@ -6417,7 +6452,7 @@ const CALL_BACKTEST_SCHEDULE_OPEN_FN = trycatch(beginTime(async (self, symbol, s
     await ExecutionContextService.runInContext(async () => {
         backtestScheduleOpenSubject.next({
             action: "opened",
-            signal: TO_PUBLIC_SIGNAL(signal, signal.priceOpen),
+            signal: TO_PUBLIC_SIGNAL("pending", signal, signal.priceOpen),
             strategyName: self.params.method.context.strategyName,
             exchangeName: self.params.method.context.exchangeName,
             frameName: self.params.method.context.frameName,
@@ -6446,10 +6481,10 @@ const CALL_BACKTEST_SCHEDULE_OPEN_FN = trycatch(beginTime(async (self, symbol, s
 const RETURN_SCHEDULED_SIGNAL_ACTIVE_FN = async (self, scheduled, currentPrice) => {
     const currentTime = self.params.execution.context.when.getTime();
     await CALL_SCHEDULE_PING_CALLBACKS_FN(self, self.params.execution.context.symbol, scheduled, currentTime, self.params.execution.context.backtest, currentPrice);
-    const pnl = toProfitLossDto(scheduled, currentPrice);
+    const publicSignal = TO_PUBLIC_SIGNAL("scheduled", scheduled, currentPrice);
     const result = {
         action: "waiting",
-        signal: TO_PUBLIC_SIGNAL(scheduled, currentPrice),
+        signal: publicSignal,
         currentPrice: currentPrice,
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
@@ -6457,7 +6492,7 @@ const RETURN_SCHEDULED_SIGNAL_ACTIVE_FN = async (self, scheduled, currentPrice)
         symbol: self.params.execution.context.symbol,
         percentTp: 0,
         percentSl: 0,
-        pnl,
+        pnl: publicSignal.pnl,
         backtest: self.params.execution.context.backtest,
         createdAt: currentTime,
     };
@@ -6477,7 +6512,7 @@ const OPEN_NEW_SCHEDULED_SIGNAL_FN = async (self, signal) => {
     await CALL_SCHEDULE_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, currentPrice, currentTime, self.params.execution.context.backtest);
     const result = {
         action: "scheduled",
-        signal: TO_PUBLIC_SIGNAL(signal, currentPrice),
+        signal: TO_PUBLIC_SIGNAL("scheduled", signal, currentPrice),
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
         frameName: self.params.method.context.frameName,
@@ -6507,7 +6542,7 @@ const OPEN_NEW_PENDING_SIGNAL_FN = async (self, signal) => {
     await CALL_OPEN_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, signal.priceOpen, currentTime, self.params.execution.context.backtest);
     const result = {
         action: "opened",
-        signal: TO_PUBLIC_SIGNAL(signal, signal.priceOpen),
+        signal: TO_PUBLIC_SIGNAL("pending", signal, signal.priceOpen),
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
         frameName: self.params.method.context.frameName,
@@ -6562,13 +6597,13 @@ const CLOSE_PENDING_SIGNAL_FN = async (self, signal, currentPrice, closeReason)
         });
         return null;
     }
-    const pnl = toProfitLossDto(signal, currentPrice);
+    const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
     self.params.logger.info(`ClientStrategy signal ${closeReason}`, {
         symbol: self.params.execution.context.symbol,
         signalId: signal.id,
         closeReason,
         priceClose: currentPrice,
-        pnlPercentage: pnl.pnlPercentage,
+        pnlPercentage: publicSignal.pnl.pnlPercentage,
     });
     await CALL_CLOSE_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, currentPrice, currentTime, self.params.execution.context.backtest);
     // КРИТИЧНО: Очищаем состояние ClientPartial при закрытии позиции
@@ -6579,11 +6614,11 @@ const CLOSE_PENDING_SIGNAL_FN = async (self, signal, currentPrice, closeReason)
     await self.setPendingSignal(null);
     const result = {
         action: "closed",
-        signal: TO_PUBLIC_SIGNAL(signal, currentPrice),
+        signal: publicSignal,
         currentPrice: currentPrice,
         closeReason: closeReason,
         closeTimestamp: currentTime,
-        pnl: pnl,
+        pnl: publicSignal.pnl,
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
         frameName: self.params.method.context.frameName,
@@ -6616,13 +6651,13 @@ const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice, backt
                 const progressPercent = (currentDistance / tpDistance) * 100;
                 percentTp = Math.min(progressPercent, 100);
                 if (currentPrice > signal._peak.price) {
-                    const { pnl } = TO_PUBLIC_SIGNAL(signal, currentPrice);
-                    signal._peak = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                    const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
+                    signal._peak = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceClose: pnl.priceClose, priceOpen: pnl.priceOpen };
                     if (self.params.callbacks?.onWrite) {
                         self.params.callbacks.onWrite(signal.symbol, signal, backtest);
                     }
                     !backtest && await PersistSignalAdapter.writeSignalData(signal, self.params.execution.context.symbol, self.params.strategyName, self.params.exchangeName);
-                    await self.params.onHighestProfit(TO_PUBLIC_SIGNAL(signal, currentPrice), currentPrice, currentTime);
+                    await self.params.onHighestProfit(TO_PUBLIC_SIGNAL("pending", signal, currentPrice), currentPrice, currentTime);
                 }
                 await CALL_PARTIAL_PROFIT_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, currentPrice, percentTp, currentTime, self.params.execution.context.backtest);
             }
@@ -6633,13 +6668,13 @@ const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice, backt
                 const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
                 percentSl = Math.min(progressPercent, 100);
                 if (currentPrice < signal._fall.price) {
-                    const { pnl } = TO_PUBLIC_SIGNAL(signal, currentPrice);
-                    signal._fall = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                    const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
+                    signal._fall = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceClose: pnl.priceClose, priceOpen: pnl.priceOpen };
                     if (self.params.callbacks?.onWrite) {
                         self.params.callbacks.onWrite(signal.symbol, signal, backtest);
                     }
                     !backtest && await PersistSignalAdapter.writeSignalData(signal, self.params.execution.context.symbol, self.params.strategyName, self.params.exchangeName);
-                    await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL(signal, currentPrice), currentPrice, currentTime);
+                    await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL("pending", signal, currentPrice), currentPrice, currentTime);
                 }
                 await CALL_PARTIAL_LOSS_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, currentPrice, percentSl, currentTime, self.params.execution.context.backtest);
             }
@@ -6658,13 +6693,13 @@ const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice, backt
                 const progressPercent = (currentDistance / tpDistance) * 100;
                 percentTp = Math.min(progressPercent, 100);
                 if (currentPrice < signal._peak.price) {
-                    const { pnl } = TO_PUBLIC_SIGNAL(signal, currentPrice);
-                    signal._peak = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                    const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
+                    signal._peak = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceClose: pnl.priceClose, priceOpen: pnl.priceOpen };
                     if (self.params.callbacks?.onWrite) {
                         self.params.callbacks.onWrite(signal.symbol, signal, backtest);
                     }
                     !backtest && await PersistSignalAdapter.writeSignalData(signal, self.params.execution.context.symbol, self.params.strategyName, self.params.exchangeName);
-                    await self.params.onHighestProfit(TO_PUBLIC_SIGNAL(signal, currentPrice), currentPrice, currentTime);
+                    await self.params.onHighestProfit(TO_PUBLIC_SIGNAL("pending", signal, currentPrice), currentPrice, currentTime);
                 }
                 await CALL_PARTIAL_PROFIT_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, currentPrice, percentTp, currentTime, self.params.execution.context.backtest);
             }
@@ -6675,22 +6710,22 @@ const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice, backt
                 const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
                 percentSl = Math.min(progressPercent, 100);
                 if (currentPrice > signal._fall.price) {
-                    const { pnl } = TO_PUBLIC_SIGNAL(signal, currentPrice);
-                    signal._fall = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                    const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
+                    signal._fall = { price: currentPrice, timestamp: currentTime, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceClose: pnl.priceClose, priceOpen: pnl.priceOpen };
                     if (self.params.callbacks?.onWrite) {
                         self.params.callbacks.onWrite(signal.symbol, signal, backtest);
                     }
                     !backtest && await PersistSignalAdapter.writeSignalData(signal, self.params.execution.context.symbol, self.params.strategyName, self.params.exchangeName);
-                    await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL(signal, currentPrice), currentPrice, currentTime);
+                    await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL("pending", signal, currentPrice), currentPrice, currentTime);
                 }
                 await CALL_PARTIAL_LOSS_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, currentPrice, percentSl, currentTime, self.params.execution.context.backtest);
             }
         }
     }
-    const pnl = toProfitLossDto(signal, currentPrice);
+    const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, currentPrice);
     const result = {
         action: "active",
-        signal: TO_PUBLIC_SIGNAL(signal, currentPrice),
+        signal: publicSignal,
         currentPrice: currentPrice,
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
@@ -6698,7 +6733,7 @@ const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice, backt
         symbol: self.params.execution.context.symbol,
         percentTp,
         percentSl,
-        pnl,
+        pnl: publicSignal.pnl,
         backtest: self.params.execution.context.backtest,
         createdAt: currentTime,
         _backtestLastTimestamp: currentTime,
@@ -6734,6 +6769,7 @@ const CANCEL_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, averagePr
         reason,
     });
     await self.setScheduledSignal(null);
+    const publicSignal = TO_PUBLIC_SIGNAL("scheduled", scheduled, averagePrice);
     if (reason === "user") {
         await CALL_COMMIT_FN(self, {
             action: "cancel-scheduled",
@@ -6748,14 +6784,17 @@ const CANCEL_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, averagePr
             totalEntries: scheduled._entry?.length ?? 1,
             totalPartials: scheduled._partial?.length ?? 0,
             originalPriceOpen: scheduled.priceOpen,
-            pnl: toProfitLossDto(scheduled, averagePrice),
+            pnl: publicSignal.pnl,
+            maxDrawdown: publicSignal.maxDrawdown,
+            peakProfit: publicSignal.peakProfit,
+            signal: publicSignal,
             note: cancelNote ?? scheduled.note,
         });
     }
     await CALL_CANCEL_CALLBACKS_FN(self, self.params.execution.context.symbol, scheduled, averagePrice, closeTimestamp, self.params.execution.context.backtest);
     const result = {
         action: "cancelled",
-        signal: TO_PUBLIC_SIGNAL(scheduled, averagePrice),
+        signal: publicSignal,
         currentPrice: averagePrice,
         closeTimestamp: closeTimestamp,
         strategyName: self.params.method.context.strategyName,
@@ -6804,8 +6843,8 @@ const ACTIVATE_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, activat
         ...scheduled,
         pendingAt: activationTime,
         _isScheduled: false,
-        _peak: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0 },
-        _fall: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0 },
+        _peak: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0, pnlEntries: 0, priceClose: 0, priceOpen: 0 },
+        _fall: { price: scheduled.priceOpen, timestamp: activationTime, pnlPercentage: 0, pnlCost: 0, pnlEntries: 0, priceClose: 0, priceOpen: 0 },
     };
     // Sync open: if external system rejects — cancel scheduled signal instead of opening
     const syncOpenAllowed = await CALL_SIGNAL_SYNC_OPEN_FN(activationTime, activatedSignal.priceOpen, activatedSignal, self);
@@ -6815,6 +6854,7 @@ const ACTIVATE_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, activat
             signalId: scheduled.id,
         });
         await self.setScheduledSignal(null);
+        const publicSignal = TO_PUBLIC_SIGNAL("scheduled", scheduled, scheduled.priceOpen);
         await CALL_COMMIT_FN(self, {
             action: "cancel-scheduled",
             symbol: self.params.execution.context.symbol,
@@ -6827,7 +6867,10 @@ const ACTIVATE_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, activat
             totalEntries: scheduled._entry?.length ?? 1,
             totalPartials: scheduled._partial?.length ?? 0,
             originalPriceOpen: scheduled.priceOpen,
-            pnl: toProfitLossDto(scheduled, scheduled.priceOpen),
+            pnl: publicSignal.pnl,
+            maxDrawdown: publicSignal.maxDrawdown,
+            peakProfit: publicSignal.peakProfit,
+            signal: publicSignal,
             note: scheduled.note,
         });
         return false;
@@ -6850,20 +6893,20 @@ const CLOSE_PENDING_SIGNAL_IN_BACKTEST_FN = async (self, signal, averagePrice, c
         });
         return null;
     }
-    const pnl = toProfitLossDto(signal, averagePrice);
+    const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, averagePrice);
     self.params.logger.debug(`ClientStrategy backtest ${closeReason}`, {
         symbol: self.params.execution.context.symbol,
         signalId: signal.id,
         reason: closeReason,
         priceClose: averagePrice,
         closeTimestamp,
-        pnlPercentage: pnl.pnlPercentage,
+        pnlPercentage: publicSignal.pnl.pnlPercentage,
     });
     if (closeReason === "stop_loss") {
-        self.params.logger.warn(`ClientStrategy backtest: Signal closed with loss (stop_loss), PNL: ${pnl.pnlPercentage.toFixed(2)}%`);
+        self.params.logger.warn(`ClientStrategy backtest: Signal closed with loss (stop_loss), PNL: ${publicSignal.pnl.pnlPercentage.toFixed(2)}%`);
     }
-    if (closeReason === "time_expired" && pnl.pnlPercentage < 0) {
-        self.params.logger.warn(`ClientStrategy backtest: Signal closed with loss (time_expired), PNL: ${pnl.pnlPercentage.toFixed(2)}%`);
+    if (closeReason === "time_expired" && publicSignal.pnl.pnlPercentage < 0) {
+        self.params.logger.warn(`ClientStrategy backtest: Signal closed with loss (time_expired), PNL: ${publicSignal.pnl.pnlPercentage.toFixed(2)}%`);
     }
     await CALL_CLOSE_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, averagePrice, closeTimestamp, self.params.execution.context.backtest);
     // КРИТИЧНО: Очищаем состояние ClientPartial при закрытии позиции
@@ -6874,11 +6917,11 @@ const CLOSE_PENDING_SIGNAL_IN_BACKTEST_FN = async (self, signal, averagePrice, c
     await self.setPendingSignal(null);
     const result = {
         action: "closed",
-        signal: TO_PUBLIC_SIGNAL(signal, averagePrice),
+        signal: publicSignal,
         currentPrice: averagePrice,
         closeReason: closeReason,
         closeTimestamp: closeTimestamp,
-        pnl: pnl,
+        pnl: publicSignal.pnl,
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
         frameName: self.params.method.context.frameName,
@@ -6902,6 +6945,7 @@ const CLOSE_USER_PENDING_SIGNAL_IN_BACKTEST_FN = async (self, closedSignal, aver
             `Retry backtest() with new candle data.`);
     }
     self._closedSignal = null;
+    const publicSignal = TO_PUBLIC_SIGNAL("pending", closedSignal, averagePrice);
     await CALL_COMMIT_FN(self, {
         action: "close-pending",
         symbol: self.params.execution.context.symbol,
@@ -6915,21 +6959,23 @@ const CLOSE_USER_PENDING_SIGNAL_IN_BACKTEST_FN = async (self, closedSignal, aver
         totalEntries: closedSignal._entry?.length ?? 1,
         totalPartials: closedSignal._partial?.length ?? 0,
         originalPriceOpen: closedSignal.priceOpen,
-        pnl: toProfitLossDto(closedSignal, averagePrice),
+        pnl: publicSignal.pnl,
+        maxDrawdown: publicSignal.maxDrawdown,
+        peakProfit: publicSignal.peakProfit,
+        signal: publicSignal,
         note: closedSignal.closeNote ?? closedSignal.note,
     });
     await CALL_CLOSE_CALLBACKS_FN(self, self.params.execution.context.symbol, closedSignal, averagePrice, closeTimestamp, self.params.execution.context.backtest);
     await CALL_PARTIAL_CLEAR_FN(self, self.params.execution.context.symbol, closedSignal, averagePrice, closeTimestamp, self.params.execution.context.backtest);
     await CALL_BREAKEVEN_CLEAR_FN(self, self.params.execution.context.symbol, closedSignal, averagePrice, closeTimestamp, self.params.execution.context.backtest);
     await CALL_RISK_REMOVE_SIGNAL_FN(self, self.params.execution.context.symbol, closeTimestamp, self.params.execution.context.backtest);
-    const pnl = toProfitLossDto(closedSignal, averagePrice);
     const result = {
         action: "closed",
-        signal: TO_PUBLIC_SIGNAL(closedSignal, averagePrice),
+        signal: publicSignal,
         currentPrice: averagePrice,
         closeReason: "closed",
         closeTimestamp,
-        pnl,
+        pnl: publicSignal.pnl,
         strategyName: self.params.method.context.strategyName,
         exchangeName: self.params.method.context.exchangeName,
         frameName: self.params.method.context.frameName,
@@ -6994,8 +7040,8 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
                 ...activatedSignal,
                 pendingAt: candle.timestamp,
                 _isScheduled: false,
-                _peak: { price: activatedSignal.priceOpen, timestamp: candle.timestamp, pnlPercentage: 0, pnlCost: 0 },
-                _fall: { price: activatedSignal.priceOpen, timestamp: candle.timestamp, pnlPercentage: 0, pnlCost: 0 },
+                _peak: { price: activatedSignal.priceOpen, timestamp: candle.timestamp, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
+                _fall: { price: activatedSignal.priceOpen, timestamp: candle.timestamp, pnlPercentage: 0, pnlCost: 0, priceClose: 0, priceOpen: 0, pnlEntries: 0 },
             };
             // Sync open: if external system rejects — cancel scheduled signal instead of opening
             const syncOpenAllowed = await CALL_SIGNAL_SYNC_OPEN_FN(candle.timestamp, pendingSignal.priceOpen, pendingSignal, self);
@@ -7005,6 +7051,7 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
                     signalId: activatedSignal.id,
                 });
                 await self.setScheduledSignal(null);
+                const publicSignal = TO_PUBLIC_SIGNAL("scheduled", activatedSignal, averagePrice);
                 await CALL_COMMIT_FN(self, {
                     action: "cancel-scheduled",
                     symbol: self.params.execution.context.symbol,
@@ -7017,7 +7064,10 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
                     totalEntries: activatedSignal._entry?.length ?? 1,
                     totalPartials: activatedSignal._partial?.length ?? 0,
                     originalPriceOpen: activatedSignal.priceOpen,
-                    pnl: toProfitLossDto(activatedSignal, averagePrice),
+                    pnl: publicSignal.pnl,
+                    maxDrawdown: publicSignal.maxDrawdown,
+                    peakProfit: publicSignal.peakProfit,
+                    signal: publicSignal,
                     note: activatedSignal.activateNote ?? activatedSignal.note,
                 });
                 return { outcome: "pending" };
@@ -7026,7 +7076,7 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
             await self.setPendingSignal(pendingSignal);
             await CALL_RISK_ADD_SIGNAL_FN(self, self.params.execution.context.symbol, pendingSignal, candle.timestamp, self.params.execution.context.backtest);
             // Emit commit AFTER successful risk check
-            const publicSignalForCommit = TO_PUBLIC_SIGNAL(pendingSignal, averagePrice);
+            const publicSignalForCommit = TO_PUBLIC_SIGNAL("pending", pendingSignal, averagePrice);
             await CALL_COMMIT_FN(self, {
                 action: "activate-scheduled",
                 symbol: self.params.execution.context.symbol,
@@ -7038,7 +7088,10 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
                 activateId: activatedSignal.activateId,
                 timestamp: candle.timestamp,
                 currentPrice: averagePrice,
-                pnl: toProfitLossDto(pendingSignal, averagePrice),
+                pnl: publicSignalForCommit.pnl,
+                maxDrawdown: publicSignalForCommit.maxDrawdown,
+                peakProfit: publicSignalForCommit.peakProfit,
+                signal: publicSignalForCommit,
                 position: publicSignalForCommit.position,
                 priceOpen: publicSignalForCommit.priceOpen,
                 priceTakeProfit: publicSignalForCommit.priceTakeProfit,
@@ -7208,12 +7261,12 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles, frameEnd
                     const tpDistance = effectiveTakeProfit - effectivePriceOpen;
                     const progressPercent = (currentDistance / tpDistance) * 100;
                     if (averagePrice > signal._peak.price) {
-                        const { pnl } = TO_PUBLIC_SIGNAL(signal, averagePrice);
-                        signal._peak = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                        const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, averagePrice);
+                        signal._peak = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceOpen: pnl.priceOpen, priceClose: pnl.priceClose };
                         if (self.params.callbacks?.onWrite) {
                             self.params.callbacks.onWrite(signal.symbol, signal, true);
                         }
-                        await self.params.onHighestProfit(TO_PUBLIC_SIGNAL(signal, averagePrice), averagePrice, currentCandleTimestamp);
+                        await self.params.onHighestProfit(TO_PUBLIC_SIGNAL("pending", signal, averagePrice), averagePrice, currentCandleTimestamp);
                     }
                     await CALL_PARTIAL_PROFIT_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), currentCandleTimestamp, self.params.execution.context.backtest);
                 }
@@ -7223,12 +7276,12 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles, frameEnd
                     const slDistance = effectivePriceOpen - effectiveStopLoss;
                     const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
                     if (averagePrice < signal._fall.price) {
-                        const { pnl } = TO_PUBLIC_SIGNAL(signal, averagePrice);
-                        signal._fall = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                        const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, averagePrice);
+                        signal._fall = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceOpen: pnl.priceOpen, priceClose: pnl.priceClose };
                         if (self.params.callbacks?.onWrite) {
                             self.params.callbacks.onWrite(signal.symbol, signal, true);
                         }
-                        await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL(signal, averagePrice), averagePrice, currentCandleTimestamp);
+                        await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL("pending", signal, averagePrice), averagePrice, currentCandleTimestamp);
                     }
                     await CALL_PARTIAL_LOSS_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), currentCandleTimestamp, self.params.execution.context.backtest);
                 }
@@ -7246,12 +7299,12 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles, frameEnd
                     const tpDistance = effectivePriceOpen - effectiveTakeProfit;
                     const progressPercent = (currentDistance / tpDistance) * 100;
                     if (averagePrice < signal._peak.price) {
-                        const { pnl } = TO_PUBLIC_SIGNAL(signal, averagePrice);
-                        signal._peak = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                        const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, averagePrice);
+                        signal._peak = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceOpen: pnl.priceOpen, priceClose: pnl.priceClose };
                         if (self.params.callbacks?.onWrite) {
                             self.params.callbacks.onWrite(signal.symbol, signal, true);
                         }
-                        await self.params.onHighestProfit(TO_PUBLIC_SIGNAL(signal, averagePrice), averagePrice, currentCandleTimestamp);
+                        await self.params.onHighestProfit(TO_PUBLIC_SIGNAL("pending", signal, averagePrice), averagePrice, currentCandleTimestamp);
                     }
                     await CALL_PARTIAL_PROFIT_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), currentCandleTimestamp, self.params.execution.context.backtest);
                 }
@@ -7261,12 +7314,12 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles, frameEnd
                     const slDistance = effectiveStopLoss - effectivePriceOpen;
                     const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
                     if (averagePrice > signal._fall.price) {
-                        const { pnl } = TO_PUBLIC_SIGNAL(signal, averagePrice);
-                        signal._fall = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage };
+                        const { pnl } = TO_PUBLIC_SIGNAL("pending", signal, averagePrice);
+                        signal._fall = { price: averagePrice, timestamp: currentCandleTimestamp, pnlCost: pnl.pnlCost, pnlPercentage: pnl.pnlPercentage, pnlEntries: pnl.pnlEntries, priceOpen: pnl.priceOpen, priceClose: pnl.priceClose };
                         if (self.params.callbacks?.onWrite) {
                             self.params.callbacks.onWrite(signal.symbol, signal, true);
                         }
-                        await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL(signal, averagePrice), averagePrice, currentCandleTimestamp);
+                        await self.params.onMaxDrawdown(TO_PUBLIC_SIGNAL("pending", signal, averagePrice), averagePrice, currentCandleTimestamp);
                     }
                     await CALL_PARTIAL_LOSS_CALLBACKS_FN(self, self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), currentCandleTimestamp, self.params.execution.context.backtest);
                 }
@@ -7280,9 +7333,10 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles, frameEnd
     const lastPrice = GET_AVG_PRICE_FN(lastCandles);
     const closeTimestamp = lastCandles[lastCandles.length - 1].timestamp;
     if (signal.minuteEstimatedTime === Infinity) {
+        const publicSignal = TO_PUBLIC_SIGNAL("pending", signal, lastPrice);
         const result = {
             action: "active",
-            signal: TO_PUBLIC_SIGNAL(signal, lastPrice),
+            signal: publicSignal,
             currentPrice: lastPrice,
             strategyName: self.params.method.context.strategyName,
             exchangeName: self.params.method.context.exchangeName,
@@ -7290,7 +7344,7 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles, frameEnd
             symbol: self.params.execution.context.symbol,
             percentTp: 0,
             percentSl: 0,
-            pnl: toProfitLossDto(signal, lastPrice),
+            pnl: publicSignal.pnl,
             backtest: self.params.execution.context.backtest,
             createdAt: closeTimestamp,
             _backtestLastTimestamp: closeTimestamp,
@@ -7473,7 +7527,7 @@ class ClientStrategy {
         this.params.logger.debug("ClientStrategy getPendingSignal", {
             symbol,
         });
-        return this._pendingSignal ? TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice) : null;
+        return this._pendingSignal ? TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice) : null;
     }
     /**
      * Retrieves the current scheduled signal.
@@ -7484,7 +7538,7 @@ class ClientStrategy {
         this.params.logger.debug("ClientStrategy getScheduledSignal", {
             symbol,
         });
-        return this._scheduledSignal ? TO_PUBLIC_SIGNAL(this._scheduledSignal, currentPrice) : null;
+        return this._scheduledSignal ? TO_PUBLIC_SIGNAL("scheduled", this._scheduledSignal, currentPrice) : null;
     }
     /**
      * Checks if breakeven threshold has been reached for the current pending signal.
@@ -8293,6 +8347,7 @@ class ClientStrategy {
                 signalId: cancelledSignal.id,
             });
             // Emit commit with correct timestamp from tick context
+            const publicSignal = TO_PUBLIC_SIGNAL("scheduled", cancelledSignal, currentPrice);
             await CALL_COMMIT_FN(this, {
                 action: "cancel-scheduled",
                 symbol: this.params.execution.context.symbol,
@@ -8306,14 +8361,17 @@ class ClientStrategy {
                 totalEntries: cancelledSignal._entry?.length ?? 1,
                 totalPartials: cancelledSignal._partial?.length ?? 0,
                 originalPriceOpen: cancelledSignal.priceOpen,
-                pnl: toProfitLossDto(cancelledSignal, currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 note: cancelledSignal.cancelNote ?? cancelledSignal.note,
             });
             // Call onCancel callback
             await CALL_CANCEL_CALLBACKS_FN(this, this.params.execution.context.symbol, cancelledSignal, currentPrice, currentTime, this.params.execution.context.backtest);
             const result = {
                 action: "cancelled",
-                signal: TO_PUBLIC_SIGNAL(cancelledSignal, currentPrice),
+                signal: publicSignal,
                 currentPrice,
                 closeTimestamp: currentTime,
                 strategyName: this.params.method.context.strategyName,
@@ -8347,6 +8405,7 @@ class ClientStrategy {
                 signalId: closedSignal.id,
             });
             // Emit commit with correct timestamp from tick context
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", closedSignal, currentPrice);
             await CALL_COMMIT_FN(this, {
                 action: "close-pending",
                 symbol: this.params.execution.context.symbol,
@@ -8360,7 +8419,10 @@ class ClientStrategy {
                 totalEntries: closedSignal._entry?.length ?? 1,
                 totalPartials: closedSignal._partial?.length ?? 0,
                 originalPriceOpen: closedSignal.priceOpen,
-                pnl: toProfitLossDto(closedSignal, currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 note: closedSignal.closeNote ?? closedSignal.note,
             });
             // Call onClose callback
@@ -8370,14 +8432,13 @@ class ClientStrategy {
             // КРИТИЧНО: Очищаем состояние ClientBreakeven при закрытии позиции
             await CALL_BREAKEVEN_CLEAR_FN(this, this.params.execution.context.symbol, closedSignal, currentPrice, currentTime, this.params.execution.context.backtest);
             await CALL_RISK_REMOVE_SIGNAL_FN(this, this.params.execution.context.symbol, currentTime, this.params.execution.context.backtest);
-            const pnl = toProfitLossDto(closedSignal, currentPrice);
             const result = {
                 action: "closed",
-                signal: TO_PUBLIC_SIGNAL(closedSignal, currentPrice),
+                signal: publicSignal,
                 currentPrice,
                 closeReason: "closed",
                 closeTimestamp: currentTime,
-                pnl,
+                pnl: publicSignal.pnl,
                 strategyName: this.params.method.context.strategyName,
                 exchangeName: this.params.method.context.exchangeName,
                 frameName: this.params.method.context.frameName,
@@ -8420,8 +8481,8 @@ class ClientStrategy {
                 ...activatedSignal,
                 pendingAt: currentTime,
                 _isScheduled: false,
-                _peak: { price: activatedSignal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
-                _fall: { price: activatedSignal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0 },
+                _peak: { price: activatedSignal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, pnlEntries: 0, priceOpen: 0 },
+                _fall: { price: activatedSignal.priceOpen, timestamp: currentTime, pnlPercentage: 0, pnlCost: 0, priceClose: 0, pnlEntries: 0, priceOpen: 0 },
             };
             const syncOpenAllowed = await CALL_SIGNAL_SYNC_OPEN_FN(currentTime, currentPrice, pendingSignal, this);
             if (!syncOpenAllowed) {
@@ -8430,6 +8491,7 @@ class ClientStrategy {
                     signalId: activatedSignal.id,
                 });
                 await this.setScheduledSignal(null);
+                const publicSignal = TO_PUBLIC_SIGNAL("scheduled", activatedSignal, currentPrice);
                 await CALL_COMMIT_FN(this, {
                     action: "cancel-scheduled",
                     symbol: this.params.execution.context.symbol,
@@ -8442,7 +8504,10 @@ class ClientStrategy {
                     totalEntries: activatedSignal._entry?.length ?? 1,
                     totalPartials: activatedSignal._partial?.length ?? 0,
                     originalPriceOpen: activatedSignal.priceOpen,
-                    pnl: toProfitLossDto(activatedSignal, currentPrice),
+                    pnl: publicSignal.pnl,
+                    maxDrawdown: publicSignal.maxDrawdown,
+                    peakProfit: publicSignal.peakProfit,
+                    signal: publicSignal,
                     note: activatedSignal.activateNote ?? activatedSignal.note,
                 });
                 return await RETURN_IDLE_FN(this, currentPrice);
@@ -8450,7 +8515,7 @@ class ClientStrategy {
             await this.setPendingSignal(pendingSignal);
             await CALL_RISK_ADD_SIGNAL_FN(this, this.params.execution.context.symbol, pendingSignal, currentTime, this.params.execution.context.backtest);
             // Emit commit AFTER successful risk check
-            const publicSignalForCommit = TO_PUBLIC_SIGNAL(pendingSignal, currentPrice);
+            const publicSignalForCommit = TO_PUBLIC_SIGNAL("pending", pendingSignal, currentPrice);
             await CALL_COMMIT_FN(this, {
                 action: "activate-scheduled",
                 symbol: this.params.execution.context.symbol,
@@ -8462,7 +8527,10 @@ class ClientStrategy {
                 activateId: activatedSignal.activateId,
                 timestamp: currentTime,
                 currentPrice,
-                pnl: toProfitLossDto(pendingSignal, currentPrice),
+                pnl: publicSignalForCommit.pnl,
+                maxDrawdown: publicSignalForCommit.maxDrawdown,
+                peakProfit: publicSignalForCommit.peakProfit,
+                signal: publicSignalForCommit,
                 position: publicSignalForCommit.position,
                 priceOpen: publicSignalForCommit.priceOpen,
                 priceTakeProfit: publicSignalForCommit.priceTakeProfit,
@@ -8480,7 +8548,7 @@ class ClientStrategy {
             await CALL_OPEN_CALLBACKS_FN(this, this.params.execution.context.symbol, pendingSignal, currentPrice, currentTime, this.params.execution.context.backtest);
             const result = {
                 action: "opened",
-                signal: TO_PUBLIC_SIGNAL(pendingSignal, currentPrice),
+                signal: publicSignalForCommit,
                 strategyName: this.params.method.context.strategyName,
                 exchangeName: this.params.method.context.exchangeName,
                 frameName: this.params.method.context.frameName,
@@ -8596,6 +8664,7 @@ class ClientStrategy {
             this._cancelledSignal = null; // Clear after using
             const closeTimestamp = this.params.execution.context.when.getTime();
             // Emit commit with correct timestamp from backtest context
+            const publicSignal = TO_PUBLIC_SIGNAL("scheduled", cancelledSignal, currentPrice);
             await CALL_COMMIT_FN(this, {
                 action: "cancel-scheduled",
                 symbol: this.params.execution.context.symbol,
@@ -8609,13 +8678,16 @@ class ClientStrategy {
                 totalEntries: cancelledSignal._entry?.length ?? 1,
                 totalPartials: cancelledSignal._partial?.length ?? 0,
                 originalPriceOpen: cancelledSignal.priceOpen,
-                pnl: toProfitLossDto(cancelledSignal, currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 note: cancelledSignal.cancelNote ?? cancelledSignal.note,
             });
             await CALL_CANCEL_CALLBACKS_FN(this, this.params.execution.context.symbol, cancelledSignal, currentPrice, closeTimestamp, this.params.execution.context.backtest);
             const cancelledResult = {
                 action: "cancelled",
-                signal: TO_PUBLIC_SIGNAL(cancelledSignal, currentPrice),
+                signal: publicSignal,
                 currentPrice,
                 closeTimestamp: closeTimestamp,
                 strategyName: this.params.method.context.strategyName,
@@ -8651,6 +8723,7 @@ class ClientStrategy {
             }
             this._closedSignal = null; // Clear only after sync confirmed
             // Emit commit with correct timestamp from backtest context
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", closedSignal, currentPrice);
             await CALL_COMMIT_FN(this, {
                 action: "close-pending",
                 symbol: this.params.execution.context.symbol,
@@ -8664,7 +8737,10 @@ class ClientStrategy {
                 totalEntries: closedSignal._entry?.length ?? 1,
                 totalPartials: closedSignal._partial?.length ?? 0,
                 originalPriceOpen: closedSignal.priceOpen,
-                pnl: toProfitLossDto(closedSignal, currentPrice),
+                pnl: publicSignal.pnl,
+                maxDrawdown: publicSignal.maxDrawdown,
+                peakProfit: publicSignal.peakProfit,
+                signal: publicSignal,
                 note: closedSignal.closeNote ?? closedSignal.note,
             });
             await CALL_CLOSE_CALLBACKS_FN(this, this.params.execution.context.symbol, closedSignal, currentPrice, closeTimestamp, this.params.execution.context.backtest);
@@ -8673,14 +8749,13 @@ class ClientStrategy {
             // КРИТИЧНО: Очищаем состояние ClientBreakeven при закрытии позиции
             await CALL_BREAKEVEN_CLEAR_FN(this, this.params.execution.context.symbol, closedSignal, currentPrice, closeTimestamp, this.params.execution.context.backtest);
             await CALL_RISK_REMOVE_SIGNAL_FN(this, this.params.execution.context.symbol, closeTimestamp, this.params.execution.context.backtest);
-            const pnl = toProfitLossDto(closedSignal, currentPrice);
             const closedResult = {
                 action: "closed",
-                signal: TO_PUBLIC_SIGNAL(closedSignal, currentPrice),
+                signal: publicSignal,
                 currentPrice,
                 closeReason: "closed",
                 closeTimestamp: closeTimestamp,
-                pnl,
+                pnl: publicSignal.pnl,
                 strategyName: this.params.method.context.strategyName,
                 exchangeName: this.params.method.context.exchangeName,
                 frameName: this.params.method.context.frameName,
@@ -9136,7 +9211,7 @@ class ClientStrategy {
         });
         // Call onWrite callback for testing persist storage
         if (this.params.callbacks?.onWrite) {
-            this.params.callbacks.onWrite(this.params.execution.context.symbol, TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice), backtest);
+            this.params.callbacks.onWrite(this.params.execution.context.symbol, TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice), backtest);
         }
         if (!backtest) {
             await PersistSignalAdapter.writeSignalData(this._pendingSignal, this.params.execution.context.symbol, this.params.strategyName, this.params.exchangeName);
@@ -9319,7 +9394,7 @@ class ClientStrategy {
         });
         // Call onWrite callback for testing persist storage
         if (this.params.callbacks?.onWrite) {
-            this.params.callbacks.onWrite(this.params.execution.context.symbol, TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice), backtest);
+            this.params.callbacks.onWrite(this.params.execution.context.symbol, TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice), backtest);
         }
         if (!backtest) {
             await PersistSignalAdapter.writeSignalData(this._pendingSignal, this.params.execution.context.symbol, this.params.strategyName, this.params.exchangeName);
@@ -9517,7 +9592,7 @@ class ClientStrategy {
         });
         // Call onWrite callback for testing persist storage
         if (this.params.callbacks?.onWrite) {
-            const publicSignal = TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice);
             this.params.callbacks.onWrite(this.params.execution.context.symbol, publicSignal, backtest);
         }
         if (!backtest) {
@@ -9766,7 +9841,7 @@ class ClientStrategy {
         });
         // Call onWrite callback for testing persist storage
         if (this.params.callbacks?.onWrite) {
-            const publicSignal = TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice);
             this.params.callbacks.onWrite(this.params.execution.context.symbol, publicSignal, backtest);
         }
         if (!backtest) {
@@ -10002,7 +10077,7 @@ class ClientStrategy {
         });
         // Call onWrite callback for testing persist storage
         if (this.params.callbacks?.onWrite) {
-            const publicSignal = TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice);
+            const publicSignal = TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice);
             this.params.callbacks.onWrite(this.params.execution.context.symbol, publicSignal, backtest);
         }
         if (!backtest) {
@@ -10094,7 +10169,7 @@ class ClientStrategy {
         });
         // Call onWrite callback for testing persist storage
         if (this.params.callbacks?.onWrite) {
-            this.params.callbacks.onWrite(this.params.execution.context.symbol, TO_PUBLIC_SIGNAL(this._pendingSignal, currentPrice), backtest);
+            this.params.callbacks.onWrite(this.params.execution.context.symbol, TO_PUBLIC_SIGNAL("pending", this._pendingSignal, currentPrice), backtest);
         }
         if (!backtest) {
             await PersistSignalAdapter.writeSignalData(this._pendingSignal, this.params.execution.context.symbol, this.params.strategyName, this.params.exchangeName);
@@ -12465,12 +12540,15 @@ const alignToInterval = (date, interval) => {
 
 /** Symbol indicating that positions need to be fetched from persistence */
 const POSITION_NEED_FETCH = Symbol("risk-need-fetch");
+/** Get timestamp from execution context or fallback to aligned current time */
 const GET_CONTEXT_TIMESTAMP_FN = (self) => {
     if (ExecutionContextService.hasContext()) {
         return self.params.execution.context.when.getTime();
     }
     return alignToInterval(new Date(), "1m").getTime();
 };
+/** Zero PNL constant for scheduled signals (which don't have priceOpen or PNL yet) */
+const ZERO_PNL = { pnlPercentage: 0, priceOpen: 0, priceClose: 0, pnlCost: 0, pnlEntries: 0 };
 /**
  * Converts signal to risk validation format.
  *
@@ -12513,6 +12591,9 @@ const TO_RISK_SIGNAL = (signal, currentPrice, timestamp) => {
     const partialExecuted = ("_partial" in signal && Array.isArray(signal._partial))
         ? signal._partial.reduce((sum, partial) => sum + partial.percent, 0)
         : 0;
+    const pnl = signal._isScheduled ? ZERO_PNL : toProfitLossDto(signal, currentPrice);
+    const maxDrawdown = signal._isScheduled ? ZERO_PNL : pnl;
+    const peakProfit = signal._isScheduled ? ZERO_PNL : pnl;
     return {
         ...structuredClone(signal),
         cost: signal.cost || GLOBAL_CONFIG.CC_POSITION_ENTRY_COST,
@@ -12526,7 +12607,9 @@ const TO_RISK_SIGNAL = (signal, currentPrice, timestamp) => {
         originalPriceTakeProfit: signal.priceTakeProfit,
         originalPriceOpen: signal.priceOpen ?? currentPrice,
         partialExecuted,
-        pnl: toProfitLossDto(signal, currentPrice),
+        pnl,
+        maxDrawdown,
+        peakProfit,
     };
 };
 /** Key generator for active position map */
@@ -18796,7 +18879,9 @@ const backtest_columns = [
         key: "peakPnl",
         label: "Peak PNL",
         format: (data) => {
-            const v = data.signal._peak?.pnlPercentage;
+            const v = data.signal.peakProfit?.pnlPercentage;
+            if (v === undefined)
+                return "N/A";
             return `${v > 0 ? "+" : ""}${v.toFixed(2)}%`;
         },
         isVisible: () => true,
@@ -18804,7 +18889,12 @@ const backtest_columns = [
     {
         key: "fallPnl",
         label: "Max DD PNL",
-        format: (data) => `${data.signal._fall?.pnlPercentage.toFixed(2)}%`,
+        format: (data) => {
+            const v = data.signal.maxDrawdown?.pnlPercentage;
+            if (v === undefined)
+                return "N/A";
+            return `${v.toFixed(2)}%`;
+        },
         isVisible: () => true,
     },
 ];
@@ -21365,8 +21455,8 @@ let ReportStorage$a = class ReportStorage {
         const tradesPerYear = avgDurationDays > 0 ? 365 / avgDurationDays : 0;
         const expectedYearlyReturns = avgPnl * tradesPerYear;
         // Calculate average peak and fall PNL across all signals
-        const avgPeakPnl = this._signalList.reduce((sum, s) => sum + (s.signal._peak?.pnlPercentage ?? 0), 0) / totalSignals;
-        const avgFallPnl = this._signalList.reduce((sum, s) => sum + (s.signal._fall?.pnlPercentage ?? 0), 0) / totalSignals;
+        const avgPeakPnl = this._signalList.reduce((sum, s) => sum + (s.signal.peakProfit?.pnlPercentage ?? 0), 0) / totalSignals;
+        const avgFallPnl = this._signalList.reduce((sum, s) => sum + (s.signal.maxDrawdown?.pnlPercentage ?? 0), 0) / totalSignals;
         return {
             signalList: this._signalList,
             totalSignals,
@@ -21895,8 +21985,8 @@ let ReportStorage$9 = class ReportStorage {
             duration: durationMin,
             pendingAt: data.signal.pendingAt,
             scheduledAt: data.signal.scheduledAt,
-            peakPnl: data.signal._peak?.pnlPercentage,
-            fallPnl: data.signal._fall?.pnlPercentage,
+            peakPnl: data.signal.peakProfit?.pnlPercentage,
+            fallPnl: data.signal.maxDrawdown?.pnlPercentage,
         };
         this._eventList.unshift(newEvent);
         // Trim queue if exceeded GLOBAL_CONFIG.CC_MAX_LIVE_MARKDOWN_ROWS
@@ -24047,8 +24137,8 @@ class HeatmapStorage {
         let avgPeakPnl = null;
         let avgFallPnl = null;
         if (signals.length > 0) {
-            avgPeakPnl = signals.reduce((acc, s) => acc + (s.signal._peak?.pnlPercentage ?? 0), 0) / signals.length;
-            avgFallPnl = signals.reduce((acc, s) => acc + (s.signal._fall?.pnlPercentage ?? 0), 0) / signals.length;
+            avgPeakPnl = signals.reduce((acc, s) => acc + (s.signal.peakProfit?.pnlPercentage ?? 0), 0) / signals.length;
+            avgFallPnl = signals.reduce((acc, s) => acc + (s.signal.maxDrawdown?.pnlPercentage ?? 0), 0) / signals.length;
         }
         // Apply safe math checks
         if (isUnsafe(winRate))
@@ -28175,8 +28265,16 @@ class BacktestReportService {
                     pnlPriceClose: data.pnl.priceClose,
                     totalPartials: data.signal?.totalPartials,
                     cost: data.signal?.cost,
-                    peakPnl: data.signal?._peak?.pnlPercentage,
-                    fallPnl: data.signal?._fall?.pnlPercentage,
+                    peakProfitPriceOpen: data.signal?.peakProfit?.priceOpen,
+                    peakProfitPriceClose: data.signal?.peakProfit?.priceClose,
+                    peakProfitPercentage: data.signal?.peakProfit?.pnlPercentage,
+                    peakProfitCost: data.signal?.peakProfit?.pnlCost,
+                    peakProfitEntries: data.signal?.peakProfit?.pnlEntries,
+                    maxDrawdownPriceOpen: data.signal?.maxDrawdown?.priceOpen,
+                    maxDrawdownPriceClose: data.signal?.maxDrawdown?.priceClose,
+                    maxDrawdownPercentage: data.signal?.maxDrawdown?.pnlPercentage,
+                    maxDrawdownCost: data.signal?.maxDrawdown?.pnlCost,
+                    maxDrawdownEntries: data.signal?.maxDrawdown?.pnlEntries,
                 }, { ...searchOptions, signalId: data.signal?.id });
             }
             else if (data.action === "closed") {
@@ -28209,8 +28307,16 @@ class BacktestReportService {
                     closeReason: data.closeReason,
                     closeTime: data.closeTimestamp,
                     duration: durationMin,
-                    peakPnl: data.signal?._peak?.pnlPercentage,
-                    fallPnl: data.signal?._fall?.pnlPercentage,
+                    peakProfitPriceOpen: data.signal?.peakProfit?.priceOpen,
+                    peakProfitPriceClose: data.signal?.peakProfit?.priceClose,
+                    peakProfitPercentage: data.signal?.peakProfit?.pnlPercentage,
+                    peakProfitCost: data.signal?.peakProfit?.pnlCost,
+                    peakProfitEntries: data.signal?.peakProfit?.pnlEntries,
+                    maxDrawdownPriceOpen: data.signal?.maxDrawdown?.priceOpen,
+                    maxDrawdownPriceClose: data.signal?.maxDrawdown?.priceClose,
+                    maxDrawdownPercentage: data.signal?.maxDrawdown?.pnlPercentage,
+                    maxDrawdownCost: data.signal?.maxDrawdown?.pnlCost,
+                    maxDrawdownEntries: data.signal?.maxDrawdown?.pnlEntries,
                 }, { ...searchOptions, signalId: data.signal?.id });
             }
         };
@@ -28373,8 +28479,16 @@ class LiveReportService {
                     pnlPriceClose: data.pnl.priceClose,
                     totalPartials: data.signal?.totalPartials,
                     cost: data.signal?.cost,
-                    peakPnl: data.signal?._peak?.pnlPercentage,
-                    fallPnl: data.signal?._fall?.pnlPercentage,
+                    peakProfitPriceOpen: data.signal?.peakProfit?.priceOpen,
+                    peakProfitPriceClose: data.signal?.peakProfit?.priceClose,
+                    peakProfitPercentage: data.signal?.peakProfit?.pnlPercentage,
+                    peakProfitCost: data.signal?.peakProfit?.pnlCost,
+                    peakProfitEntries: data.signal?.peakProfit?.pnlEntries,
+                    maxDrawdownPriceOpen: data.signal?.maxDrawdown?.priceOpen,
+                    maxDrawdownPriceClose: data.signal?.maxDrawdown?.priceClose,
+                    maxDrawdownPercentage: data.signal?.maxDrawdown?.pnlPercentage,
+                    maxDrawdownCost: data.signal?.maxDrawdown?.pnlCost,
+                    maxDrawdownEntries: data.signal?.maxDrawdown?.pnlEntries,
                 }, { ...searchOptions, signalId: data.signal?.id });
             }
             else if (data.action === "opened") {
@@ -28425,8 +28539,16 @@ class LiveReportService {
                     pnlPriceClose: data.pnl.priceClose,
                     totalPartials: data.signal?.totalPartials,
                     cost: data.signal?.cost,
-                    peakPnl: data.signal?._peak?.pnlPercentage,
-                    fallPnl: data.signal?._fall?.pnlPercentage,
+                    peakProfitPriceOpen: data.signal?.peakProfit?.priceOpen,
+                    peakProfitPriceClose: data.signal?.peakProfit?.priceClose,
+                    peakProfitPercentage: data.signal?.peakProfit?.pnlPercentage,
+                    peakProfitCost: data.signal?.peakProfit?.pnlCost,
+                    peakProfitEntries: data.signal?.peakProfit?.pnlEntries,
+                    maxDrawdownPriceOpen: data.signal?.maxDrawdown?.priceOpen,
+                    maxDrawdownPriceClose: data.signal?.maxDrawdown?.priceClose,
+                    maxDrawdownPercentage: data.signal?.maxDrawdown?.pnlPercentage,
+                    maxDrawdownCost: data.signal?.maxDrawdown?.pnlCost,
+                    maxDrawdownEntries: data.signal?.maxDrawdown?.pnlEntries,
                 }, { ...searchOptions, signalId: data.signal?.id });
             }
             else if (data.action === "closed") {
@@ -28459,8 +28581,16 @@ class LiveReportService {
                     closeReason: data.closeReason,
                     duration: durationMin,
                     closeTime: data.closeTimestamp,
-                    peakPnl: data.signal?._peak?.pnlPercentage,
-                    fallPnl: data.signal?._fall?.pnlPercentage,
+                    peakProfitPriceOpen: data.signal?.peakProfit?.priceOpen,
+                    peakProfitPriceClose: data.signal?.peakProfit?.priceClose,
+                    peakProfitPercentage: data.signal?.peakProfit?.pnlPercentage,
+                    peakProfitCost: data.signal?.peakProfit?.pnlCost,
+                    peakProfitEntries: data.signal?.peakProfit?.pnlEntries,
+                    maxDrawdownPriceOpen: data.signal?.maxDrawdown?.priceOpen,
+                    maxDrawdownPriceClose: data.signal?.maxDrawdown?.priceClose,
+                    maxDrawdownPercentage: data.signal?.maxDrawdown?.pnlPercentage,
+                    maxDrawdownCost: data.signal?.maxDrawdown?.pnlCost,
+                    maxDrawdownEntries: data.signal?.maxDrawdown?.pnlEntries,
                 }, { ...searchOptions, signalId: data.signal?.id });
             }
             else if (data.action === "cancelled") {
@@ -29052,8 +29182,16 @@ class HeatReportService {
                 openTime: data.signal?.pendingAt,
                 scheduledAt: data.signal?.scheduledAt,
                 closeTime: data.closeTimestamp,
-                peakPnl: data.signal?._peak?.pnlPercentage,
-                fallPnl: data.signal?._fall?.pnlPercentage,
+                peakProfitPriceOpen: data.signal?.peakProfit?.priceOpen,
+                peakProfitPriceClose: data.signal?.peakProfit?.priceClose,
+                peakProfitPercentage: data.signal?.peakProfit?.pnlPercentage,
+                peakProfitCost: data.signal?.peakProfit?.pnlCost,
+                peakProfitEntries: data.signal?.peakProfit?.pnlEntries,
+                maxDrawdownPriceOpen: data.signal?.maxDrawdown?.priceOpen,
+                maxDrawdownPriceClose: data.signal?.maxDrawdown?.priceClose,
+                maxDrawdownPercentage: data.signal?.maxDrawdown?.pnlPercentage,
+                maxDrawdownCost: data.signal?.maxDrawdown?.pnlCost,
+                maxDrawdownEntries: data.signal?.maxDrawdown?.pnlEntries,
             }, {
                 symbol: data.symbol,
                 strategyName: data.strategyName,
@@ -29187,6 +29325,16 @@ class PartialReportService {
                 pnlEntries: data.data.pnl.pnlEntries,
                 pnlPriceOpen: data.data.pnl.priceOpen,
                 pnlPriceClose: data.data.pnl.priceClose,
+                peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+                peakProfitCost: data.data.peakProfit.pnlCost,
+                peakProfitEntries: data.data.peakProfit.pnlEntries,
+                peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+                peakProfitPriceClose: data.data.peakProfit.priceClose,
+                maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+                maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+                maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
             }, {
                 symbol: data.symbol,
                 strategyName: data.data.strategyName,
@@ -29237,6 +29385,16 @@ class PartialReportService {
                 pnlEntries: data.data.pnl.pnlEntries,
                 pnlPriceOpen: data.data.pnl.priceOpen,
                 pnlPriceClose: data.data.pnl.priceClose,
+                peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+                peakProfitCost: data.data.peakProfit.pnlCost,
+                peakProfitEntries: data.data.peakProfit.pnlEntries,
+                peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+                peakProfitPriceClose: data.data.peakProfit.priceClose,
+                maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+                maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+                maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
             }, {
                 symbol: data.symbol,
                 strategyName: data.data.strategyName,
@@ -29368,6 +29526,16 @@ class BreakevenReportService {
                 pnlEntries: data.data.pnl.pnlEntries,
                 pnlPriceOpen: data.data.pnl.priceOpen,
                 pnlPriceClose: data.data.pnl.priceClose,
+                peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+                peakProfitCost: data.data.peakProfit.pnlCost,
+                peakProfitEntries: data.data.peakProfit.pnlEntries,
+                peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+                peakProfitPriceClose: data.data.peakProfit.priceClose,
+                maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+                maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+                maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
             }, {
                 symbol: data.symbol,
                 strategyName: data.data.strategyName,
@@ -29498,6 +29666,16 @@ class RiskReportService {
                 pnlEntries: data.currentSignal?.pnl?.pnlEntries,
                 pnlPriceOpen: data.currentSignal?.pnl?.priceOpen,
                 pnlPriceClose: data.currentSignal?.pnl?.priceClose,
+                peakProfitPercentage: data.currentSignal?.peakProfit?.pnlPercentage,
+                peakProfitCost: data.currentSignal?.peakProfit?.pnlCost,
+                peakProfitEntries: data.currentSignal?.peakProfit?.pnlEntries,
+                peakProfitPriceOpen: data.currentSignal?.peakProfit?.priceOpen,
+                peakProfitPriceClose: data.currentSignal?.peakProfit?.priceClose,
+                maxDrawdownPercentage: data.currentSignal?.maxDrawdown?.pnlPercentage,
+                maxDrawdownCost: data.currentSignal?.maxDrawdown?.pnlCost,
+                maxDrawdownEntries: data.currentSignal?.maxDrawdown?.pnlEntries,
+                maxDrawdownPriceOpen: data.currentSignal?.maxDrawdown?.priceOpen,
+                maxDrawdownPriceClose: data.currentSignal?.maxDrawdown?.priceClose,
             }, {
                 symbol: data.symbol,
                 strategyName: data.strategyName,
@@ -29577,7 +29755,7 @@ class StrategyReportService {
         /**
          * Logs a cancel-scheduled event when a scheduled signal is cancelled.
          */
-        this.cancelScheduled = async (symbol, isBacktest, context, timestamp, signalId, pnl, totalPartials, cancelId, note) => {
+        this.cancelScheduled = async (symbol, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, cancelId, note) => {
             this.loggerService.log("strategyReportService cancelScheduled", {
                 symbol,
                 isBacktest,
@@ -29599,6 +29777,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29612,7 +29800,7 @@ class StrategyReportService {
         /**
          * Logs a close-pending event when a pending signal is closed.
          */
-        this.closePending = async (symbol, isBacktest, context, timestamp, signalId, pnl, totalPartials, closeId, note) => {
+        this.closePending = async (symbol, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, closeId, note) => {
             this.loggerService.log("strategyReportService closePending", {
                 symbol,
                 isBacktest,
@@ -29634,6 +29822,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29647,7 +29845,7 @@ class StrategyReportService {
         /**
          * Logs a partial-profit event when a portion of the position is closed at profit.
          */
-        this.partialProfit = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, signalId, pnl, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
+        this.partialProfit = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
             this.loggerService.log("strategyReportService partialProfit", {
                 symbol,
                 percentToClose,
@@ -29680,6 +29878,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29693,7 +29901,7 @@ class StrategyReportService {
         /**
          * Logs a partial-loss event when a portion of the position is closed at loss.
          */
-        this.partialLoss = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, signalId, pnl, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
+        this.partialLoss = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
             this.loggerService.log("strategyReportService partialLoss", {
                 symbol,
                 percentToClose,
@@ -29726,6 +29934,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29739,7 +29957,7 @@ class StrategyReportService {
         /**
          * Logs a trailing-stop event when the stop-loss is adjusted.
          */
-        this.trailingStop = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, signalId, pnl, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
+        this.trailingStop = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
             this.loggerService.log("strategyReportService trailingStop", {
                 symbol,
                 percentShift,
@@ -29772,6 +29990,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29785,7 +30013,7 @@ class StrategyReportService {
         /**
          * Logs a trailing-take event when the take-profit is adjusted.
          */
-        this.trailingTake = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, signalId, pnl, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
+        this.trailingTake = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
             this.loggerService.log("strategyReportService trailingTake", {
                 symbol,
                 percentShift,
@@ -29818,6 +30046,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29831,7 +30069,7 @@ class StrategyReportService {
         /**
          * Logs a breakeven event when the stop-loss is moved to entry price.
          */
-        this.breakeven = async (symbol, currentPrice, isBacktest, context, timestamp, signalId, pnl, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
+        this.breakeven = async (symbol, currentPrice, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen) => {
             this.loggerService.log("strategyReportService breakeven", {
                 symbol,
                 currentPrice,
@@ -29862,6 +30100,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29875,7 +30123,7 @@ class StrategyReportService {
         /**
          * Logs an activate-scheduled event when a scheduled signal is activated early.
          */
-        this.activateScheduled = async (symbol, currentPrice, isBacktest, context, timestamp, signalId, pnl, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen, activateId, note) => {
+        this.activateScheduled = async (symbol, currentPrice, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, totalEntries, originalPriceOpen, activateId, note) => {
             this.loggerService.log("strategyReportService activateScheduled", {
                 symbol,
                 currentPrice,
@@ -29909,6 +30157,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
             }, {
                 signalId,
@@ -29922,7 +30180,7 @@ class StrategyReportService {
         /**
          * Logs an average-buy (DCA) event when a new averaging entry is added to an open position.
          */
-        this.averageBuy = async (symbol, currentPrice, effectivePriceOpen, totalEntries, isBacktest, context, timestamp, signalId, pnl, totalPartials, cost, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, originalPriceOpen) => {
+        this.averageBuy = async (symbol, currentPrice, effectivePriceOpen, totalEntries, isBacktest, context, timestamp, signalId, pnl, peakProfit, maxDrawdown, totalPartials, cost, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt, originalPriceOpen) => {
             this.loggerService.log("strategyReportService averageBuy", {
                 symbol,
                 currentPrice,
@@ -29956,6 +30214,16 @@ class StrategyReportService {
                 pnlEntries: pnl.pnlEntries,
                 pnlPriceOpen: pnl.priceOpen,
                 pnlPriceClose: pnl.priceClose,
+                peakProfitPercentage: peakProfit.pnlPercentage,
+                peakProfitCost: peakProfit.pnlCost,
+                peakProfitEntries: peakProfit.pnlEntries,
+                peakProfitPriceOpen: peakProfit.priceOpen,
+                peakProfitPriceClose: peakProfit.priceClose,
+                maxDrawdownPercentage: maxDrawdown.pnlPercentage,
+                maxDrawdownCost: maxDrawdown.pnlCost,
+                maxDrawdownEntries: maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: maxDrawdown.priceClose,
                 totalPartials,
                 cost,
             }, {
@@ -29983,63 +30251,63 @@ class StrategyReportService {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.cancelId, event.note));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.cancelId, event.note));
             const unClosePending = strategyCommitSubject
                 .filter(({ action }) => action === "close-pending")
                 .connect(async (event) => await this.closePending(event.symbol, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.closeId, event.note));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.closeId, event.note));
             const unPartialProfit = strategyCommitSubject
                 .filter(({ action }) => action === "partial-profit")
                 .connect(async (event) => await this.partialProfit(event.symbol, event.percentToClose, event.currentPrice, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
             const unPartialLoss = strategyCommitSubject
                 .filter(({ action }) => action === "partial-loss")
                 .connect(async (event) => await this.partialLoss(event.symbol, event.percentToClose, event.currentPrice, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
             const unTrailingStop = strategyCommitSubject
                 .filter(({ action }) => action === "trailing-stop")
                 .connect(async (event) => await this.trailingStop(event.symbol, event.percentShift, event.currentPrice, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
             const unTrailingTake = strategyCommitSubject
                 .filter(({ action }) => action === "trailing-take")
                 .connect(async (event) => await this.trailingTake(event.symbol, event.percentShift, event.currentPrice, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
             const unBreakeven = strategyCommitSubject
                 .filter(({ action }) => action === "breakeven")
                 .connect(async (event) => await this.breakeven(event.symbol, event.currentPrice, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen));
             const unActivateScheduled = strategyCommitSubject
                 .filter(({ action }) => action === "activate-scheduled")
                 .connect(async (event) => await this.activateScheduled(event.symbol, event.currentPrice, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen, event.activateId, event.note));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.totalEntries, event.originalPriceOpen, event.activateId, event.note));
             const unAverageBuy = strategyCommitSubject
                 .filter(({ action }) => action === "average-buy")
                 .connect(async (event) => await this.averageBuy(event.symbol, event.currentPrice, event.effectivePriceOpen, event.totalEntries, event.backtest, {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp, event.signalId, event.pnl, event.totalPartials, event.cost, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.originalPriceOpen));
+            }, event.timestamp, event.signalId, event.pnl, event.peakProfit, event.maxDrawdown, event.totalPartials, event.cost, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt, event.originalPriceOpen));
             const disposeFn = compose(() => unCancelSchedule(), () => unClosePending(), () => unPartialProfit(), () => unPartialLoss(), () => unTrailingStop(), () => unTrailingTake(), () => unBreakeven(), () => unActivateScheduled(), () => unAverageBuy());
             return () => {
                 disposeFn();
@@ -30138,6 +30406,16 @@ class SyncReportService {
                 pnlEntries: data.pnl.pnlEntries,
                 pnlPriceOpen: data.pnl.priceOpen,
                 pnlPriceClose: data.pnl.priceClose,
+                peakProfitPercentage: data.peakProfit.pnlPercentage,
+                peakProfitCost: data.peakProfit.pnlCost,
+                peakProfitEntries: data.peakProfit.pnlEntries,
+                peakProfitPriceOpen: data.peakProfit.priceOpen,
+                peakProfitPriceClose: data.peakProfit.priceClose,
+                maxDrawdownPercentage: data.maxDrawdown.pnlPercentage,
+                maxDrawdownCost: data.maxDrawdown.pnlCost,
+                maxDrawdownEntries: data.maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: data.maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: data.maxDrawdown.priceClose,
                 currentPrice: data.currentPrice,
             };
             const searchOptions = {
@@ -30248,6 +30526,16 @@ class HighestProfitReportService {
                 priceOpen: data.signal.priceOpen,
                 priceTakeProfit: data.signal.priceTakeProfit,
                 priceStopLoss: data.signal.priceStopLoss,
+                peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+                peakProfitCost: data.signal.peakProfit.pnlCost,
+                peakProfitEntries: data.signal.peakProfit.pnlEntries,
+                peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+                peakProfitPriceClose: data.signal.peakProfit.priceClose,
+                maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+                maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+                maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
             }, {
                 symbol: data.symbol,
                 strategyName: data.signal.strategyName,
@@ -31525,7 +31813,9 @@ class SyncMarkdownService {
                 pendingAt: data.pendingAt,
                 totalEntries: data.totalEntries,
                 totalPartials: data.totalPartials,
-                pnl: data.pnl,
+                pnl: data.signal.pnl,
+                maxDrawdown: data.signal.maxDrawdown,
+                peakProfit: data.signal.peakProfit,
                 closeReason: data.action === "signal-close" ? data.closeReason : undefined,
                 backtest: data.backtest,
                 createdAt,
@@ -31700,6 +31990,8 @@ let ReportStorage$1 = class ReportStorage {
             signalId: data.id,
             position: data.position,
             pnl: data.pnl,
+            maxDrawdown: data.maxDrawdown,
+            peakProfit: data.peakProfit,
             currentPrice,
             priceOpen: data.priceOpen,
             priceTakeProfit: data.priceTakeProfit,
@@ -32311,6 +32603,16 @@ class MaxDrawdownReportService {
                 priceOpen: data.signal.priceOpen,
                 priceTakeProfit: data.signal.priceTakeProfit,
                 priceStopLoss: data.signal.priceStopLoss,
+                peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+                peakProfitCost: data.signal.peakProfit.pnlCost,
+                peakProfitEntries: data.signal.peakProfit.pnlEntries,
+                peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+                peakProfitPriceClose: data.signal.peakProfit.priceClose,
+                maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+                maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+                maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
+                maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+                maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
             }, {
                 symbol: data.symbol,
                 strategyName: data.signal.strategyName,
@@ -32403,6 +32705,8 @@ class ReportStorage {
             signalId: data.id,
             position: data.position,
             pnl: data.pnl,
+            maxDrawdown: data.maxDrawdown,
+            peakProfit: data.peakProfit,
             currentPrice,
             priceOpen: data.priceOpen,
             priceTakeProfit: data.priceTakeProfit,
@@ -35354,6 +35658,9 @@ class BrokerAdapter {
                     priceTakeProfit: event.signal.priceTakeProfit,
                     priceStopLoss: event.signal.priceStopLoss,
                     priceOpen: event.signal.priceOpen,
+                    pnl: event.signal.pnl,
+                    peakProfit: event.signal.peakProfit,
+                    maxDrawdown: event.signal.maxDrawdown,
                     context: {
                         strategyName: event.strategyName,
                         exchangeName: event.exchangeName,
@@ -35371,7 +35678,10 @@ class BrokerAdapter {
                     currentPrice: event.currentPrice,
                     cost: event.signal.cost,
                     symbol: event.symbol,
-                    pnl: event.pnl,
+                    pnl: event.signal.pnl,
+                    priceOpen: event.signal.priceOpen,
+                    peakProfit: event.signal.peakProfit,
+                    maxDrawdown: event.signal.maxDrawdown,
                     totalEntries: event.totalEntries,
                     totalPartials: event.totalPartials,
                     priceStopLoss: event.signal.priceStopLoss,
@@ -54413,11 +54723,23 @@ const CREATE_SIGNAL_NOTIFICATION_FN = (data) => {
             totalPartials: data.signal.totalPartials,
             cost: data.signal.cost,
             pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.signal.pnl.pnlPercentage,
             pnlPriceOpen: data.signal.pnl.priceOpen,
             pnlPriceClose: data.signal.pnl.priceClose,
             pnlCost: data.signal.pnl.pnlCost,
             pnlEntries: data.signal.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             note: data.signal.note,
             scheduledAt: data.signal.scheduledAt,
             pendingAt: data.signal.pendingAt,
@@ -54447,11 +54769,23 @@ const CREATE_SIGNAL_NOTIFICATION_FN = (data) => {
             totalEntries: data.signal.totalEntries,
             totalPartials: data.signal.totalPartials,
             pnlPercentage: data.pnl.pnlPercentage,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             closeReason: data.closeReason,
             duration: durationMin,
             note: data.signal.note,
@@ -54481,11 +54815,23 @@ const CREATE_SIGNAL_NOTIFICATION_FN = (data) => {
             totalPartials: data.signal.totalPartials,
             cost: data.signal.cost,
             pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.signal.pnl.pnlPercentage,
             pnlPriceOpen: data.signal.pnl.priceOpen,
             pnlPriceClose: data.signal.pnl.priceClose,
             pnlCost: data.signal.pnl.pnlCost,
             pnlEntries: data.signal.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.signal.scheduledAt,
             currentPrice: data.currentPrice,
             note: data.signal.note,
@@ -54550,11 +54896,23 @@ const CREATE_PARTIAL_PROFIT_NOTIFICATION_FN = (data) => ({
     totalEntries: data.data.totalEntries,
     totalPartials: data.data.totalPartials,
     pnl: data.data.pnl,
+    maxDrawdown: data.data.maxDrawdown,
+    peakProfit: data.data.peakProfit,
     pnlPercentage: data.data.pnl.pnlPercentage,
     pnlPriceOpen: data.data.pnl.priceOpen,
     pnlPriceClose: data.data.pnl.priceClose,
     pnlCost: data.data.pnl.pnlCost,
     pnlEntries: data.data.pnl.pnlEntries,
+    peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+    peakProfitPriceClose: data.data.peakProfit.priceClose,
+    peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+    peakProfitCost: data.data.peakProfit.pnlCost,
+    peakProfitEntries: data.data.peakProfit.pnlEntries,
+    maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+    maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
+    maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+    maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+    maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
     note: data.data.note,
     scheduledAt: data.data.scheduledAt,
     pendingAt: data.data.pendingAt,
@@ -54586,11 +54944,23 @@ const CREATE_PARTIAL_LOSS_NOTIFICATION_FN = (data) => ({
     totalEntries: data.data.totalEntries,
     totalPartials: data.data.totalPartials,
     pnl: data.data.pnl,
+    maxDrawdown: data.data.maxDrawdown,
+    peakProfit: data.data.peakProfit,
     pnlPercentage: data.data.pnl.pnlPercentage,
     pnlPriceOpen: data.data.pnl.priceOpen,
     pnlPriceClose: data.data.pnl.priceClose,
     pnlCost: data.data.pnl.pnlCost,
     pnlEntries: data.data.pnl.pnlEntries,
+    peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+    peakProfitPriceClose: data.data.peakProfit.priceClose,
+    peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+    peakProfitCost: data.data.peakProfit.pnlCost,
+    peakProfitEntries: data.data.peakProfit.pnlEntries,
+    maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+    maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
+    maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+    maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+    maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
     note: data.data.note,
     scheduledAt: data.data.scheduledAt,
     pendingAt: data.data.pendingAt,
@@ -54621,11 +54991,23 @@ const CREATE_BREAKEVEN_NOTIFICATION_FN = (data) => ({
     totalEntries: data.data.totalEntries,
     totalPartials: data.data.totalPartials,
     pnl: data.data.pnl,
+    maxDrawdown: data.data.maxDrawdown,
+    peakProfit: data.data.peakProfit,
     pnlPercentage: data.data.pnl.pnlPercentage,
     pnlPriceOpen: data.data.pnl.priceOpen,
     pnlPriceClose: data.data.pnl.priceClose,
     pnlCost: data.data.pnl.pnlCost,
     pnlEntries: data.data.pnl.pnlEntries,
+    peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+    peakProfitPriceClose: data.data.peakProfit.priceClose,
+    peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+    peakProfitCost: data.data.peakProfit.pnlCost,
+    peakProfitEntries: data.data.peakProfit.pnlEntries,
+    maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+    maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
+    maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+    maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+    maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
     note: data.data.note,
     scheduledAt: data.data.scheduledAt,
     pendingAt: data.data.pendingAt,
@@ -54660,12 +55042,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceOpen: data.originalPriceOpen,
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54693,12 +55087,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceOpen: data.originalPriceOpen,
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54725,12 +55131,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceOpen: data.originalPriceOpen,
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54758,12 +55176,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceOpen: data.originalPriceOpen,
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54791,12 +55221,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceOpen: data.originalPriceOpen,
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54824,12 +55266,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceOpen: data.originalPriceOpen,
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54858,12 +55312,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             originalPriceTakeProfit: data.originalPriceTakeProfit,
             originalPriceStopLoss: data.originalPriceStopLoss,
             originalPriceOpen: data.originalPriceOpen,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             scheduledAt: data.scheduledAt,
             pendingAt: data.pendingAt,
             note: data.note,
@@ -54884,12 +55350,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
             originalPriceOpen: data.originalPriceOpen,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             note: data.note,
             createdAt: data.timestamp,
         };
@@ -54908,12 +55386,24 @@ const CREATE_STRATEGY_COMMIT_NOTIFICATION_FN = (data) => {
             totalEntries: data.totalEntries,
             totalPartials: data.totalPartials,
             originalPriceOpen: data.originalPriceOpen,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             note: data.note,
             createdAt: data.timestamp,
         };
@@ -54938,12 +55428,24 @@ const CREATE_SIGNAL_SYNC_NOTIFICATION_FN = (data) => {
             exchangeName: data.exchangeName,
             signalId: data.signalId,
             currentPrice: data.currentPrice,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             cost: data.cost,
             position: data.position,
             priceOpen: data.priceOpen,
@@ -54971,12 +55473,24 @@ const CREATE_SIGNAL_SYNC_NOTIFICATION_FN = (data) => {
             exchangeName: data.exchangeName,
             signalId: data.signalId,
             currentPrice: data.currentPrice,
-            pnl: data.pnl,
+            pnl: data.signal.pnl,
+            maxDrawdown: data.signal.maxDrawdown,
+            peakProfit: data.signal.peakProfit,
             pnlPercentage: data.pnl.pnlPercentage,
             pnlPriceOpen: data.pnl.priceOpen,
             pnlPriceClose: data.pnl.priceClose,
             pnlCost: data.pnl.pnlCost,
             pnlEntries: data.pnl.pnlEntries,
+            peakProfitPriceOpen: data.signal.peakProfit.priceOpen,
+            peakProfitPriceClose: data.signal.peakProfit.priceClose,
+            peakProfitPercentage: data.signal.peakProfit.pnlPercentage,
+            peakProfitCost: data.signal.peakProfit.pnlCost,
+            peakProfitEntries: data.signal.peakProfit.pnlEntries,
+            maxDrawdownPriceOpen: data.signal.maxDrawdown.priceOpen,
+            maxDrawdownPriceClose: data.signal.maxDrawdown.priceClose,
+            maxDrawdownPercentage: data.signal.maxDrawdown.pnlPercentage,
+            maxDrawdownCost: data.signal.maxDrawdown.pnlCost,
+            maxDrawdownEntries: data.signal.maxDrawdown.pnlEntries,
             position: data.position,
             priceOpen: data.priceOpen,
             priceTakeProfit: data.priceTakeProfit,
@@ -55082,11 +55596,23 @@ const CREATE_SIGNAL_INFO_NOTIFICATION_FN = (data) => ({
     totalEntries: data.data.totalEntries,
     totalPartials: data.data.totalPartials,
     pnl: data.data.pnl,
+    maxDrawdown: data.data.maxDrawdown,
+    peakProfit: data.data.peakProfit,
     pnlPercentage: data.data.pnl.pnlPercentage,
     pnlPriceOpen: data.data.pnl.priceOpen,
     pnlPriceClose: data.data.pnl.priceClose,
     pnlCost: data.data.pnl.pnlCost,
     pnlEntries: data.data.pnl.pnlEntries,
+    peakProfitPriceOpen: data.data.peakProfit.priceOpen,
+    peakProfitPriceClose: data.data.peakProfit.priceClose,
+    peakProfitPercentage: data.data.peakProfit.pnlPercentage,
+    peakProfitCost: data.data.peakProfit.pnlCost,
+    peakProfitEntries: data.data.peakProfit.pnlEntries,
+    maxDrawdownPriceOpen: data.data.maxDrawdown.priceOpen,
+    maxDrawdownPriceClose: data.data.maxDrawdown.priceClose,
+    maxDrawdownPercentage: data.data.maxDrawdown.pnlPercentage,
+    maxDrawdownCost: data.data.maxDrawdown.pnlCost,
+    maxDrawdownEntries: data.data.maxDrawdown.pnlEntries,
     note: data.note,
     notificationId: data.notificationId,
     scheduledAt: data.data.scheduledAt,