backtest-kit 1.4.15 → 1.5.0

package/build/index.cjs

@@ -1700,6 +1700,53 @@ var emitters = /*#__PURE__*/Object.freeze({
     walkerStopSubject: walkerStopSubject
 });
 
+/**
+ * Converts markdown content to plain text with minimal formatting
+ * @param content - Markdown string to convert
+ * @returns Plain text representation
+ */
+const toPlainString = (content) => {
+    if (!content) {
+        return "";
+    }
+    let text = content;
+    // Remove code blocks
+    text = text.replace(/```[\s\S]*?```/g, "");
+    text = text.replace(/`([^`]+)`/g, "$1");
+    // Remove images
+    text = text.replace(/!\[([^\]]*)\]\([^)]+\)/g, "$1");
+    // Convert links to text only (keep link text, remove URL)
+    text = text.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1");
+    // Remove headers (convert to plain text)
+    text = text.replace(/^#{1,6}\s+(.+)$/gm, "$1");
+    // Remove bold and italic markers
+    text = text.replace(/\*\*\*(.+?)\*\*\*/g, "$1");
+    text = text.replace(/\*\*(.+?)\*\*/g, "$1");
+    text = text.replace(/\*(.+?)\*/g, "$1");
+    text = text.replace(/___(.+?)___/g, "$1");
+    text = text.replace(/__(.+?)__/g, "$1");
+    text = text.replace(/_(.+?)_/g, "$1");
+    // Remove strikethrough
+    text = text.replace(/~~(.+?)~~/g, "$1");
+    // Convert lists to plain text with bullets
+    text = text.replace(/^\s*[-*+]\s+/gm, "• ");
+    text = text.replace(/^\s*\d+\.\s+/gm, "• ");
+    // Remove blockquotes
+    text = text.replace(/^\s*>\s+/gm, "");
+    // Remove horizontal rules
+    text = text.replace(/^(\*{3,}|-{3,}|_{3,})$/gm, "");
+    // Remove HTML tags
+    text = text.replace(/<[^>]+>/g, "");
+    // Remove excessive whitespace and normalize line breaks
+    text = text.replace(/\n[\s\n]*\n/g, "\n");
+    text = text.replace(/[ \t]+/g, " ");
+    // Remove all newline characters
+    text = text.replace(/\n/g, " ");
+    // Remove excessive spaces after newline removal
+    text = text.replace(/\s+/g, " ");
+    return text.trim();
+};
+
 const INTERVAL_MINUTES$1 = {
     "1m": 1,
     "3m": 3,
@@ -1912,7 +1959,7 @@ const GET_SIGNAL_FN = functoolsKit.trycatch(async (self) => {
                 id: functoolsKit.randomString(),
                 priceOpen: signal.priceOpen, // Используем priceOpen из сигнала
                 position: signal.position,
-                note: signal.note,
+                note: toPlainString(signal.note),
                 priceTakeProfit: signal.priceTakeProfit,
                 priceStopLoss: signal.priceStopLoss,
                 minuteEstimatedTime: signal.minuteEstimatedTime,
@@ -1932,7 +1979,7 @@ const GET_SIGNAL_FN = functoolsKit.trycatch(async (self) => {
             id: functoolsKit.randomString(),
             priceOpen: signal.priceOpen,
             position: signal.position,
-            note: signal.note,
+            note: toPlainString(signal.note),
             priceTakeProfit: signal.priceTakeProfit,
             priceStopLoss: signal.priceStopLoss,
             minuteEstimatedTime: signal.minuteEstimatedTime,
@@ -1951,6 +1998,7 @@ const GET_SIGNAL_FN = functoolsKit.trycatch(async (self) => {
         id: functoolsKit.randomString(),
         priceOpen: currentPrice,
         ...signal,
+        note: toPlainString(signal.note),
         symbol: self.params.execution.context.symbol,
         exchangeName: self.params.method.context.exchangeName,
         strategyName: self.params.method.context.strategyName,
@@ -2279,7 +2327,7 @@ const CLOSE_PENDING_SIGNAL_FN = async (self, signal, currentPrice, closeReason)
         self.params.callbacks.onClose(self.params.execution.context.symbol, signal, currentPrice, self.params.execution.context.backtest);
     }
     // КРИТИЧНО: Очищаем состояние ClientPartial при закрытии позиции
-    await self.params.partial.clear(self.params.execution.context.symbol, signal, currentPrice);
+    await self.params.partial.clear(self.params.execution.context.symbol, signal, currentPrice, self.params.execution.context.backtest);
     await self.params.risk.removeSignal(self.params.execution.context.symbol, {
         strategyName: self.params.method.context.strategyName,
         riskName: self.params.riskName,
@@ -2302,31 +2350,50 @@ const CLOSE_PENDING_SIGNAL_FN = async (self, signal, currentPrice, closeReason)
     return result;
 };
 const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice) => {
-    // Calculate revenue percentage for partial fill/loss callbacks
+    // Calculate percentage of path to TP/SL for partial fill/loss callbacks
     {
-        let revenuePercent = 0;
         if (signal.position === "long") {
-            // For long: positive if current > open, negative if current < open
-            revenuePercent = ((currentPrice - signal.priceOpen) / signal.priceOpen) * 100;
+            // For long: calculate progress towards TP or SL
+            const currentDistance = currentPrice - signal.priceOpen;
+            if (currentDistance > 0) {
+                // Moving towards TP
+                const tpDistance = signal.priceTakeProfit - signal.priceOpen;
+                const progressPercent = (currentDistance / tpDistance) * 100;
+                await self.params.partial.profit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialProfit) {
+                    self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
+            }
+            else if (currentDistance < 0) {
+                // Moving towards SL
+                const slDistance = signal.priceOpen - signal.priceStopLoss;
+                const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                await self.params.partial.loss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialLoss) {
+                    self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
+            }
         }
         else if (signal.position === "short") {
-            // For short: positive if current < open, negative if current > open
-            revenuePercent = ((signal.priceOpen - currentPrice) / signal.priceOpen) * 100;
-        }
-        // Call onPartialProfit if revenue is positive (but not reached TP yet)
-        if (revenuePercent > 0) {
-            // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-            await self.params.partial.profit(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-            if (self.params.callbacks?.onPartialProfit) {
-                self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest);
+            // For short: calculate progress towards TP or SL
+            const currentDistance = signal.priceOpen - currentPrice;
+            if (currentDistance > 0) {
+                // Moving towards TP
+                const tpDistance = signal.priceOpen - signal.priceTakeProfit;
+                const progressPercent = (currentDistance / tpDistance) * 100;
+                await self.params.partial.profit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialProfit) {
+                    self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
             }
-        }
-        // Call onPartialLoss if revenue is negative (but not hit SL yet)
-        if (revenuePercent < 0) {
-            // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-            await self.params.partial.loss(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-            if (self.params.callbacks?.onPartialLoss) {
-                self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest);
+            if (currentDistance < 0) {
+                // Moving towards SL
+                const slDistance = signal.priceStopLoss - signal.priceOpen;
+                const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                await self.params.partial.loss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialLoss) {
+                    self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
             }
         }
     }
@@ -2458,7 +2525,7 @@ const CLOSE_PENDING_SIGNAL_IN_BACKTEST_FN = async (self, signal, averagePrice, c
         self.params.callbacks.onClose(self.params.execution.context.symbol, signal, averagePrice, self.params.execution.context.backtest);
     }
     // КРИТИЧНО: Очищаем состояние ClientPartial при закрытии позиции
-    await self.params.partial.clear(self.params.execution.context.symbol, signal, averagePrice);
+    await self.params.partial.clear(self.params.execution.context.symbol, signal, averagePrice, self.params.execution.context.backtest);
     await self.params.risk.removeSignal(self.params.execution.context.symbol, {
         strategyName: self.params.method.context.strategyName,
         riskName: self.params.riskName,
@@ -2601,29 +2668,50 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles) => {
             return await CLOSE_PENDING_SIGNAL_IN_BACKTEST_FN(self, signal, closePrice, closeReason, currentCandleTimestamp);
         }
         // Call onPartialProfit/onPartialLoss callbacks during backtest candle processing
-        // Calculate revenue percentage
+        // Calculate percentage of path to TP/SL
         {
-            let revenuePercent = 0;
             if (signal.position === "long") {
-                revenuePercent = ((averagePrice - signal.priceOpen) / signal.priceOpen) * 100;
+                // For long: calculate progress towards TP or SL
+                const currentDistance = averagePrice - signal.priceOpen;
+                if (currentDistance > 0) {
+                    // Moving towards TP
+                    const tpDistance = signal.priceTakeProfit - signal.priceOpen;
+                    const progressPercent = (currentDistance / tpDistance) * 100;
+                    await self.params.partial.profit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialProfit) {
+                        self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
+                }
+                else if (currentDistance < 0) {
+                    // Moving towards SL
+                    const slDistance = signal.priceOpen - signal.priceStopLoss;
+                    const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                    await self.params.partial.loss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialLoss) {
+                        self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
+                }
             }
             else if (signal.position === "short") {
-                revenuePercent = ((signal.priceOpen - averagePrice) / signal.priceOpen) * 100;
-            }
-            // Call onPartialProfit if revenue is positive (but not reached TP yet)
-            if (revenuePercent > 0) {
-                // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-                await self.params.partial.profit(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-                if (self.params.callbacks?.onPartialProfit) {
-                    self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest);
+                // For short: calculate progress towards TP or SL
+                const currentDistance = signal.priceOpen - averagePrice;
+                if (currentDistance > 0) {
+                    // Moving towards TP
+                    const tpDistance = signal.priceOpen - signal.priceTakeProfit;
+                    const progressPercent = (currentDistance / tpDistance) * 100;
+                    await self.params.partial.profit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialProfit) {
+                        self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
                 }
-            }
-            // Call onPartialLoss if revenue is negative (but not hit SL yet)
-            if (revenuePercent < 0) {
-                // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-                await self.params.partial.loss(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-                if (self.params.callbacks?.onPartialLoss) {
-                    self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest);
+                if (currentDistance < 0) {
+                    // Moving towards SL
+                    const slDistance = signal.priceStopLoss - signal.priceOpen;
+                    const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                    await self.params.partial.loss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialLoss) {
+                        self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
                 }
             }
         }
@@ -5613,7 +5701,7 @@ const columns$4 = [
     {
         key: "note",
         label: "Note",
-        format: (data) => data.signal.note ?? "N/A",
+        format: (data) => toPlainString(data.signal.note ?? "N/A"),
     },
     {
         key: "openPrice",
@@ -6025,7 +6113,7 @@ const columns$3 = [
     {
         key: "note",
         label: "Note",
-        format: (data) => data.note ?? "N/A",
+        format: (data) => toPlainString(data.note ?? "N/A"),
     },
     {
         key: "currentPrice",
@@ -6552,7 +6640,7 @@ const columns$2 = [
     {
         key: "note",
         label: "Note",
-        format: (data) => data.note ?? "N/A",
+        format: (data) => toPlainString(data.note ?? "N/A"),
     },
     {
         key: "currentPrice",
@@ -8764,6 +8852,8 @@ class OptimizerTemplateService {
                 interval,
                 prompt,
             });
+            // Convert prompt to plain text first
+            const plainPrompt = toPlainString(prompt);
             // Escape special characters to prevent code injection
             const escapedStrategyName = String(strategyName)
                 .replace(/\\/g, '\\\\')
@@ -8771,7 +8861,7 @@ class OptimizerTemplateService {
             const escapedInterval = String(interval)
                 .replace(/\\/g, '\\\\')
                 .replace(/"/g, '\\"');
-            const escapedPrompt = String(prompt)
+            const escapedPrompt = String(plainPrompt)
                 .replace(/\\/g, '\\\\')
                 .replace(/`/g, '\\`')
                 .replace(/\$/g, '\\$');
