backtest-kit 2.2.18 → 2.2.19

package/build/index.cjs

@@ -2828,6 +2828,11 @@ const INTERVAL_MINUTES$3 = {
     "30m": 30,
     "1h": 60,
 };
+/**
+ * Mock value for scheduled signal pendingAt timestamp.
+ * Used to indicate that the actual pendingAt will be set upon activation.
+ */
+const SCHEDULED_SIGNAL_PENDING_MOCK = 0;
 const TIMEOUT_SYMBOL = Symbol('timeout');
 /**
  * Calls onCommit callback with strategy commit event.
@@ -2870,6 +2875,11 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, timestamp) => {
     {
         self._commitQueue = [];
     }
+    if (!self._pendingSignal) {
+        return;
+    }
+    // Get public signal data for commit events (contains effective and original SL/TP)
+    const publicSignal = TO_PUBLIC_SIGNAL(self._pendingSignal);
     for (const commit of queue) {
         if (commit.action === "partial-profit") {
             await CALL_COMMIT_FN(self, {
@@ -2882,6 +2892,14 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, timestamp) => {
                 percentToClose: commit.percentToClose,
                 currentPrice: commit.currentPrice,
                 timestamp,
+                position: publicSignal.position,
+                priceOpen: publicSignal.priceOpen,
+                priceTakeProfit: publicSignal.priceTakeProfit,
+                priceStopLoss: publicSignal.priceStopLoss,
+                originalPriceTakeProfit: publicSignal.originalPriceTakeProfit,
+                originalPriceStopLoss: publicSignal.originalPriceStopLoss,
+                scheduledAt: publicSignal.scheduledAt,
+                pendingAt: publicSignal.pendingAt,
             });
             continue;
         }
@@ -2896,6 +2914,14 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, timestamp) => {
                 percentToClose: commit.percentToClose,
                 currentPrice: commit.currentPrice,
                 timestamp,
+                position: publicSignal.position,
+                priceOpen: publicSignal.priceOpen,
+                priceTakeProfit: publicSignal.priceTakeProfit,
+                priceStopLoss: publicSignal.priceStopLoss,
+                originalPriceTakeProfit: publicSignal.originalPriceTakeProfit,
+                originalPriceStopLoss: publicSignal.originalPriceStopLoss,
+                scheduledAt: publicSignal.scheduledAt,
+                pendingAt: publicSignal.pendingAt,
             });
             continue;
         }
@@ -2909,6 +2935,14 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, timestamp) => {
                 backtest: commit.backtest,
                 currentPrice: commit.currentPrice,
                 timestamp,
+                position: publicSignal.position,
+                priceOpen: publicSignal.priceOpen,
+                priceTakeProfit: publicSignal.priceTakeProfit,
+                priceStopLoss: publicSignal.priceStopLoss,
+                originalPriceTakeProfit: publicSignal.originalPriceTakeProfit,
+                originalPriceStopLoss: publicSignal.originalPriceStopLoss,
+                scheduledAt: publicSignal.scheduledAt,
+                pendingAt: publicSignal.pendingAt,
             });
             continue;
         }
@@ -2923,6 +2957,14 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, timestamp) => {
                 percentShift: commit.percentShift,
                 currentPrice: commit.currentPrice,
                 timestamp,
+                position: publicSignal.position,
+                priceOpen: publicSignal.priceOpen,
+                priceTakeProfit: publicSignal.priceTakeProfit,
+                priceStopLoss: publicSignal.priceStopLoss,
+                originalPriceTakeProfit: publicSignal.originalPriceTakeProfit,
+                originalPriceStopLoss: publicSignal.originalPriceStopLoss,
+                scheduledAt: publicSignal.scheduledAt,
+                pendingAt: publicSignal.pendingAt,
             });
             continue;
         }
@@ -2937,6 +2979,14 @@ const PROCESS_COMMIT_QUEUE_FN = async (self, timestamp) => {
                 percentShift: commit.percentShift,
                 currentPrice: commit.currentPrice,
                 timestamp,
+                position: publicSignal.position,
+                priceOpen: publicSignal.priceOpen,
+                priceTakeProfit: publicSignal.priceTakeProfit,
+                priceStopLoss: publicSignal.priceStopLoss,
+                originalPriceTakeProfit: publicSignal.originalPriceTakeProfit,
+                originalPriceStopLoss: publicSignal.originalPriceStopLoss,
+                scheduledAt: publicSignal.scheduledAt,
+                pendingAt: publicSignal.pendingAt,
             });
             continue;
         }
@@ -3263,7 +3313,7 @@ const VALIDATE_SIGNAL_FN = (signal, currentPrice, isScheduled) => {
         if (typeof signal.pendingAt !== "number") {
             errors.push(`pendingAt must be a number type, got ${signal.pendingAt} (${typeof signal.pendingAt})`);
         }
-        if (signal.pendingAt <= 0) {
+        if (signal.pendingAt <= 0 && !isScheduled) {
             errors.push(`pendingAt must be positive, got ${signal.pendingAt}`);
         }
     }
@@ -3349,7 +3399,7 @@ const GET_SIGNAL_FN = functoolsKit.trycatch(async (self) => {
             strategyName: self.params.method.context.strategyName,
             frameName: self.params.method.context.frameName,
             scheduledAt: currentTime,
-            pendingAt: currentTime, // Временно, обновится при активации
+            pendingAt: SCHEDULED_SIGNAL_PENDING_MOCK, // Временно, обновится при активации
             _isScheduled: true,
         };
         // Валидируем сигнал перед возвратом
@@ -13493,6 +13543,8 @@ const backtest_columns = [
         key: "duration",
         label: "Duration (min)",
         format: (data) => {
+            if (!data.closeTimestamp || !data.signal.pendingAt)
+                return "N/A";
             const durationMs = data.closeTimestamp - data.signal.pendingAt;
             const durationMin = Math.round(durationMs / 60000);
             return `${durationMin}`;
@@ -13502,7 +13554,7 @@ const backtest_columns = [
     {
         key: "openTimestamp",
         label: "Open Time",
-        format: (data) => new Date(data.signal.pendingAt).toISOString(),
+        format: (data) => data.signal.pendingAt ? new Date(data.signal.pendingAt).toISOString() : "N/A",
         isVisible: () => true,
     },
     {
@@ -23796,8 +23848,16 @@ class StrategyReportService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.partialProfit = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.partialProfit = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyReportService partialProfit", {
                 symbol,
                 percentToClose,
@@ -23823,6 +23883,14 @@ class StrategyReportService {
                 symbol,
                 timestamp,
                 createdAt,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             }, {
                 signalId: pendingRow.id,
                 exchangeName: context.exchangeName,
@@ -23841,8 +23909,16 @@ class StrategyReportService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.partialLoss = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.partialLoss = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyReportService partialLoss", {
                 symbol,
                 percentToClose,
@@ -23868,6 +23944,14 @@ class StrategyReportService {
                 symbol,
                 timestamp,
                 createdAt,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             }, {
                 signalId: pendingRow.id,
                 exchangeName: context.exchangeName,
@@ -23886,8 +23970,16 @@ class StrategyReportService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.trailingStop = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.trailingStop = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyReportService trailingStop", {
                 symbol,
                 percentShift,
@@ -23913,6 +24005,14 @@ class StrategyReportService {
                 symbol,
                 timestamp,
                 createdAt,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             }, {
                 signalId: pendingRow.id,
                 exchangeName: context.exchangeName,
@@ -23931,8 +24031,16 @@ class StrategyReportService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.trailingTake = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.trailingTake = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyReportService trailingTake", {
                 symbol,
                 percentShift,
@@ -23958,6 +24066,14 @@ class StrategyReportService {
                 symbol,
                 timestamp,
                 createdAt,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             }, {
                 signalId: pendingRow.id,
                 exchangeName: context.exchangeName,
@@ -23975,8 +24091,16 @@ class StrategyReportService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.breakeven = async (symbol, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.breakeven = async (symbol, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyReportService breakeven", {
                 symbol,
                 currentPrice,
@@ -24000,6 +24124,14 @@ class StrategyReportService {
                 symbol,
                 timestamp,
                 createdAt,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             }, {
                 signalId: pendingRow.id,
                 exchangeName: context.exchangeName,
@@ -24039,35 +24171,35 @@ class StrategyReportService {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp));
+            }, event.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             const disposeFn = functoolsKit.compose(() => unCancelSchedule(), () => unClosePending(), () => unPartialProfit(), () => unPartialLoss(), () => unTrailingStop(), () => unTrailingTake(), () => unBreakeven());
             return () => {
                 disposeFn();
@@ -24437,8 +24569,16 @@ class StrategyMarkdownService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.partialProfit = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.partialProfit = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyMarkdownService partialProfit", {
                 symbol,
                 percentToClose,
@@ -24470,6 +24610,14 @@ class StrategyMarkdownService {
                 currentPrice,
                 createdAt,
                 backtest: isBacktest,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             });
         };
         /**
@@ -24481,8 +24629,16 @@ class StrategyMarkdownService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.partialLoss = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.partialLoss = async (symbol, percentToClose, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyMarkdownService partialLoss", {
                 symbol,
                 percentToClose,
@@ -24514,6 +24670,14 @@ class StrategyMarkdownService {
                 currentPrice,
                 createdAt,
                 backtest: isBacktest,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             });
         };
         /**
@@ -24525,8 +24689,16 @@ class StrategyMarkdownService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.trailingStop = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.trailingStop = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyMarkdownService trailingStop", {
                 symbol,
                 percentShift,
@@ -24558,6 +24730,14 @@ class StrategyMarkdownService {
                 currentPrice,
                 createdAt,
                 backtest: isBacktest,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             });
         };
         /**
@@ -24569,8 +24749,16 @@ class StrategyMarkdownService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.trailingTake = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.trailingTake = async (symbol, percentShift, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyMarkdownService trailingTake", {
                 symbol,
                 percentShift,
@@ -24602,6 +24790,14 @@ class StrategyMarkdownService {
                 currentPrice,
                 createdAt,
                 backtest: isBacktest,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             });
         };
         /**
@@ -24612,8 +24808,16 @@ class StrategyMarkdownService {
          * @param isBacktest - Whether this is a backtest or live trading event
          * @param context - Strategy context with strategyName, exchangeName, frameName
          * @param timestamp - Timestamp from StrategyCommitContract (execution context time)
-         */
-        this.breakeven = async (symbol, currentPrice, isBacktest, context, timestamp) => {
+         * @param position - Trade direction: "long" or "short"
+         * @param priceOpen - Entry price for the position
+         * @param priceTakeProfit - Effective take profit price
+         * @param priceStopLoss - Effective stop loss price
+         * @param originalPriceTakeProfit - Original take profit before trailing
+         * @param originalPriceStopLoss - Original stop loss before trailing
+         * @param scheduledAt - Signal creation timestamp in milliseconds
+         * @param pendingAt - Pending timestamp in milliseconds
+         */
+        this.breakeven = async (symbol, currentPrice, isBacktest, context, timestamp, position, priceOpen, priceTakeProfit, priceStopLoss, originalPriceTakeProfit, originalPriceStopLoss, scheduledAt, pendingAt) => {
             this.loggerService.log("strategyMarkdownService breakeven", {
                 symbol,
                 currentPrice,
@@ -24643,6 +24847,14 @@ class StrategyMarkdownService {
                 currentPrice,
                 createdAt,
                 backtest: isBacktest,
+                position,
+                priceOpen,
+                priceTakeProfit,
+                priceStopLoss,
+                originalPriceTakeProfit,
+                originalPriceStopLoss,
+                scheduledAt,
+                pendingAt,
             });
         };
         /**
@@ -24789,35 +25001,35 @@ class StrategyMarkdownService {
                 exchangeName: event.exchangeName,
                 frameName: event.frameName,
                 strategyName: event.strategyName,
-            }, event.timestamp));
+            }, event.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             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.timestamp, event.position, event.priceOpen, event.priceTakeProfit, event.priceStopLoss, event.originalPriceTakeProfit, event.originalPriceStopLoss, event.scheduledAt, event.pendingAt));
             const disposeFn = functoolsKit.compose(() => unCancelSchedule(), () => unClosePending(), () => unPartialProfit(), () => unPartialLoss(), () => unTrailingStop(), () => unTrailingTake(), () => unBreakeven());
             return () => {
                 disposeFn();
@@ -33729,6 +33941,12 @@ class NotificationInstance {
                 currentPrice: data.currentPrice,
                 priceOpen: data.data.priceOpen,
                 position: data.data.position,
+                priceTakeProfit: data.data.priceTakeProfit,
+                priceStopLoss: data.data.priceStopLoss,
+                originalPriceTakeProfit: data.data.originalPriceTakeProfit,
+                originalPriceStopLoss: data.data.originalPriceStopLoss,
+                scheduledAt: data.data.scheduledAt,
+                pendingAt: data.data.pendingAt,
                 createdAt: data.timestamp,
             });
         };
@@ -33749,6 +33967,12 @@ class NotificationInstance {
                 currentPrice: data.currentPrice,
                 priceOpen: data.data.priceOpen,
                 position: data.data.position,
+                priceTakeProfit: data.data.priceTakeProfit,
+                priceStopLoss: data.data.priceStopLoss,
+                originalPriceTakeProfit: data.data.originalPriceTakeProfit,
+                originalPriceStopLoss: data.data.originalPriceStopLoss,
+                scheduledAt: data.data.scheduledAt,
+                pendingAt: data.data.pendingAt,
                 createdAt: data.timestamp,
             });
         };
@@ -33768,6 +33992,12 @@ class NotificationInstance {
                 currentPrice: data.currentPrice,
                 priceOpen: data.data.priceOpen,
                 position: data.data.position,
+                priceTakeProfit: data.data.priceTakeProfit,
+                priceStopLoss: data.data.priceStopLoss,
+                originalPriceTakeProfit: data.data.originalPriceTakeProfit,
+                originalPriceStopLoss: data.data.originalPriceStopLoss,
+                scheduledAt: data.data.scheduledAt,
+                pendingAt: data.data.pendingAt,
                 createdAt: data.timestamp,
             });
         };
@@ -33786,6 +34016,14 @@ class NotificationInstance {
                     exchangeName: data.exchangeName,
                     percentToClose: data.percentToClose,
                     currentPrice: data.currentPrice,
+                    position: data.position,
+                    priceOpen: data.priceOpen,
+                    priceTakeProfit: data.priceTakeProfit,
+                    priceStopLoss: data.priceStopLoss,
+                    originalPriceTakeProfit: data.originalPriceTakeProfit,
+                    originalPriceStopLoss: data.originalPriceStopLoss,
+                    scheduledAt: data.scheduledAt,
+                    pendingAt: data.pendingAt,
                     createdAt: data.timestamp,
                 });
             }
@@ -33800,6 +34038,14 @@ class NotificationInstance {
                     exchangeName: data.exchangeName,
                     percentToClose: data.percentToClose,
                     currentPrice: data.currentPrice,
+                    position: data.position,
+                    priceOpen: data.priceOpen,
+                    priceTakeProfit: data.priceTakeProfit,
+                    priceStopLoss: data.priceStopLoss,
+                    originalPriceTakeProfit: data.originalPriceTakeProfit,
+                    originalPriceStopLoss: data.originalPriceStopLoss,
+                    scheduledAt: data.scheduledAt,
+                    pendingAt: data.pendingAt,
                     createdAt: data.timestamp,
                 });
             }
@@ -33813,6 +34059,14 @@ class NotificationInstance {
                     strategyName: data.strategyName,
                     exchangeName: data.exchangeName,
                     currentPrice: data.currentPrice,
+                    position: data.position,
+                    priceOpen: data.priceOpen,
+                    priceTakeProfit: data.priceTakeProfit,
+                    priceStopLoss: data.priceStopLoss,
+                    originalPriceTakeProfit: data.originalPriceTakeProfit,
+                    originalPriceStopLoss: data.originalPriceStopLoss,
+                    scheduledAt: data.scheduledAt,
+                    pendingAt: data.pendingAt,
                     createdAt: data.timestamp,
                 });
             }
@@ -33827,6 +34081,14 @@ class NotificationInstance {
                     exchangeName: data.exchangeName,
                     percentShift: data.percentShift,
                     currentPrice: data.currentPrice,
+                    position: data.position,
+                    priceOpen: data.priceOpen,
+                    priceTakeProfit: data.priceTakeProfit,
+                    priceStopLoss: data.priceStopLoss,
+                    originalPriceTakeProfit: data.originalPriceTakeProfit,
+                    originalPriceStopLoss: data.originalPriceStopLoss,
+                    scheduledAt: data.scheduledAt,
+                    pendingAt: data.pendingAt,
                     createdAt: data.timestamp,
                 });
             }
@@ -33841,6 +34103,14 @@ class NotificationInstance {
                     exchangeName: data.exchangeName,
                     percentShift: data.percentShift,
                     currentPrice: data.currentPrice,
+                    position: data.position,
+                    priceOpen: data.priceOpen,
+                    priceTakeProfit: data.priceTakeProfit,
+                    priceStopLoss: data.priceStopLoss,
+                    originalPriceTakeProfit: data.originalPriceTakeProfit,
+                    originalPriceStopLoss: data.originalPriceStopLoss,
+                    scheduledAt: data.scheduledAt,
+                    pendingAt: data.pendingAt,
                     createdAt: data.timestamp,
                 });
             }