backtest-kit 7.8.0 → 8.0.0

package/build/index.cjs

@@ -5545,6 +5545,10 @@ const GET_SIGNAL_FN = functoolsKit.trycatch(async (self) => {
                 _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 },
             };
+            {
+                const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(signalRow, signal.priceOpen);
+                signalRow._fall = { price: signal.priceOpen, timestamp: currentTime, pnlPercentage, pnlCost, priceClose, priceOpen, pnlEntries };
+            }
             // Валидируем сигнал перед возвратом
             validatePendingSignal(signalRow, currentPrice);
             return signalRow;
@@ -5594,6 +5598,10 @@ const GET_SIGNAL_FN = functoolsKit.trycatch(async (self) => {
         _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 },
     };
+    {
+        const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(signalRow, currentPrice);
+        signalRow._fall = { price: currentPrice, timestamp: currentTime, pnlPercentage, pnlCost, priceClose, priceOpen, pnlEntries };
+    }
     // Валидируем сигнал перед возвратом
     validatePendingSignal(signalRow, currentPrice);
     return signalRow;
@@ -6306,6 +6314,10 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
         _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 },
     };
+    {
+        const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(activatedSignal, activatedSignal.priceOpen);
+        activatedSignal._fall = { price: activatedSignal.priceOpen, timestamp: activationTime, pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen };
+    }
     // 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);
     if (!syncOpenAllowed) {
@@ -7189,6 +7201,10 @@ const ACTIVATE_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, activat
         _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 },
     };
+    {
+        const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(activatedSignal, activatedSignal.priceOpen);
+        activatedSignal._fall = { price: activatedSignal.priceOpen, timestamp: activationTime, pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen };
+    }
     // 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);
     if (!syncOpenAllowed) {
@@ -7386,6 +7402,10 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
                 _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 },
             };
