@tradejs/cli 2.0.1 → 2.0.3

package/dist/scripts/aiTrain.js

@@ -1653,6 +1653,7 @@ var divideOrNull = (num, denom) => {
 var DAY_MS = 24 * 60 * 60 * 1e3;
 var DAYS_PER_WEEK = 7;
 var DAYS_PER_MONTH = 30.4375;
+var DAYS_PER_YEAR = 365;
 var getEvaluationPeriodDays = (evaluations) => {
   let minTimestamp = null;
   let maxTimestamp = null;
@@ -1674,6 +1675,40 @@ var getEvaluationPeriodDays = (evaluations) => {
   return Math.max((maxTimestamp - minTimestamp) / DAY_MS, 1);
 };
 var qualitySortKey = (quality) => quality == null ? Number.POSITIVE_INFINITY : quality;
+var calculateTradePnlRiskRatios = ({
+  profits,
+  totalProfit,
+  maxDrawdown,
+  periodDays
+}) => {
+  if (!profits.length || periodDays == null || periodDays <= 0) {
+    return {
+      sharpeRatio: null,
+      sortinoRatio: null,
+      calmarRatio: null
+    };
+  }
+  const meanProfit = totalProfit / profits.length;
+  const variance = profits.reduce((sum, profit) => {
+    const diff = profit - meanProfit;
+    return sum + diff * diff;
+  }, 0) / profits.length;
+  const stdDev = Math.sqrt(variance);
+  const downsideDeviation = Math.sqrt(
+    profits.reduce(
+      (sum, profit) => profit < 0 ? sum + profit * profit : sum,
+      0
+    ) / profits.length
+  );
+  const annualizationScale = Math.sqrt(
+    profits.length / periodDays * DAYS_PER_YEAR
+  );
+  return {
+    sharpeRatio: stdDev > 0 && annualizationScale > 0 ? meanProfit / stdDev * annualizationScale : null,
+    sortinoRatio: downsideDeviation > 0 && annualizationScale > 0 ? meanProfit / downsideDeviation * annualizationScale : null,
+    calmarRatio: maxDrawdown > 0 ? totalProfit / periodDays * DAYS_PER_YEAR / maxDrawdown : null
+  };
+};
 var emptyRiskSummary = () => ({
   trades: 0,
   totalProfit: 0,
@@ -1689,12 +1724,15 @@ var emptyRiskSummary = () => ({
   maxDrawdown: 0,
   maxDrawdownPctOfGrossProfit: null,
   maxDrawdownPctOfTotalProfit: null,
+  sharpeRatio: null,
+  sortinoRatio: null,
+  calmarRatio: null,
   recoveryFactor: null,
   ulcerIndex: null,
   maxConsecutiveWins: 0,
   maxConsecutiveLosses: 0
 });
-var summarizeApprovedRisk = (evaluations) => {
+var summarizeApprovedRisk = (evaluations, periodDays = getEvaluationPeriodDays(evaluations)) => {
   const approvedEvaluations = evaluations.filter((evaluation) => evaluation.aiApproved).sort((left, right) => {
     const leftTimestamp = typeof left.timestamp === "number" && Number.isFinite(left.timestamp) ? left.timestamp : Number.POSITIVE_INFINITY;
     const rightTimestamp = typeof right.timestamp === "number" && Number.isFinite(right.timestamp) ? right.timestamp : Number.POSITIVE_INFINITY;
@@ -1717,8 +1755,10 @@ var summarizeApprovedRisk = (evaluations) => {
   let currentLossStreak = 0;
   let maxConsecutiveWins = 0;
   let maxConsecutiveLosses = 0;
+  const approvedProfits = [];
   for (const evaluation of approvedEvaluations) {
     const profit = evaluation.profit;
+    approvedProfits.push(profit);
     if (profit > 0) {
       grossProfit += profit;
       wins += 1;
@@ -1746,6 +1786,12 @@ var summarizeApprovedRisk = (evaluations) => {
   const totalProfit = grossProfit - grossLoss;
   const avgWin = divideOrNull(grossProfit, wins);
   const avgLoss = divideOrNull(grossLoss, losses);
+  const riskRatios = calculateTradePnlRiskRatios({
+    profits: approvedProfits,
+    totalProfit,
+    maxDrawdown,
+    periodDays
+  });
   return {
     trades: approvedEvaluations.length,
     totalProfit,
@@ -1761,6 +1807,7 @@ var summarizeApprovedRisk = (evaluations) => {
     maxDrawdown,
     maxDrawdownPctOfGrossProfit: grossProfit > 0 ? maxDrawdown / grossProfit : null,
     maxDrawdownPctOfTotalProfit: totalProfit > 0 ? maxDrawdown / totalProfit : null,
+    ...riskRatios,
     recoveryFactor: maxDrawdown > 0 ? totalProfit / maxDrawdown : null,
     ulcerIndex: Math.sqrt(drawdownSquares / approvedEvaluations.length),
     maxConsecutiveWins,
@@ -1859,7 +1906,7 @@ var summarizeAiTrainEvaluations = (evaluations) => {
     avgApprovedTradesPerDay,
     avgApprovedTradesPerWeek,
     expectancyDelta,
-    approvedRisk: summarizeApprovedRisk(evaluations),
+    approvedRisk: summarizeApprovedRisk(evaluations, periodDays),
     qualityBuckets: [...bucketMap.values()].sort(
       (a, b) => qualitySortKey(a.quality) - qualitySortKey(b.quality)
     )
@@ -2523,6 +2570,12 @@ var RESEARCH_CONTEXT_ENV_KEYS = [
   "COINMARKETCAP_CONTEXT_BACKFILL_MAX_DAYS",
   "COINMARKETCAP_CONTEXT_BACKFILL_WARMUP_DAYS"
 ];
+var DERIVATIVES_CONTEXT_DATA_MODEL = {
+  derivativesSourceIntervals: "15m",
+  derivativesDerivedIntervals: "1h",
+  derivativesHourlyFallback: "stored-1h",
+  derivativesDataModelVersion: 2
+};
 var normalizeForStableJson = (value) => {
   if (Array.isArray(value)) {
     return value.map(normalizeForStableJson);
@@ -2635,6 +2688,7 @@ var resolveGateFingerprint = async (projectRoot, strategyName, gitSha) => {
   const relativeCandidates = [
     `packages/strategies/src/${strategyName}/adapters/ai.ts`,
     `packages/strategies/src/${strategyName}/guardrails.ts`,
+    `packages/strategies/src/${strategyName}/pockets.ts`,
     `packages/strategies/src/${strategyName}/config.ts`,
     "packages/node/src/ai.ts"
   ];
@@ -2681,7 +2735,8 @@ var buildAiTrainLineage = async ({
     ...Object.fromEntries(
       RESEARCH_CONTEXT_ENV_KEYS.map((key) => [key, env[key] ?? null])
     ),
-    ...runContext
+    ...runContext,
+    ...DERIVATIVES_CONTEXT_DATA_MODEL
   };
   return {
     gitSha,
@@ -3741,6 +3796,9 @@ var main = async () => {
           import_chalk.default.gray("CALENDAR/D"),
           import_chalk.default.gray("WR"),
           import_chalk.default.gray("PF"),
+          import_chalk.default.gray("SHARPE"),
+          import_chalk.default.gray("SORTINO"),
+          import_chalk.default.gray("CALMAR"),
           import_chalk.default.gray("PNL"),
           import_chalk.default.gray("MAX_DD"),
           import_chalk.default.gray("TOP REJECT")
@@ -3755,6 +3813,9 @@ var main = async () => {
           colorizeMetricNumber(window2.approvedPerCalendarDay),
           colorizeRatio(window2.outcome.approvedRisk.winRate),
           colorizeMetricNumber(window2.outcome.approvedRisk.profitFactor),
+          colorizeMetricNumber(window2.outcome.approvedRisk.sharpeRatio),
+          colorizeMetricNumber(window2.outcome.approvedRisk.sortinoRatio),
+          colorizeMetricNumber(window2.outcome.approvedRisk.calmarRatio),
           colorizeProfit(window2.outcome.approvedRisk.totalProfit),
           colorizeProfit(-window2.outcome.approvedRisk.maxDrawdown),
           import_chalk.default.gray(
@@ -3803,6 +3864,18 @@ var main = async () => {
           "profit_factor",
           colorizeMetricNumber(summary.approvedRisk.profitFactor)
         ],
+        [
+          "sharpe_ratio",
+          colorizeMetricNumber(summary.approvedRisk.sharpeRatio)
+        ],
+        [
+          "sortino_ratio",
+          colorizeMetricNumber(summary.approvedRisk.sortinoRatio)
+        ],
+        [
+          "calmar_ratio",
+          colorizeMetricNumber(summary.approvedRisk.calmarRatio)
+        ],
         [
           "payoff_ratio",
           colorizeMetricNumber(summary.approvedRisk.payoffRatio)

package/dist/scripts/backtest.js

@@ -2613,6 +2613,38 @@ var resolveDerivativesContextMissingFetchFromMs = (params) => {
   return null;
 };
 var resolveDerivativesContextFetchFromMs = (params) => resolveDerivativesContextMissingFetchFromMs(params) ?? (params.refreshClosedTail ? params.toMs : null);
+var resolveDerivativesContextRequiredFetchFromMs = (params) => {
+  const dataCoverageFromMs = params.dataCoverageKeyExists ? null : params.mode === "signals" ? params.fromMs : resolveDerivativesContextMissingCoverageFetchFromMs({
+    ranges: params.dataCoverageRanges,
+    fromMs: params.fromMs,
+    toMs: params.toMs,
+    intervalMs: params.intervalMs
+  });
+  const edgesFromMs = dataCoverageFromMs == null ? null : resolveDerivativesContextFetchFromMs({
+    edges: params.edges,
+    fromMs: params.fromMs,
+    toMs: params.toMs,
+    intervalMs: params.intervalMs,
+    refreshClosedTail: params.mode === "signals"
+  });
+  const dataFetchFromMs = dataCoverageFromMs != null && edgesFromMs != null ? Math.max(dataCoverageFromMs, edgesFromMs) : null;
+  const confirmedLiquidationWindow = (0, import_indicators.resolveCoinalyzeConfirmedIntradayCoverage)({
+    interval: params.interval,
+    fromMs: params.fromMs,
+    toMs: params.toMs,
+    nowMs: params.nowMs
+  });
+  const liquidationFetchFromMs = confirmedLiquidationWindow ? resolveDerivativesContextMissingCoverageFetchFromMs({
+    ranges: params.liquidationCoverageRanges,
+    fromMs: confirmedLiquidationWindow.fromMs,
+    toMs: confirmedLiquidationWindow.toMs,
+    intervalMs: params.intervalMs
+  }) : null;
+  const fetchStarts = [dataFetchFromMs, liquidationFetchFromMs].filter(
+    (value) => value != null
+  );
+  return fetchStarts.length ? Math.min(...fetchStarts) : null;
+};
 var countBackfillWindows = (params) => {
   let count = 0;
   let cursor = params.fromMs;
@@ -2948,7 +2980,8 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
     mode,
     startMs,
     endMs,
-    preloadStartMs: params.preloadStartMs
+    preloadStartMs: params.preloadStartMs,
+    nowMs: Date.now()
   });
   if (safeEndMs <= fromMs) {
     return skippedBackfillResult2();
@@ -2982,15 +3015,33 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
   );
   const coverageKeysByInterval = /* @__PURE__ */ new Map();
   const coverageRangesByInterval = /* @__PURE__ */ new Map();
+  const liquidationCoverageRangesByInterval = /* @__PURE__ */ new Map();
+  const coverageNowMs = Date.now();
   await Promise.all(
     intervalWindows.map(async (window2) => {
-      const coverageRows = await (0, import_timescale2.getDerivativesBackfillCoverage)({
-        source: "coinalyze",
-        symbols,
+      const confirmedLiquidationWindow = (0, import_indicators.resolveCoinalyzeConfirmedIntradayCoverage)({
         interval: window2.interval,
         fromMs: window2.fromMs,
-        toMs: window2.toMs
+        toMs: window2.toMs,
+        nowMs: coverageNowMs
       });
+      const [coverageRows, liquidationCoverageRows] = await Promise.all([
+        (0, import_timescale2.getDerivativesBackfillCoverage)({
+          source: "coinalyze",
+          symbols,
+          interval: window2.interval,
+          fromMs: window2.fromMs,
+          toMs: window2.toMs
+        }),
+        confirmedLiquidationWindow ? (0, import_timescale2.getDerivativesMetricCoverage)({
+          source: "coinalyze",
+          metric: "liquidation",
+          symbols,
+          interval: window2.interval,
+          fromMs: confirmedLiquidationWindow.fromMs,
+          toMs: confirmedLiquidationWindow.toMs
+        }) : Promise.resolve([])
+      ]);
       coverageKeysByInterval.set(
         window2.interval,
         new Set(
@@ -3012,6 +3063,17 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
         rangesBySymbol.set(symbol, ranges);
       }
       coverageRangesByInterval.set(window2.interval, rangesBySymbol);
+      const liquidationRangesBySymbol = /* @__PURE__ */ new Map();
+      for (const row of liquidationCoverageRows) {
+        const symbol = row.symbol.toUpperCase();
+        const ranges = liquidationRangesBySymbol.get(symbol) ?? [];
+        ranges.push({ fromMs: row.fromMs, toMs: row.toMs });
+        liquidationRangesBySymbol.set(symbol, ranges);
+      }
+      liquidationCoverageRangesByInterval.set(
+        window2.interval,
+        liquidationRangesBySymbol
+      );
     })
   );
   const cachedWindows = intervalWindows.reduce(
@@ -3036,7 +3098,7 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
       (symbol) => backfillWindows.every((backfillWindow) => {
         const normalizedSymbol = symbol.toUpperCase();
         const coverageRanges = coverageRangesByInterval.get(window2.interval)?.get(normalizedSymbol) ?? [];
-        return hasDerivativesWindowCoverage({
+        const dataCovered = hasDerivativesWindowCoverage({
           edges: edgesBySymbol?.get(normalizedSymbol),
           fromMs: backfillWindow.fromMs,
           toMs: backfillWindow.toMs
@@ -3053,6 +3115,19 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
             toMs: backfillWindow.toMs
           })
         );
+        const confirmedLiquidationWindow = (0, import_indicators.resolveCoinalyzeConfirmedIntradayCoverage)({
+          interval: window2.interval,
+          fromMs: backfillWindow.fromMs,
+          toMs: backfillWindow.toMs,
+          nowMs: coverageNowMs
+        });
+        const liquidationCovered = confirmedLiquidationWindow == null || resolveDerivativesContextMissingCoverageFetchFromMs({
+          ranges: liquidationCoverageRangesByInterval.get(window2.interval)?.get(normalizedSymbol) ?? [],
+          fromMs: confirmedLiquidationWindow.fromMs,
+          toMs: confirmedLiquidationWindow.toMs,
+          intervalMs: window2.intervalMs
+        }) == null;
+        return dataCovered && liquidationCovered;
       })
     );
   });
@@ -3137,6 +3212,11 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
     coverageKeysByInterval.set(interval2, coverageKeys);
     const coverageRangesBySymbol = coverageRangesByInterval.get(interval2) ?? /* @__PURE__ */ new Map();
     coverageRangesByInterval.set(interval2, coverageRangesBySymbol);
+    const liquidationCoverageRangesBySymbol = liquidationCoverageRangesByInterval.get(interval2) ?? /* @__PURE__ */ new Map();
+    liquidationCoverageRangesByInterval.set(
+      interval2,
+      liquidationCoverageRangesBySymbol
+    );
     for (let batchIdx = 0; batchIdx < symbolBatches.length; batchIdx += 1) {
       const batch = symbolBatches[batchIdx];
       let cursor = window2.fromMs;
@@ -3149,33 +3229,25 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
             fromMs: cursor,
             toMs
           });
-          if (coverageKeys.has(key)) {
-            return null;
-          }
           const normalizedSymbol = item.symbol.toUpperCase();
-          const coverageFromMs = mode === "signals" ? cursor : resolveDerivativesContextMissingCoverageFetchFromMs({
-            ranges: coverageRangesBySymbol.get(normalizedSymbol),
-            fromMs: cursor,
-            toMs,
-            intervalMs
-          });
-          if (coverageFromMs == null) {
-            return null;
-          }
-          const edges = edgesBySymbol.get(normalizedSymbol);
-          const edgesFromMs = resolveDerivativesContextFetchFromMs({
-            edges,
-            fromMs: cursor,
-            toMs,
-            intervalMs,
-            refreshClosedTail: mode === "signals"
-          });
-          if (edgesFromMs == null) {
-            return null;
-          }
+          const requiredFromMs = resolveDerivativesContextRequiredFetchFromMs(
+            {
+              mode,
+              interval: interval2,
+              intervalMs,
+              fromMs: cursor,
+              toMs,
+              nowMs: coverageNowMs,
+              dataCoverageKeyExists: coverageKeys.has(key),
+              dataCoverageRanges: coverageRangesBySymbol.get(normalizedSymbol),
+              liquidationCoverageRanges: liquidationCoverageRangesBySymbol.get(normalizedSymbol),
+              edges: edgesBySymbol.get(normalizedSymbol)
+            }
+          );
+          if (requiredFromMs == null) return null;
           return {
             item,
-            fromMs: Math.max(coverageFromMs, edgesFromMs)
+            fromMs: requiredFromMs
           };
         }).filter(
           (item) => item != null
@@ -3200,6 +3272,7 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
               );
               let rows = [];
               let missingClosedSymbols = [];
+              let liquidationRowsByMarket = /* @__PURE__ */ new Map();
               for (let attempt = 1; attempt <= maxClosedBarAttempts; attempt += 1) {
                 const oiMap = await fetchMetricBatch({
                   endpoint: oiPath,
@@ -3219,7 +3292,7 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
                   fromMs: group.fromMs,
                   toMs
                 });
-                const liqMap = await fetchMetricBatch({
+                liquidationRowsByMarket = await fetchMetricBatch({
                   endpoint: liqPath,
                   metric: "liq",
                   marketSymbols,
@@ -3234,7 +3307,7 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
                     symbol: item.symbol,
                     oiRaw: oiMap.get(marketSymbol) ?? [],
                     fundingRaw: fundingMap.get(marketSymbol) ?? [],
-                    liqRaw: liqMap.get(marketSymbol) ?? []
+                    liqRaw: liquidationRowsByMarket.get(marketSymbol) ?? []
                   });
                   return (0, import_indicators.coinalyzePointsToRows)(points, interval2, "coinalyze");
                 });
@@ -3257,6 +3330,42 @@ var backfillDerivativesContext = async (params, enabled, mode) => {
                 await (0, import_timescale2.upsertDerivatives)(rows);
                 totalRows += rows.length;
               }
+              const confirmedLiquidationWindow = (0, import_indicators.resolveCoinalyzeConfirmedIntradayCoverage)({
+                interval: interval2,
+                fromMs: group.fromMs,
+                toMs,
+                nowMs: coverageNowMs
+              });
+              if (confirmedLiquidationWindow) {
+                const metricCoverageRows = missingBatch.map((item) => {
+                  const marketSymbol = item.marketSymbol.toUpperCase();
+                  const eventRowsCount = (liquidationRowsByMarket.get(marketSymbol) ?? []).filter((point) => {
+                    const timestamp = (0, import_indicators.toCoinalyzeTimestampMs)(
+                      point.t ?? point.ts ?? point.time ?? point.timestamp
+                    );
+                    return timestamp != null && timestamp >= confirmedLiquidationWindow.fromMs && timestamp <= confirmedLiquidationWindow.toMs;
+                  }).length;
+                  return {
+                    source: "coinalyze",
+                    metric: "liquidation",
+                    symbol: item.symbol,
+                    interval: interval2,
+                    fromMs: confirmedLiquidationWindow.fromMs,
+                    toMs: confirmedLiquidationWindow.toMs,
+                    eventRowsCount
+                  };
+                });
+                await (0, import_timescale2.applyDerivativesMetricCoverage)(metricCoverageRows);
+                for (const coverageRow of metricCoverageRows) {
+                  const symbol = coverageRow.symbol.toUpperCase();
+                  const ranges = liquidationCoverageRangesBySymbol.get(symbol) ?? [];
+                  ranges.push({
+                    fromMs: coverageRow.fromMs,
+                    toMs: coverageRow.toMs
+                  });
+                  liquidationCoverageRangesBySymbol.set(symbol, ranges);
+                }
+              }
               if (mode === "backtest") {
                 const rowsCountBySymbol = /* @__PURE__ */ new Map();
                 for (const row of rows) {

package/dist/scripts/derivativesIngestCoinalyzeAll.js

@@ -378,6 +378,36 @@ var main = async () => {
             await (0, import_timescale.upsertDerivatives)(rows);
             totalRows += rows.length;
           }
+          const confirmedLiquidationWindow = (0, import_indicators.resolveCoinalyzeConfirmedIntradayCoverage)({
+            interval,
+            fromMs: cursor,
+            toMs,
+            nowMs: now
+          });
+          if (confirmedLiquidationWindow) {
+            await (0, import_timescale.applyDerivativesMetricCoverage)(
+              batch.map((item) => {
+                const marketSymbol = item.marketSymbol.toUpperCase();
+                const eventRowsCount = (liqMap.get(marketSymbol) ?? []).filter(
+                  (point) => {
+                    const timestamp = (0, import_indicators.toCoinalyzeTimestampMs)(
+                      point.t ?? point.ts ?? point.time ?? point.timestamp
+                    );
+                    return timestamp != null && timestamp >= confirmedLiquidationWindow.fromMs && timestamp <= confirmedLiquidationWindow.toMs;
+                  }
+                ).length;
+                return {
+                  source: "coinalyze",
+                  metric: "liquidation",
+                  symbol: item.symbol,
+                  interval,
+                  fromMs: confirmedLiquidationWindow.fromMs,
+                  toMs: confirmedLiquidationWindow.toMs,
+                  eventRowsCount
+                };
+              })
+            );
+          }
         } catch (error) {
           failedWindows += 1;
           console.error(

package/dist/scripts/mlExport.js

@@ -1697,7 +1697,8 @@ var getStrategyChoices = async () => {
     "MaStrategy",
     "AdaptiveMomentumRibbon",
     "TrendLine",
-    "VolumeDivergence"
+    "VolumeDivergence",
+    "Grid"
   ];
 };
 var selectStrategy = async (promptLabel = "Select strategy", options) => {

package/dist/scripts/mlExportSelect.js

@@ -54,7 +54,8 @@ var getStrategyChoices = async () => {
     "MaStrategy",
     "AdaptiveMomentumRibbon",
     "TrendLine",
-    "VolumeDivergence"
+    "VolumeDivergence",
+    "Grid"
   ];
 };
 var selectStrategy = async (promptLabel = "Select strategy", options) => {

package/dist/scripts/mlTrainLatestSelect.js

@@ -63,7 +63,8 @@ var getStrategyChoices = async () => {
     "MaStrategy",
     "AdaptiveMomentumRibbon",
     "TrendLine",
-    "VolumeDivergence"
+    "VolumeDivergence",
+    "Grid"
   ];
 };
 var selectStrategy = async (promptLabel = "Select strategy", options) => {