npm - backtest-kit - Versions diffs - 7.0.2 → 7.2.0 - Mend

backtest-kit 7.0.2 → 7.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/build/index.cjs CHANGED Viewed

@@ -4770,8 +4770,7 @@ const TIMEOUT_SYMBOL = Symbol('timeout');
  * The framework will retry on the next tick.
  */
 const CALL_SIGNAL_SYNC_OPEN_FN = functoolsKit.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,
@@ -4782,10 +4781,12 @@ const CALL_SIGNAL_SYNC_OPEN_FN = functoolsKit.trycatch(async (timestamp, current
         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,
@@ -4809,8 +4810,7 @@ const CALL_SIGNAL_SYNC_OPEN_FN = functoolsKit.trycatch(async (timestamp, current
  * strategy state is NOT mutated. The framework will retry on the next tick.
  */
 const CALL_SIGNAL_SYNC_CLOSE_FN = functoolsKit.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,
@@ -4821,8 +4821,10 @@ const CALL_SIGNAL_SYNC_CLOSE_FN = functoolsKit.trycatch(async (timestamp, curren
         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,
@@ -4883,10 +4885,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,
@@ -4896,7 +4897,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,
@@ -4915,6 +4919,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,
@@ -4924,7 +4929,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,
@@ -4943,6 +4951,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,
@@ -4951,7 +4960,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,
@@ -4970,6 +4982,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,
@@ -4979,7 +4992,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,
@@ -4998,6 +5014,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,
@@ -5007,7 +5024,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,
@@ -5026,6 +5046,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",
@@ -5037,7 +5058,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,
@@ -5057,6 +5081,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.
  *
@@ -5104,7 +5130,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
@@ -5112,11 +5138,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,
@@ -5125,10 +5154,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 = functoolsKit.trycatch(async (self) => {
@@ -5193,8 +5224,8 @@ const GET_SIGNAL_FN = functoolsKit.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);
@@ -5219,8 +5250,8 @@ const GET_SIGNAL_FN = functoolsKit.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);
@@ -5242,8 +5273,8 @@ const GET_SIGNAL_FN = functoolsKit.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);
@@ -5847,7 +5878,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,
@@ -5903,7 +5934,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,
@@ -5954,8 +5985,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);
@@ -5965,6 +5996,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,
@@ -5977,7 +6009,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;
@@ -5988,7 +6023,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,
@@ -6002,7 +6037,7 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
 };
 const CALL_SCHEDULE_PING_CALLBACKS_FN = functoolsKit.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)
@@ -6028,7 +6063,7 @@ const CALL_SCHEDULE_PING_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (s
 });
 const CALL_ACTIVE_PING_CALLBACKS_FN = functoolsKit.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)
@@ -6076,7 +6111,7 @@ const CALL_IDLE_PING_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (self,
 const CALL_ACTIVE_CALLBACKS_FN = functoolsKit.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);
         }
     }, {
@@ -6099,7 +6134,7 @@ const CALL_ACTIVE_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (self, sy
 const CALL_SCHEDULE_CALLBACKS_FN = functoolsKit.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);
         }
     }, {
@@ -6122,7 +6157,7 @@ const CALL_SCHEDULE_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (self,
 const CALL_CANCEL_CALLBACKS_FN = functoolsKit.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);
         }
     }, {
@@ -6145,7 +6180,7 @@ const CALL_CANCEL_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (self, sy
 const CALL_OPEN_CALLBACKS_FN = functoolsKit.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);
         }
     }, {
@@ -6168,7 +6203,7 @@ const CALL_OPEN_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (self, symb
 const CALL_CLOSE_CALLBACKS_FN = functoolsKit.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);
         }
     }, {
@@ -6291,7 +6326,7 @@ const CALL_RISK_REMOVE_SIGNAL_FN = functoolsKit.trycatch(beginTime(async (self,
 });
 const CALL_PARTIAL_CLEAR_FN = functoolsKit.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),
@@ -6313,7 +6348,7 @@ const CALL_PARTIAL_CLEAR_FN = functoolsKit.trycatch(beginTime(async (self, symbo
 const CALL_RISK_CHECK_SIGNAL_FN = functoolsKit.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,
@@ -6342,7 +6377,7 @@ const CALL_RISK_CHECK_SIGNAL_FN = functoolsKit.trycatch(beginTime(async (self, s
 });
 const CALL_PARTIAL_PROFIT_CALLBACKS_FN = functoolsKit.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);
@@ -6366,7 +6401,7 @@ const CALL_PARTIAL_PROFIT_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (
 });
 const CALL_PARTIAL_LOSS_CALLBACKS_FN = functoolsKit.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);
@@ -6390,7 +6425,7 @@ const CALL_PARTIAL_LOSS_CALLBACKS_FN = functoolsKit.trycatch(beginTime(async (se
 });
 const CALL_BREAKEVEN_CHECK_FN = functoolsKit.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);
@@ -6414,7 +6449,7 @@ const CALL_BREAKEVEN_CHECK_FN = functoolsKit.trycatch(beginTime(async (self, sym
 });
 const CALL_BREAKEVEN_CLEAR_FN = functoolsKit.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),
@@ -6437,7 +6472,7 @@ const CALL_BACKTEST_SCHEDULE_OPEN_FN = functoolsKit.trycatch(beginTime(async (se
     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,
@@ -6466,10 +6501,10 @@ const CALL_BACKTEST_SCHEDULE_OPEN_FN = functoolsKit.trycatch(beginTime(async (se
 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,
@@ -6477,7 +6512,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,
     };
@@ -6497,7 +6532,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,
@@ -6527,7 +6562,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,
@@ -6582,13 +6617,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 при закрытии позиции
@@ -6599,11 +6634,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,
@@ -6636,13 +6671,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);
             }
@@ -6653,13 +6688,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);
             }
@@ -6678,13 +6713,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);
             }
@@ -6695,22 +6730,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,
@@ -6718,7 +6753,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,
@@ -6754,6 +6789,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",
@@ -6768,14 +6804,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,
@@ -6824,8 +6863,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);
@@ -6835,6 +6874,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,
@@ -6847,7 +6887,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;
@@ -6870,20 +6913,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 при закрытии позиции
@@ -6894,11 +6937,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,
@@ -6922,6 +6965,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,
@@ -6935,21 +6979,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,
@@ -7014,8 +7060,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);
@@ -7025,6 +7071,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,
@@ -7037,7 +7084,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" };
@@ -7046,7 +7096,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,
@@ -7058,7 +7108,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,
@@ -7228,12 +7281,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);
                 }