+            {
+                const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(pendingSignal, pendingSignal.priceOpen);
+                pendingSignal._fall = { price: pendingSignal.priceOpen, timestamp: candle.timestamp, pnlPercentage, pnlCost, priceClose, priceOpen, pnlEntries };
+            }
             // 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);
             if (!syncOpenAllowed) {
@@ -8830,6 +8850,10 @@ class ClientStrategy {
                 _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 { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(pendingSignal, pendingSignal.priceOpen);
+                pendingSignal._fall = { price: pendingSignal.priceOpen, timestamp: currentTime, pnlPercentage, pnlCost, priceClose, pnlEntries, priceOpen };
+            }
             const syncOpenAllowed = await CALL_SIGNAL_SYNC_OPEN_FN(currentTime, currentPrice, pendingSignal, this);
             if (!syncOpenAllowed) {
                 this.params.logger.info("ClientStrategy tick: user-activated signal rejected by sync", {
@@ -19393,6 +19417,24 @@ const heat_columns = [
         format: (data) => data.avgFallPnl !== null ? functoolsKit.str(data.avgFallPnl, "%") : "N/A",
         isVisible: () => true,
     },
+    {
+        key: "sortinoRatio",
+        label: "Sortino",
+        format: (data) => data.sortinoRatio !== null ? functoolsKit.str(data.sortinoRatio) : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "calmarRatio",
+        label: "Calmar",
+        format: (data) => data.calmarRatio !== null ? functoolsKit.str(data.calmarRatio) : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "recoveryFactor",
+        label: "Recovery",
+        format: (data) => data.recoveryFactor !== null ? functoolsKit.str(data.recoveryFactor) : "N/A",
+        isVisible: () => true,
+    },
 ];
 
 /**
@@ -20955,6 +20997,30 @@ const walker_strategy_columns = [
             : "N/A",
         isVisible: () => true,
     },
+    {
+        key: "sortinoRatio",
+        label: "Sortino",
+        format: (data) => data.stats.sortinoRatio !== null
+            ? `${data.stats.sortinoRatio.toFixed(3)}`
+            : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "calmarRatio",
+        label: "Calmar",
+        format: (data) => data.stats.calmarRatio !== null
+            ? `${data.stats.calmarRatio.toFixed(3)}`
+            : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "recoveryFactor",
+        label: "Recovery",
+        format: (data) => data.stats.recoveryFactor !== null
+            ? `${data.stats.recoveryFactor.toFixed(3)}`
+            : "N/A",
+        isVisible: () => true,
+    },
     {
         key: "firstEventTime",
         label: "First Event",
@@ -21504,13 +21570,13 @@ class ReportBase {
          * Waits for drain event if write buffer is full.
          * Times out after 15 seconds and returns TIMEOUT_SYMBOL.
          */
-        this[_d] = functoolsKit.timeout(async (line) => {
+        this[_d] = functoolsKit.queued(functoolsKit.timeout(async (line) => {
             if (!this._stream.write(line)) {
                 await new Promise((resolve) => {
                     this._stream.once("drain", resolve);
                 });
             }
-        }, 15000);
+        }, 15000));
         LOGGER_SERVICE$3.debug(REPORT_BASE_METHOD_NAME_CTOR, {
             reportName: this.reportName,
             baseDir,
@@ -21798,6 +21864,9 @@ let ReportStorage$a = class ReportStorage {
                 expectedYearlyReturns: null,
                 avgPeakPnl: null,
                 avgFallPnl: null,
+                sortinoRatio: null,
+                calmarRatio: null,
+                recoveryFactor: null,
             };
         }
         const totalSignals = this._signalList.length;
@@ -21831,6 +21900,16 @@ let ReportStorage$a = class ReportStorage {
         // Calculate average peak and fall PNL across all signals
         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;
+        // Downside per signal: maxDrawdown.pnlPercentage captures the worst intra-trade dip
+        const fallReturns = this._signalList.map((s) => s.signal.maxDrawdown?.pnlPercentage ?? 0);
+        // Calculate Sortino Ratio: avgPnl / stdDev(maxDrawdown per signal)
+        const fallVariance = fallReturns.reduce((sum, r) => sum + Math.pow(r, 2), 0) / totalSignals;
+        const fallDeviation = Math.sqrt(fallVariance);
+        const sortinoRatio = fallDeviation > 0 ? avgPnl / fallDeviation : 0;
+        // Avg absolute peak drawdown per signal — used as denominator for Calmar and Recovery
+        const avgAbsFall = fallReturns.reduce((sum, r) => sum + Math.abs(r), 0) / totalSignals;
+        const calmarRatio = avgAbsFall > 0 ? expectedYearlyReturns / avgAbsFall : 0;
+        const recoveryFactor = avgAbsFall > 0 ? totalPnl / avgAbsFall : 0;
         return {
             signalList: this._signalList,
             totalSignals,
@@ -21846,6 +21925,9 @@ let ReportStorage$a = class ReportStorage {
             expectedYearlyReturns: isUnsafe$3(expectedYearlyReturns) ? null : expectedYearlyReturns,
             avgPeakPnl: isUnsafe$3(avgPeakPnl) ? null : avgPeakPnl,
             avgFallPnl: isUnsafe$3(avgFallPnl) ? null : avgFallPnl,
+            sortinoRatio: isUnsafe$3(sortinoRatio) ? null : sortinoRatio,
+            calmarRatio: isUnsafe$3(calmarRatio) ? null : calmarRatio,
+            recoveryFactor: isUnsafe$3(recoveryFactor) ? null : recoveryFactor,
         };
     }
     /**
@@ -21892,6 +21974,9 @@ let ReportStorage$a = class ReportStorage {
             `**Expected Yearly Returns:** ${stats.expectedYearlyReturns === null ? "N/A" : `${stats.expectedYearlyReturns > 0 ? "+" : ""}${stats.expectedYearlyReturns.toFixed(2)}% (higher is better)`}`,
             `**Avg Peak PNL:** ${stats.avgPeakPnl === null ? "N/A" : `${stats.avgPeakPnl > 0 ? "+" : ""}${stats.avgPeakPnl.toFixed(2)}% (higher is better)`}`,
             `**Avg Max Drawdown PNL:** ${stats.avgFallPnl === null ? "N/A" : `${stats.avgFallPnl.toFixed(2)}% (closer to 0 is better)`}`,
+            `**Sortino Ratio:** ${stats.sortinoRatio === null ? "N/A" : `${stats.sortinoRatio.toFixed(3)} (higher is better)`}`,
+            `**Calmar Ratio:** ${stats.calmarRatio === null ? "N/A" : `${stats.calmarRatio.toFixed(3)} (higher is better)`}`,
+            `**Recovery Factor:** ${stats.recoveryFactor === null ? "N/A" : `${stats.recoveryFactor.toFixed(3)} (higher is better)`}`,
         ].join("\n");
     }
     /**
@@ -22492,6 +22577,9 @@ let ReportStorage$9 = class ReportStorage {
                 expectedYearlyReturns: null,
                 avgPeakPnl: null,
                 avgFallPnl: null,
+                sortinoRatio: null,
+                calmarRatio: null,
+                recoveryFactor: null,
             };
         }
         const closedEvents = this._eventList.filter((e) => e.action === "closed");
@@ -22541,6 +22629,21 @@ let ReportStorage$9 = class ReportStorage {
         const avgFallPnl = totalClosed > 0
             ? closedEvents.reduce((sum, e) => sum + (e.fallPnl || 0), 0) / totalClosed
             : 0;
+        // Downside per signal: fallPnl captures the worst intra-trade dip (maxDrawdown.pnlPercentage)
+        const fallReturns = closedEvents.map((e) => e.fallPnl || 0);
+        // Calculate Sortino Ratio: avgPnl / stdDev(maxDrawdown per signal)
+        let sortinoRatio = 0;
+        if (totalClosed > 0) {
+            const fallVariance = fallReturns.reduce((sum, r) => sum + Math.pow(r, 2), 0) / totalClosed;
+            const fallDeviation = Math.sqrt(fallVariance);
+            sortinoRatio = fallDeviation > 0 ? avgPnl / fallDeviation : 0;
+        }
+        // Avg absolute peak drawdown per signal — denominator for Calmar and Recovery
+        const avgAbsFall = totalClosed > 0
+            ? fallReturns.reduce((sum, r) => sum + Math.abs(r), 0) / totalClosed
+            : 0;
+        const calmarRatio = avgAbsFall > 0 ? expectedYearlyReturns / avgAbsFall : 0;
+        const recoveryFactor = avgAbsFall > 0 ? totalPnl / avgAbsFall : 0;
         return {
             eventList: this._eventList,
             totalEvents: this._eventList.length,
@@ -22557,6 +22660,9 @@ let ReportStorage$9 = class ReportStorage {
             expectedYearlyReturns: isUnsafe$2(expectedYearlyReturns) ? null : expectedYearlyReturns,
             avgPeakPnl: isUnsafe$2(avgPeakPnl) ? null : avgPeakPnl,
             avgFallPnl: isUnsafe$2(avgFallPnl) ? null : avgFallPnl,
+            sortinoRatio: isUnsafe$2(sortinoRatio) ? null : sortinoRatio,
+            calmarRatio: isUnsafe$2(calmarRatio) ? null : calmarRatio,
+            recoveryFactor: isUnsafe$2(recoveryFactor) ? null : recoveryFactor,
         };
     }
     /**
@@ -22603,6 +22709,9 @@ let ReportStorage$9 = class ReportStorage {
             `**Expected Yearly Returns:** ${stats.expectedYearlyReturns === null ? "N/A" : `${stats.expectedYearlyReturns > 0 ? "+" : ""}${stats.expectedYearlyReturns.toFixed(2)}% (higher is better)`}`,
             `**Avg Peak PNL:** ${stats.avgPeakPnl === null ? "N/A" : `${stats.avgPeakPnl > 0 ? "+" : ""}${stats.avgPeakPnl.toFixed(2)}% (higher is better)`}`,
             `**Avg Max Drawdown PNL:** ${stats.avgFallPnl === null ? "N/A" : `${stats.avgFallPnl.toFixed(2)}% (closer to 0 is better)`}`,
+            `**Sortino Ratio:** ${stats.sortinoRatio === null ? "N/A" : `${stats.sortinoRatio.toFixed(3)} (higher is better)`}`,
+            `**Calmar Ratio:** ${stats.calmarRatio === null ? "N/A" : `${stats.calmarRatio.toFixed(3)} (higher is better)`}`,
+            `**Recovery Factor:** ${stats.recoveryFactor === null ? "N/A" : `${stats.recoveryFactor.toFixed(3)} (higher is better)`}`,
         ].join("\n");
     }
     /**
@@ -24048,6 +24157,9 @@ let ReportStorage$7 = class ReportStorage {
             "",
             `**Best ${results.metric}:** ${formatMetric(results.bestMetric)}`,
             `**Total Signals:** ${bestStrategySignals}`,
+            `**Sortino Ratio:** ${results.bestStats?.sortinoRatio != null ? `${results.bestStats.sortinoRatio.toFixed(3)} (higher is better)` : "N/A"}`,
+            `**Calmar Ratio:** ${results.bestStats?.calmarRatio != null ? `${results.bestStats.calmarRatio.toFixed(3)} (higher is better)` : "N/A"}`,
+            `**Recovery Factor:** ${results.bestStats?.recoveryFactor != null ? `${results.bestStats.recoveryFactor.toFixed(3)} (higher is better)` : "N/A"}`,
             "",
             "## Top Strategies Comparison",
             "",
@@ -24514,6 +24626,27 @@ class HeatmapStorage {
             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;
         }
+        // Downside per signal: maxDrawdown.pnlPercentage captures the worst intra-trade dip
+        const fallReturns = signals.map((s) => s.signal.maxDrawdown?.pnlPercentage ?? 0);
+        // Calculate Sortino Ratio: avgPnl / stdDev(maxDrawdown per signal)
+        let sortinoRatio = null;
+        if (signals.length > 0 && avgPnl !== null) {
+            const fallVariance = fallReturns.reduce((acc, r) => acc + Math.pow(r, 2), 0) / signals.length;
+            const fallDeviation = Math.sqrt(fallVariance);
+            if (fallDeviation > 0) {
+                sortinoRatio = avgPnl / fallDeviation;
+            }
+        }
+        // Avg absolute peak drawdown per signal — denominator for Calmar and Recovery
+        const avgAbsFall = signals.length > 0
+            ? fallReturns.reduce((acc, r) => acc + Math.abs(r), 0) / signals.length
+            : 0;
+        let calmarRatio = null;
+        let recoveryFactor = null;
+        if (avgAbsFall > 0 && totalPnl !== null) {
+            calmarRatio = totalPnl / avgAbsFall;
+            recoveryFactor = totalPnl / avgAbsFall;
+        }
         // Apply safe math checks
         if (isUnsafe(winRate))
             winRate = null;
@@ -24539,6 +24672,12 @@ class HeatmapStorage {
             avgPeakPnl = null;
         if (isUnsafe(avgFallPnl))
             avgFallPnl = null;
+        if (isUnsafe(sortinoRatio))
+            sortinoRatio = null;
+        if (isUnsafe(calmarRatio))
+            calmarRatio = null;
+        if (isUnsafe(recoveryFactor))
+            recoveryFactor = null;
         return {
             symbol,
             totalPnl,
@@ -24558,6 +24697,9 @@ class HeatmapStorage {
             expectancy,
             avgPeakPnl,
             avgFallPnl,
+            sortinoRatio,
+            calmarRatio,
+            recoveryFactor,
         };
     }
     /**
@@ -29424,6 +29566,9 @@ class WalkerReportService {
                 annualizedSharpeRatio: data.stats.annualizedSharpeRatio,
                 certaintyRatio: data.stats.certaintyRatio,
                 expectedYearlyReturns: data.stats.expectedYearlyReturns,
+                sortinoRatio: data.stats.sortinoRatio,
+                calmarRatio: data.stats.calmarRatio,
+                recoveryFactor: data.stats.recoveryFactor,
                 firstEventTime,
                 lastEventTime,
             }, {

package/build/index.mjs

@@ -5525,6 +5525,10 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
                 _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 },
             };
+            {
+                const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(signalRow, signal.priceOpen);
+                signalRow._fall = { price: signal.priceOpen, timestamp: currentTime, pnlPercentage, pnlCost, priceClose, priceOpen, pnlEntries };
+            }
             // Валидируем сигнал перед возвратом
             validatePendingSignal(signalRow, currentPrice);
             return signalRow;
@@ -5574,6 +5578,10 @@ const GET_SIGNAL_FN = trycatch(async (self) => {
         _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 },
     };
+    {
+        const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(signalRow, currentPrice);
+        signalRow._fall = { price: currentPrice, timestamp: currentTime, pnlPercentage, pnlCost, priceClose, priceOpen, pnlEntries };
+    }
     // Валидируем сигнал перед возвратом
     validatePendingSignal(signalRow, currentPrice);
     return signalRow;
@@ -6286,6 +6294,10 @@ const ACTIVATE_SCHEDULED_SIGNAL_FN = async (self, scheduled, activationTimestamp
         _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 },
     };
+    {
+        const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(activatedSignal, activatedSignal.priceOpen);
+        activatedSignal._fall = { price: activatedSignal.priceOpen, timestamp: activationTime, pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen };
+    }
     // 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);
     if (!syncOpenAllowed) {
@@ -7169,6 +7181,10 @@ const ACTIVATE_SCHEDULED_SIGNAL_IN_BACKTEST_FN = async (self, scheduled, activat
         _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 },
     };
+    {
+        const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(activatedSignal, activatedSignal.priceOpen);
+        activatedSignal._fall = { price: activatedSignal.priceOpen, timestamp: activationTime, pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen };
+    }
     // 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);
     if (!syncOpenAllowed) {
@@ -7366,6 +7382,10 @@ const PROCESS_SCHEDULED_SIGNAL_CANDLES_FN = async (self, scheduled, candles, fra
                 _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 },
             };
+            {
+                const { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(pendingSignal, pendingSignal.priceOpen);
+                pendingSignal._fall = { price: pendingSignal.priceOpen, timestamp: candle.timestamp, pnlPercentage, pnlCost, priceClose, priceOpen, pnlEntries };
+            }
             // 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);
             if (!syncOpenAllowed) {
@@ -8810,6 +8830,10 @@ class ClientStrategy {
                 _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 { pnlPercentage, pnlCost, pnlEntries, priceClose, priceOpen } = toProfitLossDto(pendingSignal, pendingSignal.priceOpen);
+                pendingSignal._fall = { price: pendingSignal.priceOpen, timestamp: currentTime, pnlPercentage, pnlCost, priceClose, pnlEntries, priceOpen };
+            }
             const syncOpenAllowed = await CALL_SIGNAL_SYNC_OPEN_FN(currentTime, currentPrice, pendingSignal, this);
             if (!syncOpenAllowed) {
                 this.params.logger.info("ClientStrategy tick: user-activated signal rejected by sync", {
@@ -19373,6 +19397,24 @@ const heat_columns = [
         format: (data) => data.avgFallPnl !== null ? str(data.avgFallPnl, "%") : "N/A",
         isVisible: () => true,
     },
+    {
+        key: "sortinoRatio",
+        label: "Sortino",
+        format: (data) => data.sortinoRatio !== null ? str(data.sortinoRatio) : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "calmarRatio",
+        label: "Calmar",
+        format: (data) => data.calmarRatio !== null ? str(data.calmarRatio) : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "recoveryFactor",
+        label: "Recovery",
+        format: (data) => data.recoveryFactor !== null ? str(data.recoveryFactor) : "N/A",
+        isVisible: () => true,
+    },
 ];
 
 /**
@@ -20935,6 +20977,30 @@ const walker_strategy_columns = [
             : "N/A",
         isVisible: () => true,
     },
+    {
+        key: "sortinoRatio",
+        label: "Sortino",
+        format: (data) => data.stats.sortinoRatio !== null
+            ? `${data.stats.sortinoRatio.toFixed(3)}`
+            : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "calmarRatio",
+        label: "Calmar",
+        format: (data) => data.stats.calmarRatio !== null
+            ? `${data.stats.calmarRatio.toFixed(3)}`
+            : "N/A",
+        isVisible: () => true,
+    },
+    {
+        key: "recoveryFactor",
+        label: "Recovery",
+        format: (data) => data.stats.recoveryFactor !== null
+            ? `${data.stats.recoveryFactor.toFixed(3)}`
+            : "N/A",
+        isVisible: () => true,
+    },
     {
         key: "firstEventTime",
         label: "First Event",
@@ -21484,13 +21550,13 @@ class ReportBase {
          * Waits for drain event if write buffer is full.
          * Times out after 15 seconds and returns TIMEOUT_SYMBOL.
          */
-        this[_d] = timeout(async (line) => {
+        this[_d] = queued(timeout(async (line) => {
             if (!this._stream.write(line)) {
                 await new Promise((resolve) => {
                     this._stream.once("drain", resolve);
                 });
             }
-        }, 15000);
+        }, 15000));
         LOGGER_SERVICE$3.debug(REPORT_BASE_METHOD_NAME_CTOR, {
             reportName: this.reportName,
             baseDir,
@@ -21778,6 +21844,9 @@ let ReportStorage$a = class ReportStorage {
                 expectedYearlyReturns: null,
                 avgPeakPnl: null,
                 avgFallPnl: null,
+                sortinoRatio: null,
+                calmarRatio: null,
+                recoveryFactor: null,
             };
         }
         const totalSignals = this._signalList.length;
@@ -21811,6 +21880,16 @@ let ReportStorage$a = class ReportStorage {
         // Calculate average peak and fall PNL across all signals
         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;
+        // Downside per signal: maxDrawdown.pnlPercentage captures the worst intra-trade dip
+        const fallReturns = this._signalList.map((s) => s.signal.maxDrawdown?.pnlPercentage ?? 0);
+        // Calculate Sortino Ratio: avgPnl / stdDev(maxDrawdown per signal)
+        const fallVariance = fallReturns.reduce((sum, r) => sum + Math.pow(r, 2), 0) / totalSignals;
+        const fallDeviation = Math.sqrt(fallVariance);
+        const sortinoRatio = fallDeviation > 0 ? avgPnl / fallDeviation : 0;
+        // Avg absolute peak drawdown per signal — used as denominator for Calmar and Recovery
+        const avgAbsFall = fallReturns.reduce((sum, r) => sum + Math.abs(r), 0) / totalSignals;
+        const calmarRatio = avgAbsFall > 0 ? expectedYearlyReturns / avgAbsFall : 0;
+        const recoveryFactor = avgAbsFall > 0 ? totalPnl / avgAbsFall : 0;
         return {
             signalList: this._signalList,
             totalSignals,
@@ -21826,6 +21905,9 @@ let ReportStorage$a = class ReportStorage {
             expectedYearlyReturns: isUnsafe$3(expectedYearlyReturns) ? null : expectedYearlyReturns,
             avgPeakPnl: isUnsafe$3(avgPeakPnl) ? null : avgPeakPnl,
             avgFallPnl: isUnsafe$3(avgFallPnl) ? null : avgFallPnl,
+            sortinoRatio: isUnsafe$3(sortinoRatio) ? null : sortinoRatio,
+            calmarRatio: isUnsafe$3(calmarRatio) ? null : calmarRatio,
+            recoveryFactor: isUnsafe$3(recoveryFactor) ? null : recoveryFactor,
         };
     }
     /**
@@ -21872,6 +21954,9 @@ let ReportStorage$a = class ReportStorage {
             `**Expected Yearly Returns:** ${stats.expectedYearlyReturns === null ? "N/A" : `${stats.expectedYearlyReturns > 0 ? "+" : ""}${stats.expectedYearlyReturns.toFixed(2)}% (higher is better)`}`,
             `**Avg Peak PNL:** ${stats.avgPeakPnl === null ? "N/A" : `${stats.avgPeakPnl > 0 ? "+" : ""}${stats.avgPeakPnl.toFixed(2)}% (higher is better)`}`,
             `**Avg Max Drawdown PNL:** ${stats.avgFallPnl === null ? "N/A" : `${stats.avgFallPnl.toFixed(2)}% (closer to 0 is better)`}`,
+            `**Sortino Ratio:** ${stats.sortinoRatio === null ? "N/A" : `${stats.sortinoRatio.toFixed(3)} (higher is better)`}`,
+            `**Calmar Ratio:** ${stats.calmarRatio === null ? "N/A" : `${stats.calmarRatio.toFixed(3)} (higher is better)`}`,
+            `**Recovery Factor:** ${stats.recoveryFactor === null ? "N/A" : `${stats.recoveryFactor.toFixed(3)} (higher is better)`}`,
         ].join("\n");
     }
     /**
@@ -22472,6 +22557,9 @@ let ReportStorage$9 = class ReportStorage {
                 expectedYearlyReturns: null,
                 avgPeakPnl: null,
                 avgFallPnl: null,
+                sortinoRatio: null,
+                calmarRatio: null,
+                recoveryFactor: null,
             };
         }
         const closedEvents = this._eventList.filter((e) => e.action === "closed");
@@ -22521,6 +22609,21 @@ let ReportStorage$9 = class ReportStorage {
         const avgFallPnl = totalClosed > 0
             ? closedEvents.reduce((sum, e) => sum + (e.fallPnl || 0), 0) / totalClosed
             : 0;
+        // Downside per signal: fallPnl captures the worst intra-trade dip (maxDrawdown.pnlPercentage)
+        const fallReturns = closedEvents.map((e) => e.fallPnl || 0);
+        // Calculate Sortino Ratio: avgPnl / stdDev(maxDrawdown per signal)
+        let sortinoRatio = 0;
+        if (totalClosed > 0) {
+            const fallVariance = fallReturns.reduce((sum, r) => sum + Math.pow(r, 2), 0) / totalClosed;
+            const fallDeviation = Math.sqrt(fallVariance);
+            sortinoRatio = fallDeviation > 0 ? avgPnl / fallDeviation : 0;
+        }
+        // Avg absolute peak drawdown per signal — denominator for Calmar and Recovery
+        const avgAbsFall = totalClosed > 0
+            ? fallReturns.reduce((sum, r) => sum + Math.abs(r), 0) / totalClosed
+            : 0;
+        const calmarRatio = avgAbsFall > 0 ? expectedYearlyReturns / avgAbsFall : 0;
+        const recoveryFactor = avgAbsFall > 0 ? totalPnl / avgAbsFall : 0;
         return {
             eventList: this._eventList,
             totalEvents: this._eventList.length,
@@ -22537,6 +22640,9 @@ let ReportStorage$9 = class ReportStorage {
             expectedYearlyReturns: isUnsafe$2(expectedYearlyReturns) ? null : expectedYearlyReturns,
             avgPeakPnl: isUnsafe$2(avgPeakPnl) ? null : avgPeakPnl,
             avgFallPnl: isUnsafe$2(avgFallPnl) ? null : avgFallPnl,
+            sortinoRatio: isUnsafe$2(sortinoRatio) ? null : sortinoRatio,
+            calmarRatio: isUnsafe$2(calmarRatio) ? null : calmarRatio,
+            recoveryFactor: isUnsafe$2(recoveryFactor) ? null : recoveryFactor,
         };
     }
     /**
@@ -22583,6 +22689,9 @@ let ReportStorage$9 = class ReportStorage {
             `**Expected Yearly Returns:** ${stats.expectedYearlyReturns === null ? "N/A" : `${stats.expectedYearlyReturns > 0 ? "+" : ""}${stats.expectedYearlyReturns.toFixed(2)}% (higher is better)`}`,
             `**Avg Peak PNL:** ${stats.avgPeakPnl === null ? "N/A" : `${stats.avgPeakPnl > 0 ? "+" : ""}${stats.avgPeakPnl.toFixed(2)}% (higher is better)`}`,
             `**Avg Max Drawdown PNL:** ${stats.avgFallPnl === null ? "N/A" : `${stats.avgFallPnl.toFixed(2)}% (closer to 0 is better)`}`,
+            `**Sortino Ratio:** ${stats.sortinoRatio === null ? "N/A" : `${stats.sortinoRatio.toFixed(3)} (higher is better)`}`,
+            `**Calmar Ratio:** ${stats.calmarRatio === null ? "N/A" : `${stats.calmarRatio.toFixed(3)} (higher is better)`}`,
+            `**Recovery Factor:** ${stats.recoveryFactor === null ? "N/A" : `${stats.recoveryFactor.toFixed(3)} (higher is better)`}`,
         ].join("\n");
     }
     /**
@@ -24028,6 +24137,9 @@ let ReportStorage$7 = class ReportStorage {
             "",
             `**Best ${results.metric}:** ${formatMetric(results.bestMetric)}`,
             `**Total Signals:** ${bestStrategySignals}`,
+            `**Sortino Ratio:** ${results.bestStats?.sortinoRatio != null ? `${results.bestStats.sortinoRatio.toFixed(3)} (higher is better)` : "N/A"}`,
+            `**Calmar Ratio:** ${results.bestStats?.calmarRatio != null ? `${results.bestStats.calmarRatio.toFixed(3)} (higher is better)` : "N/A"}`,
+            `**Recovery Factor:** ${results.bestStats?.recoveryFactor != null ? `${results.bestStats.recoveryFactor.toFixed(3)} (higher is better)` : "N/A"}`,
             "",
             "## Top Strategies Comparison",
             "",
@@ -24494,6 +24606,27 @@ class HeatmapStorage {
             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;
         }
+        // Downside per signal: maxDrawdown.pnlPercentage captures the worst intra-trade dip
+        const fallReturns = signals.map((s) => s.signal.maxDrawdown?.pnlPercentage ?? 0);
+        // Calculate Sortino Ratio: avgPnl / stdDev(maxDrawdown per signal)
+        let sortinoRatio = null;
+        if (signals.length > 0 && avgPnl !== null) {
+            const fallVariance = fallReturns.reduce((acc, r) => acc + Math.pow(r, 2), 0) / signals.length;
+            const fallDeviation = Math.sqrt(fallVariance);
+            if (fallDeviation > 0) {
+                sortinoRatio = avgPnl / fallDeviation;
+            }
+        }
+        // Avg absolute peak drawdown per signal — denominator for Calmar and Recovery
+        const avgAbsFall = signals.length > 0
+            ? fallReturns.reduce((acc, r) => acc + Math.abs(r), 0) / signals.length
+            : 0;
+        let calmarRatio = null;
+        let recoveryFactor = null;
+        if (avgAbsFall > 0 && totalPnl !== null) {
+            calmarRatio = totalPnl / avgAbsFall;
+            recoveryFactor = totalPnl / avgAbsFall;
+        }
         // Apply safe math checks
         if (isUnsafe(winRate))
             winRate = null;
@@ -24519,6 +24652,12 @@ class HeatmapStorage {
             avgPeakPnl = null;
         if (isUnsafe(avgFallPnl))
             avgFallPnl = null;
+        if (isUnsafe(sortinoRatio))
+            sortinoRatio = null;
+        if (isUnsafe(calmarRatio))
+            calmarRatio = null;
+        if (isUnsafe(recoveryFactor))
+            recoveryFactor = null;
         return {
             symbol,
             totalPnl,
@@ -24538,6 +24677,9 @@ class HeatmapStorage {
             expectancy,
             avgPeakPnl,
             avgFallPnl,
+            sortinoRatio,
+            calmarRatio,
+            recoveryFactor,
         };
     }
     /**
@@ -29404,6 +29546,9 @@ class WalkerReportService {
                 annualizedSharpeRatio: data.stats.annualizedSharpeRatio,
                 certaintyRatio: data.stats.certaintyRatio,
                 expectedYearlyReturns: data.stats.expectedYearlyReturns,
+                sortinoRatio: data.stats.sortinoRatio,
+                calmarRatio: data.stats.calmarRatio,
+                recoveryFactor: data.stats.recoveryFactor,
                 firstEventTime,
                 lastEventTime,
             }, {