@@ -9952,7 +10042,7 @@ const HANDLE_PROFIT_FN = async (symbol, data, currentPrice, revenuePercent, back
         }
     }
     if (shouldPersist) {
-        await self._persistState(symbol);
+        await self._persistState(symbol, backtest);
     }
 };
 /**
@@ -9999,7 +10089,7 @@ const HANDLE_LOSS_FN = async (symbol, data, currentPrice, lossPercent, backtest,
         }
     }
     if (shouldPersist) {
-        await self._persistState(symbol);
+        await self._persistState(symbol, backtest);
     }
 };
 /**
@@ -10135,7 +10225,10 @@ class ClientPartial {
      * @param symbol - Trading pair symbol
      * @returns Promise that resolves when persistence is complete
      */
-    async _persistState(symbol) {
+    async _persistState(symbol, backtest) {
+        if (backtest) {
+            return;
+        }
         this.params.logger.debug("ClientPartial persistState", { symbol });
         if (this._states === NEED_FETCH) {
             throw new Error("ClientPartial not initialized. Call waitForInit() before using.");
@@ -10258,7 +10351,7 @@ class ClientPartial {
      * // Cleanup: PartialConnectionService.getPartial.clear(signal.id)
      * ```
      */
-    async clear(symbol, data, priceClose) {
+    async clear(symbol, data, priceClose, backtest) {
         this.params.logger.log("ClientPartial clear", {
             symbol,
             data,
@@ -10268,7 +10361,7 @@ class ClientPartial {
             throw new Error("ClientPartial not initialized. Call waitForInit() before using.");
         }
         this._states.delete(data.id);
-        await this._persistState(symbol);
+        await this._persistState(symbol, backtest);
     }
 }
 
@@ -10439,7 +10532,7 @@ class PartialConnectionService {
          * @param priceClose - Final closing price
          * @returns Promise that resolves when clear is complete
          */
-        this.clear = async (symbol, data, priceClose) => {
+        this.clear = async (symbol, data, priceClose, backtest) => {
             this.loggerService.log("partialConnectionService profit", {
                 symbol,
                 data,
@@ -10447,7 +10540,7 @@ class PartialConnectionService {
             });
             const partial = this.getPartial(data.id);
             await partial.waitForInit(symbol);
-            await partial.clear(symbol, data, priceClose);
+            await partial.clear(symbol, data, priceClose, backtest);
             this.getPartial.clear(data.id);
         };
     }
@@ -10916,13 +11009,14 @@ class PartialGlobalService {
          * @param priceClose - Final closing price
          * @returns Promise that resolves when clear is complete
          */
-        this.clear = async (symbol, data, priceClose) => {
+        this.clear = async (symbol, data, priceClose, backtest) => {
             this.loggerService.log("partialGlobalService profit", {
                 symbol,
                 data,
                 priceClose,
+                backtest,
             });
-            return await this.partialConnectionService.clear(symbol, data, priceClose);
+            return await this.partialConnectionService.clear(symbol, data, priceClose, backtest);
         };
     }
 }

package/build/index.mjs

@@ -1698,6 +1698,53 @@ var emitters = /*#__PURE__*/Object.freeze({
     walkerStopSubject: walkerStopSubject
 });
 
+/**
+ * Converts markdown content to plain text with minimal formatting
+ * @param content - Markdown string to convert
+ * @returns Plain text representation
+ */
+const toPlainString = (content) => {
+    if (!content) {
+        return "";
+    }
+    let text = content;
+    // Remove code blocks
+    text = text.replace(/```[\s\S]*?```/g, "");
+    text = text.replace(/`([^`]+)`/g, "$1");
+    // Remove images
+    text = text.replace(/!\[([^\]]*)\]\([^)]+\)/g, "$1");
+    // Convert links to text only (keep link text, remove URL)
+    text = text.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1");
+    // Remove headers (convert to plain text)
+    text = text.replace(/^#{1,6}\s+(.+)$/gm, "$1");
+    // Remove bold and italic markers
+    text = text.replace(/\*\*\*(.+?)\*\*\*/g, "$1");
+    text = text.replace(/\*\*(.+?)\*\*/g, "$1");
+    text = text.replace(/\*(.+?)\*/g, "$1");
+    text = text.replace(/___(.+?)___/g, "$1");
+    text = text.replace(/__(.+?)__/g, "$1");
+    text = text.replace(/_(.+?)_/g, "$1");
+    // Remove strikethrough
+    text = text.replace(/~~(.+?)~~/g, "$1");
+    // Convert lists to plain text with bullets
+    text = text.replace(/^\s*[-*+]\s+/gm, "• ");
+    text = text.replace(/^\s*\d+\.\s+/gm, "• ");
+    // Remove blockquotes
+    text = text.replace(/^\s*>\s+/gm, "");
+    // Remove horizontal rules
+    text = text.replace(/^(\*{3,}|-{3,}|_{3,})$/gm, "");
+    // Remove HTML tags
+    text = text.replace(/<[^>]+>/g, "");
+    // Remove excessive whitespace and normalize line breaks
+    text = text.replace(/\n[\s\n]*\n/g, "\n");
+    text = text.replace(/[ \t]+/g, " ");
+    // Remove all newline characters
+    text = text.replace(/\n/g, " ");
+    // Remove excessive spaces after newline removal
+    text = text.replace(/\s+/g, " ");
+    return text.trim();
+};
+
 const INTERVAL_MINUTES$1 = {
     "1m": 1,
     "3m": 3,
@@ -1910,7 +1957,7 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
                 id: randomString(),
                 priceOpen: signal.priceOpen, // Используем priceOpen из сигнала
                 position: signal.position,
-                note: signal.note,
+                note: toPlainString(signal.note),
                 priceTakeProfit: signal.priceTakeProfit,
                 priceStopLoss: signal.priceStopLoss,
                 minuteEstimatedTime: signal.minuteEstimatedTime,
@@ -1930,7 +1977,7 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
             id: randomString(),
             priceOpen: signal.priceOpen,
             position: signal.position,
-            note: signal.note,
+            note: toPlainString(signal.note),
             priceTakeProfit: signal.priceTakeProfit,
             priceStopLoss: signal.priceStopLoss,
             minuteEstimatedTime: signal.minuteEstimatedTime,
@@ -1949,6 +1996,7 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
         id: randomString(),
         priceOpen: currentPrice,
         ...signal,
+        note: toPlainString(signal.note),
         symbol: self.params.execution.context.symbol,
         exchangeName: self.params.method.context.exchangeName,
         strategyName: self.params.method.context.strategyName,
@@ -2277,7 +2325,7 @@ const CLOSE_PENDING_SIGNAL_FN = async (self, signal, currentPrice, closeReason)
         self.params.callbacks.onClose(self.params.execution.context.symbol, signal, currentPrice, self.params.execution.context.backtest);
     }
     // КРИТИЧНО: Очищаем состояние ClientPartial при закрытии позиции
-    await self.params.partial.clear(self.params.execution.context.symbol, signal, currentPrice);
+    await self.params.partial.clear(self.params.execution.context.symbol, signal, currentPrice, self.params.execution.context.backtest);
     await self.params.risk.removeSignal(self.params.execution.context.symbol, {
         strategyName: self.params.method.context.strategyName,
         riskName: self.params.riskName,
@@ -2300,31 +2348,50 @@ const CLOSE_PENDING_SIGNAL_FN = async (self, signal, currentPrice, closeReason)
     return result;
 };
 const RETURN_PENDING_SIGNAL_ACTIVE_FN = async (self, signal, currentPrice) => {
-    // Calculate revenue percentage for partial fill/loss callbacks
+    // Calculate percentage of path to TP/SL for partial fill/loss callbacks
     {
-        let revenuePercent = 0;
         if (signal.position === "long") {
-            // For long: positive if current > open, negative if current < open
-            revenuePercent = ((currentPrice - signal.priceOpen) / signal.priceOpen) * 100;
+            // For long: calculate progress towards TP or SL
+            const currentDistance = currentPrice - signal.priceOpen;
+            if (currentDistance > 0) {
+                // Moving towards TP
+                const tpDistance = signal.priceTakeProfit - signal.priceOpen;
+                const progressPercent = (currentDistance / tpDistance) * 100;
+                await self.params.partial.profit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialProfit) {
+                    self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
+            }
+            else if (currentDistance < 0) {
+                // Moving towards SL
+                const slDistance = signal.priceOpen - signal.priceStopLoss;
+                const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                await self.params.partial.loss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialLoss) {
+                    self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
+            }
         }
         else if (signal.position === "short") {
-            // For short: positive if current < open, negative if current > open
-            revenuePercent = ((signal.priceOpen - currentPrice) / signal.priceOpen) * 100;
-        }
-        // Call onPartialProfit if revenue is positive (but not reached TP yet)
-        if (revenuePercent > 0) {
-            // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-            await self.params.partial.profit(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-            if (self.params.callbacks?.onPartialProfit) {
-                self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest);
+            // For short: calculate progress towards TP or SL
+            const currentDistance = signal.priceOpen - currentPrice;
+            if (currentDistance > 0) {
+                // Moving towards TP
+                const tpDistance = signal.priceOpen - signal.priceTakeProfit;
+                const progressPercent = (currentDistance / tpDistance) * 100;
+                await self.params.partial.profit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialProfit) {
+                    self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
             }
-        }
-        // Call onPartialLoss if revenue is negative (but not hit SL yet)
-        if (revenuePercent < 0) {
-            // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-            await self.params.partial.loss(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-            if (self.params.callbacks?.onPartialLoss) {
-                self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, currentPrice, revenuePercent, self.params.execution.context.backtest);
+            if (currentDistance < 0) {
+                // Moving towards SL
+                const slDistance = signal.priceStopLoss - signal.priceOpen;
+                const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                await self.params.partial.loss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                if (self.params.callbacks?.onPartialLoss) {
+                    self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, currentPrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                }
             }
         }
     }
@@ -2456,7 +2523,7 @@ const CLOSE_PENDING_SIGNAL_IN_BACKTEST_FN = async (self, signal, averagePrice, c
         self.params.callbacks.onClose(self.params.execution.context.symbol, signal, averagePrice, self.params.execution.context.backtest);
     }
     // КРИТИЧНО: Очищаем состояние ClientPartial при закрытии позиции
-    await self.params.partial.clear(self.params.execution.context.symbol, signal, averagePrice);
+    await self.params.partial.clear(self.params.execution.context.symbol, signal, averagePrice, self.params.execution.context.backtest);
     await self.params.risk.removeSignal(self.params.execution.context.symbol, {
         strategyName: self.params.method.context.strategyName,
         riskName: self.params.riskName,
@@ -2599,29 +2666,50 @@ const PROCESS_PENDING_SIGNAL_CANDLES_FN = async (self, signal, candles) => {
             return await CLOSE_PENDING_SIGNAL_IN_BACKTEST_FN(self, signal, closePrice, closeReason, currentCandleTimestamp);
         }
         // Call onPartialProfit/onPartialLoss callbacks during backtest candle processing
-        // Calculate revenue percentage
+        // Calculate percentage of path to TP/SL
         {
-            let revenuePercent = 0;
             if (signal.position === "long") {
-                revenuePercent = ((averagePrice - signal.priceOpen) / signal.priceOpen) * 100;
+                // For long: calculate progress towards TP or SL
+                const currentDistance = averagePrice - signal.priceOpen;
+                if (currentDistance > 0) {
+                    // Moving towards TP
+                    const tpDistance = signal.priceTakeProfit - signal.priceOpen;
+                    const progressPercent = (currentDistance / tpDistance) * 100;
+                    await self.params.partial.profit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialProfit) {
+                        self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
+                }
+                else if (currentDistance < 0) {
+                    // Moving towards SL
+                    const slDistance = signal.priceOpen - signal.priceStopLoss;
+                    const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                    await self.params.partial.loss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialLoss) {
+                        self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
+                }
             }
             else if (signal.position === "short") {
-                revenuePercent = ((signal.priceOpen - averagePrice) / signal.priceOpen) * 100;
-            }
-            // Call onPartialProfit if revenue is positive (but not reached TP yet)
-            if (revenuePercent > 0) {
-                // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-                await self.params.partial.profit(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-                if (self.params.callbacks?.onPartialProfit) {
-                    self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest);
+                // For short: calculate progress towards TP or SL
+                const currentDistance = signal.priceOpen - averagePrice;
+                if (currentDistance > 0) {
+                    // Moving towards TP
+                    const tpDistance = signal.priceOpen - signal.priceTakeProfit;
+                    const progressPercent = (currentDistance / tpDistance) * 100;
+                    await self.params.partial.profit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialProfit) {
+                        self.params.callbacks.onPartialProfit(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
                 }
-            }
-            // Call onPartialLoss if revenue is negative (but not hit SL yet)
-            if (revenuePercent < 0) {
-                // КРИТИЧНО: Вызываем ClientPartial для отслеживания уровней
-                await self.params.partial.loss(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest, self.params.execution.context.when);
-                if (self.params.callbacks?.onPartialLoss) {
-                    self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, averagePrice, revenuePercent, self.params.execution.context.backtest);
+                if (currentDistance < 0) {
+                    // Moving towards SL
+                    const slDistance = signal.priceStopLoss - signal.priceOpen;
+                    const progressPercent = (Math.abs(currentDistance) / slDistance) * 100;
+                    await self.params.partial.loss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest, self.params.execution.context.when);
+                    if (self.params.callbacks?.onPartialLoss) {
+                        self.params.callbacks.onPartialLoss(self.params.execution.context.symbol, signal, averagePrice, Math.min(progressPercent, 100), self.params.execution.context.backtest);
+                    }
                 }
             }
         }
@@ -5611,7 +5699,7 @@ const columns$4 = [
     {
         key: "note",
         label: "Note",
-        format: (data) => data.signal.note ?? "N/A",
+        format: (data) => toPlainString(data.signal.note ?? "N/A"),
     },
     {
         key: "openPrice",
@@ -6023,7 +6111,7 @@ const columns$3 = [
     {
         key: "note",
         label: "Note",
-        format: (data) => data.note ?? "N/A",
+        format: (data) => toPlainString(data.note ?? "N/A"),
     },
     {
         key: "currentPrice",
@@ -6550,7 +6638,7 @@ const columns$2 = [
     {
         key: "note",
         label: "Note",
-        format: (data) => data.note ?? "N/A",
+        format: (data) => toPlainString(data.note ?? "N/A"),
     },
     {
         key: "currentPrice",
@@ -8762,6 +8850,8 @@ class OptimizerTemplateService {
                 interval,
                 prompt,
             });
+            // Convert prompt to plain text first
+            const plainPrompt = toPlainString(prompt);
             // Escape special characters to prevent code injection
             const escapedStrategyName = String(strategyName)
                 .replace(/\\/g, '\\\\')
@@ -8769,7 +8859,7 @@ class OptimizerTemplateService {
             const escapedInterval = String(interval)
                 .replace(/\\/g, '\\\\')
                 .replace(/"/g, '\\"');
-            const escapedPrompt = String(prompt)
+            const escapedPrompt = String(plainPrompt)
                 .replace(/\\/g, '\\\\')
                 .replace(/`/g, '\\`')
                 .replace(/\$/g, '\\$');
@@ -9950,7 +10040,7 @@ const HANDLE_PROFIT_FN = async (symbol, data, currentPrice, revenuePercent, back
         }
     }
     if (shouldPersist) {
-        await self._persistState(symbol);
+        await self._persistState(symbol, backtest);
     }
 };
 /**
@@ -9997,7 +10087,7 @@ const HANDLE_LOSS_FN = async (symbol, data, currentPrice, lossPercent, backtest,
         }
     }
     if (shouldPersist) {
-        await self._persistState(symbol);
+        await self._persistState(symbol, backtest);
     }
 };
 /**
@@ -10133,7 +10223,10 @@ class ClientPartial {
      * @param symbol - Trading pair symbol
      * @returns Promise that resolves when persistence is complete
      */
-    async _persistState(symbol) {
+    async _persistState(symbol, backtest) {
+        if (backtest) {
+            return;
+        }
         this.params.logger.debug("ClientPartial persistState", { symbol });
         if (this._states === NEED_FETCH) {
             throw new Error("ClientPartial not initialized. Call waitForInit() before using.");
@@ -10256,7 +10349,7 @@ class ClientPartial {
      * // Cleanup: PartialConnectionService.getPartial.clear(signal.id)
      * ```
      */
-    async clear(symbol, data, priceClose) {
+    async clear(symbol, data, priceClose, backtest) {
         this.params.logger.log("ClientPartial clear", {
             symbol,
             data,
@@ -10266,7 +10359,7 @@ class ClientPartial {
             throw new Error("ClientPartial not initialized. Call waitForInit() before using.");
         }
         this._states.delete(data.id);
-        await this._persistState(symbol);
+        await this._persistState(symbol, backtest);
     }
 }
 
@@ -10437,7 +10530,7 @@ class PartialConnectionService {
          * @param priceClose - Final closing price
          * @returns Promise that resolves when clear is complete
          */
-        this.clear = async (symbol, data, priceClose) => {
+        this.clear = async (symbol, data, priceClose, backtest) => {
             this.loggerService.log("partialConnectionService profit", {
                 symbol,
                 data,
@@ -10445,7 +10538,7 @@ class PartialConnectionService {
             });
             const partial = this.getPartial(data.id);
             await partial.waitForInit(symbol);
-            await partial.clear(symbol, data, priceClose);
+            await partial.clear(symbol, data, priceClose, backtest);
             this.getPartial.clear(data.id);
         };
     }
@@ -10914,13 +11007,14 @@ class PartialGlobalService {
          * @param priceClose - Final closing price
          * @returns Promise that resolves when clear is complete
          */
-        this.clear = async (symbol, data, priceClose) => {
+        this.clear = async (symbol, data, priceClose, backtest) => {
             this.loggerService.log("partialGlobalService profit", {
                 symbol,
                 data,
                 priceClose,
+                backtest,
             });
-            return await this.partialConnectionService.clear(symbol, data, priceClose);
+            return await this.partialConnectionService.clear(symbol, data, priceClose, backtest);
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backtest-kit",
-  "version": "1.4.15",
+  "version": "1.5.0",
   "description": "A TypeScript library for trading system backtest",
   "author": {
     "name": "Petr Tripolsky",

package/types.d.ts

@@ -723,7 +723,7 @@ interface IPartial {
      * // Memoized instance cleared from getPartial cache
      * ```
      */
-    clear(symbol: string, data: ISignalRow, priceClose: number): Promise<void>;
+    clear(symbol: string, data: ISignalRow, priceClose: number, backtest: boolean): Promise<void>;
 }
 
 /**
@@ -8661,7 +8661,7 @@ declare class PartialConnectionService implements IPartial {
      * @param priceClose - Final closing price
      * @returns Promise that resolves when clear is complete
      */
-    clear: (symbol: string, data: ISignalRow, priceClose: number) => Promise<void>;
+    clear: (symbol: string, data: ISignalRow, priceClose: number, backtest: boolean) => Promise<void>;
 }
 
 /**
@@ -8742,7 +8742,7 @@ declare class PartialGlobalService {
      * @param priceClose - Final closing price
      * @returns Promise that resolves when clear is complete
      */
-    clear: (symbol: string, data: ISignalRow, priceClose: number) => Promise<void>;
+    clear: (symbol: string, data: ISignalRow, priceClose: number, backtest: boolean) => Promise<void>;
 }
 
 /**