@@ -7243,12 +7296,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);
                 }
@@ -7266,12 +7319,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);
                 }
@@ -7281,12 +7334,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);
                 }
@@ -7300,9 +7353,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,
@@ -7310,7 +7364,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,
@@ -7493,7 +7547,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.
@@ -7504,7 +7558,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.
@@ -8313,6 +8367,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,
@@ -8326,14 +8381,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,
@@ -8367,6 +8425,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,
@@ -8380,7 +8439,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
@@ -8390,14 +8452,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,
@@ -8440,8 +8501,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) {
@@ -8450,6 +8511,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,
@@ -8462,7 +8524,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);
@@ -8470,7 +8535,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,
@@ -8482,7 +8547,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,
@@ -8500,7 +8568,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,
@@ -8616,6 +8684,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,
@@ -8629,13 +8698,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,
@@ -8671,6 +8743,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,
@@ -8684,7 +8757,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);
@@ -8693,14 +8769,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,
@@ -9156,7 +9231,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);
@@ -9339,7 +9414,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);
@@ -9537,7 +9612,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) {
@@ -9786,7 +9861,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) {
@@ -10022,7 +10097,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) {
@@ -10114,7 +10189,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);
@@ -12485,12 +12560,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.
  *
@@ -12533,6 +12611,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,
@@ -12546,7 +12627,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 */
@@ -18816,7 +18899,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,
@@ -18824,7 +18909,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,
     },
 ];
@@ -21385,8 +21475,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,
@@ -21915,8 +22005,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
@@ -24067,8 +24157,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))
@@ -28195,8 +28285,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") {
@@ -28229,8 +28327,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 });
             }
         };
@@ -28393,8 +28499,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") {
@@ -28445,8 +28559,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") {
@@ -28479,8 +28601,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") {
@@ -29072,8 +29202,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,
@@ -29207,6 +29345,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,
@@ -29257,6 +29405,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,
@@ -29388,6 +29546,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,
@@ -29518,6 +29686,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,
@@ -29597,7 +29775,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,
@@ -29619,6 +29797,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,
@@ -29632,7 +29820,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,
@@ -29654,6 +29842,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,
@@ -29667,7 +29865,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,
@@ -29700,6 +29898,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,
@@ -29713,7 +29921,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,
@@ -29746,6 +29954,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,
@@ -29759,7 +29977,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,
@@ -29792,6 +30010,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,
@@ -29805,7 +30033,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,
@@ -29838,6 +30066,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,
@@ -29851,7 +30089,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,
@@ -29882,6 +30120,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,
@@ -29895,7 +30143,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,
@@ -29929,6 +30177,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,
@@ -29942,7 +30200,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,
@@ -29976,6 +30234,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,
             }, {
@@ -30003,63 +30271,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 = functoolsKit.compose(() => unCancelSchedule(), () => unClosePending(), () => unPartialProfit(), () => unPartialLoss(), () => unTrailingStop(), () => unTrailingTake(), () => unBreakeven(), () => unActivateScheduled(), () => unAverageBuy());
             return () => {
                 disposeFn();
@@ -30158,6 +30426,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 = {
@@ -30268,6 +30546,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,
@@ -31545,7 +31833,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,
@@ -31720,6 +32010,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,
@@ -32331,6 +32623,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,
@@ -32423,6 +32725,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,
@@ -35374,6 +35678,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,
@@ -35391,7 +35698,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,
@@ -54433,11 +54743,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,
@@ -54467,11 +54789,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,
@@ -54501,11 +54835,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,
@@ -54570,11 +54916,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,
@@ -54606,11 +54964,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,
@@ -54641,11 +55011,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,
@@ -54680,12 +55062,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,
@@ -54713,12 +55107,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,
@@ -54745,12 +55151,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,
@@ -54778,12 +55196,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,
@@ -54811,12 +55241,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,
@@ -54844,12 +55286,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,
@@ -54878,12 +55332,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,
@@ -54904,12 +55370,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,
         };
@@ -54928,12 +55406,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,
         };
@@ -54958,12 +55448,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,
@@ -54991,12 +55493,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,
@@ -55102,11 +55616,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,