@tradejs/node 2.0.15 → 2.0.16

package/dist/ai.js

@@ -1147,6 +1147,15 @@ var postProcessAiAnalysisByStrategy = (signal, analysis, payload = buildAiPayloa
   payload,
   analysis
 }) ?? analysis;
+var postProcessLocalAiAnalysisByStrategy = (signal, analysis, payload = buildAiPayloadByStrategy(signal)) => {
+  const adapter = getSignalAiAdapter(signal);
+  const strategyAnalysis = adapter.postProcessAnalysis?.({ signal, payload, analysis }) ?? analysis;
+  return adapter.postProcessLocalAnalysis?.({
+    signal,
+    payload,
+    analysis: strategyAnalysis
+  }) ?? strategyAnalysis;
+};
 
 // src/ai.ts
 var parseAIResponse = (input) => {
@@ -1295,7 +1304,7 @@ Input payload structure:
   \u2022 \`baseContext.relative\`: BTC/ETH relative-strength, benchmark MA bias context, Binance alt-basket breadth, and CoinMarketCap historical global/exchange/index context when available.
   \u2022 \`baseContext.derivatives\`: Coinalyze-aligned derivatives summary when available.
   \u2022 \`baseContext.mtf\`: compact multi-timeframe summary plus only the latest few candles for each timeframe.
-  \u2022 \`baseContext.gateFeatures\`: direction-aware, normalized fields derived from baseContext; prefer \`setup\`, \`scores\`, \`confirmations\`, \`conflicts\`, \`risk\`, and \`decisionHints\` for quick gate checks before inspecting raw nested context.
+  \u2022 \`baseContext.gateFeatures\`: compact direction-aware fields derived from baseContext; prefer \`setup\`, \`scores\`, \`conflicts\`, \`risk\`, \`decisionHints\`, \`mtf\`, \`volatility\`, \`participation\`, and \`relative\` for quick gate checks before inspecting raw nested context.
   Always inspect \`payload.additionalIndicators.marketContext\` when present:
   \u2022 \`marketContext.execution.binanceCoinbaseSpread\`: AI-friendly BTC spread view projected from \`payload.additionalIndicators.baseContext.relative.execution.venueSpread\`; \`value=(Coinbase-Binance)/Binance\`, \`bps=value*10000\`.
   \u2022 \`marketContext.participation.trueDelta\`: Binance taker buy/sell volume delta from kline payload when \`source=kline_taker_volume\`; otherwise absent/unavailable.
@@ -1577,7 +1586,7 @@ var runAiPromptLocal = async (signal, options = {}) => {
   const signalDirection = getSignalDirection(signal);
   const deterministicQuality = getDeterministicQuality(gateContext);
   const approvalAllowedNow = typeof gateContext?.approvalAllowedNow === "boolean" ? gateContext.approvalAllowedNow : deterministicQuality >= 4;
-  return postProcessAiAnalysisByStrategy(
+  return postProcessLocalAiAnalysisByStrategy(
     signal,
     {
       direction: approvalAllowedNow ? signalDirection : null,

package/dist/ai.mjs

@@ -14,7 +14,7 @@ import {
   runAiPrompt,
   runAiPromptLocal,
   trimSeriesDeep
-} from "./chunk-DPHKRDD5.mjs";
+} from "./chunk-WK5EUCX5.mjs";
 import "./chunk-QVSMINLG.mjs";
 import "./chunk-WS5DYEVZ.mjs";
 import "./chunk-UV2HVMKZ.mjs";

package/dist/backtest.js

@@ -50,7 +50,7 @@ var import_strategies5 = require("@tradejs/core/strategies");
 var import_time = require("@tradejs/core/time");
 var import_ai2 = require("@tradejs/infra/ai");
 var import_ml2 = require("@tradejs/infra/ml");
-var import_logger8 = require("@tradejs/infra/logger");
+var import_logger9 = require("@tradejs/infra/logger");
 
 // src/ai.ts
 var import_aiLanguages = require("@tradejs/infra/aiLanguages");
@@ -1153,6 +1153,9 @@ var buildAiPayloadByStrategy = (signal) => {
 // src/ai.ts
 var buildAiPayload = (signal) => buildAiPayloadByStrategy(signal);
 
+// src/strategyHelpers/marketContextStages.ts
+var import_logger7 = require("@tradejs/infra/logger");
+
 // src/strategyHelpers/binanceMarketContext.ts
 var import_timescale = require("@tradejs/infra/timescale");
 var import_logger3 = require("@tradejs/infra/logger");
@@ -1461,6 +1464,13 @@ var getBinanceBreadthUniverses = () => BINANCE_BREADTH_UNIVERSE_KEYS.map((key) =
   };
 });
 
+// src/strategyHelpers/marketContextErrors.ts
+var MARKET_CONTEXT_CANCELLATION_ERROR_NAMES = /* @__PURE__ */ new Set([
+  "AbortError",
+  "TimescaleQueryTimeoutError"
+]);
+var isMarketContextCancellationError = (error, abortSignal) => abortSignal?.aborted === true || error instanceof Error && MARKET_CONTEXT_CANCELLATION_ERROR_NAMES.has(error.name);
+
 // src/strategyHelpers/binanceMarketContext.ts
 var DEFAULT_MAX_AGE_BY_INTERVAL = {
   "1m": 3 * 6e4,
@@ -1525,7 +1535,8 @@ var getCachedReferenceRows = ({
   referenceSymbols,
   interval,
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${referenceSymbols.join(",")}:${interval}:${timestamp}:${maxAgeMs}`;
   const cached = referenceRowsCache.get(key);
@@ -1536,7 +1547,8 @@ var getCachedReferenceRows = ({
         symbol,
         interval,
         atMs: timestamp,
-        maxAgeMs
+        maxAgeMs,
+        ...abortSignal ? { signal: abortSignal } : {}
       });
       return {
         symbol,
@@ -1545,13 +1557,15 @@ var getCachedReferenceRows = ({
     })
   );
   referenceRowsCache.set(key, promise);
+  void promise.catch(() => referenceRowsCache.delete(key));
   return promise;
 };
 var getCachedBreadth = ({
   breadthUniverse,
   interval,
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${breadthUniverse}:${interval}:${timestamp}:${maxAgeMs}`;
   const cached = breadthCache.get(key);
@@ -1560,9 +1574,11 @@ var getCachedBreadth = ({
     universe: breadthUniverse,
     interval,
     atMs: timestamp,
-    maxAgeMs
+    maxAgeMs,
+    ...abortSignal ? { signal: abortSignal } : {}
   });
   breadthCache.set(key, promise);
+  void promise.catch(() => breadthCache.delete(key));
   return promise;
 };
 var toMarketBreadthContext = (breadth, interval) => ({
@@ -1608,7 +1624,8 @@ var enrichSignalWithBinanceMarketContext = async (params) => {
         referenceSymbols,
         interval,
         timestamp: signal.timestamp,
-        maxAgeMs
+        maxAgeMs,
+        abortSignal: params.abortSignal
       }),
       Promise.all(
         breadthUniverses.map(async ({ key, universe }) => ({
@@ -1617,7 +1634,8 @@ var enrichSignalWithBinanceMarketContext = async (params) => {
             breadthUniverse: universe,
             interval,
             timestamp: signal.timestamp,
-            maxAgeMs
+            maxAgeMs,
+            abortSignal: params.abortSignal
           })
         }))
       )
@@ -1732,6 +1750,9 @@ var enrichSignalWithBinanceMarketContext = async (params) => {
     (0, import_strategies.refreshSignalBaseContextGateFeatures)(signal);
     return true;
   } catch (error) {
+    if (isMarketContextCancellationError(error, params.abortSignal)) {
+      throw error;
+    }
     binanceMarketContextUnavailable = true;
     import_logger3.logger.warn(
       "Binance market context disabled after Timescale read failure: %s",
@@ -1852,7 +1873,8 @@ var toIndexRegime = ({
 };
 var getCachedGlobalContext = ({
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${SOURCE_GLOBAL_DAILY}:${timestamp}:${maxAgeMs}`;
   const cached = globalContextCache.get(key);
@@ -1860,14 +1882,17 @@ var getCachedGlobalContext = ({
   const promise = (0, import_timescale2.getLatestMarketGlobalContext)({
     source: SOURCE_GLOBAL_DAILY,
     atMs: timestamp,
-    maxAgeMs
+    maxAgeMs,
+    ...abortSignal ? { signal: abortSignal } : {}
   });
   globalContextCache.set(key, promise);
+  void promise.catch(() => globalContextCache.delete(key));
   return promise;
 };
 var getCachedReferenceContexts = ({
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${SOURCE_REFERENCE}:1d:${timestamp}:${maxAgeMs}`;
   const cached = referenceContextCache.get(key);
@@ -1877,14 +1902,17 @@ var getCachedReferenceContexts = ({
     symbols: ["BTCUSDT", "ETHUSDT"],
     interval: "1d",
     atMs: timestamp,
-    maxAgeMs
+    maxAgeMs,
+    ...abortSignal ? { signal: abortSignal } : {}
   });
   referenceContextCache.set(key, promise);
+  void promise.catch(() => referenceContextCache.delete(key));
   return promise;
 };
 var getCachedExchangeLiquidityContext = ({
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${SOURCE_EXCHANGE_LIQUIDITY}:1d:${timestamp}:${maxAgeMs}`;
   const cached = exchangeLiquidityContextCache.get(key);
@@ -1893,14 +1921,17 @@ var getCachedExchangeLiquidityContext = ({
     source: SOURCE_EXCHANGE_LIQUIDITY,
     interval: "1d",
     atMs: timestamp,
-    maxAgeMs
+    maxAgeMs,
+    ...abortSignal ? { signal: abortSignal } : {}
   });
   exchangeLiquidityContextCache.set(key, promise);
+  void promise.catch(() => exchangeLiquidityContextCache.delete(key));
   return promise;
 };
 var getCachedFearGreedContext = ({
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${SOURCE_FEAR_GREED}:1d:${timestamp}:${maxAgeMs}`;
   const cached = fearGreedContextCache.get(key);
@@ -1909,14 +1940,17 @@ var getCachedFearGreedContext = ({
     source: SOURCE_FEAR_GREED,
     interval: "1d",
     atMs: timestamp,
-    maxAgeMs
+    maxAgeMs,
+    ...abortSignal ? { signal: abortSignal } : {}
   });
   fearGreedContextCache.set(key, promise);
+  void promise.catch(() => fearGreedContextCache.delete(key));
   return promise;
 };
 var getCachedIndexContexts = ({
   timestamp,
-  maxAgeMs
+  maxAgeMs,
+  abortSignal
 }) => {
   const key = `${SOURCE_INDEX}:1d:${timestamp}:${maxAgeMs}`;
   const cached = indexContextCache.get(key);
@@ -1926,9 +1960,11 @@ var getCachedIndexContexts = ({
     indexSlugs: ["cmc100", "cmc20"],
     interval: "1d",
     atMs: timestamp,
-    maxAgeMs
+    maxAgeMs,
+    ...abortSignal ? { signal: abortSignal } : {}
   });
   indexContextCache.set(key, promise);
+  void promise.catch(() => indexContextCache.delete(key));
   return promise;
 };
 var isCoinMarketCapContextEnabled = (env) => parseEnabledFlag2(process.env.COINMARKETCAP_CONTEXT_ENABLED, env);
@@ -1953,27 +1989,33 @@ var enrichSignalWithCoinMarketCapContext = async (params) => {
     ] = await Promise.all([
       getCachedGlobalContext({
         timestamp: signal.timestamp,
-        maxAgeMs
+        maxAgeMs,
+        abortSignal: params.abortSignal
       }),
       getCachedReferenceContexts({
         timestamp: signal.timestamp,
-        maxAgeMs
+        maxAgeMs,
+        abortSignal: params.abortSignal
       }),
       getCachedReferenceContexts({
         timestamp: signal.timestamp - DAY_MS,
-        maxAgeMs: maxAgeMs + DAY_MS
+        maxAgeMs: maxAgeMs + DAY_MS,
+        abortSignal: params.abortSignal
       }),
       getCachedExchangeLiquidityContext({
         timestamp: signal.timestamp,
-        maxAgeMs
+        maxAgeMs,
+        abortSignal: params.abortSignal
       }),
       getCachedFearGreedContext({
         timestamp: signal.timestamp,
-        maxAgeMs
+        maxAgeMs,
+        abortSignal: params.abortSignal
       }),
       getCachedIndexContexts({
         timestamp: signal.timestamp,
-        maxAgeMs
+        maxAgeMs,
+        abortSignal: params.abortSignal
       })
     ]);
     const globalRow = globalDailyRow;
@@ -2207,6 +2249,9 @@ var enrichSignalWithCoinMarketCapContext = async (params) => {
     (0, import_strategies2.refreshSignalBaseContextGateFeatures)(signal);
     return true;
   } catch (error) {
+    if (isMarketContextCancellationError(error, params.abortSignal)) {
+      throw error;
+    }
     coinMarketCapContextUnavailable = true;
     import_logger4.logger.warn(
       "CoinMarketCap context disabled after Timescale read failure: %s",
@@ -2389,7 +2434,8 @@ var enrichSignalWithDerivativesContext = async (params) => {
           symbol,
           intervals: STORED_INTERVALS,
           endMs: derivativesEndMs,
-          lookbackMs
+          lookbackMs,
+          ...params.abortSignal ? { signal: params.abortSignal } : {}
         });
         return [
           symbol,
@@ -2417,7 +2463,8 @@ var enrichSignalWithDerivativesContext = async (params) => {
         symbol: targetSymbol,
         intervals: STORED_INTERVALS,
         endMs: derivativesEndMs,
-        lookbackMs
+        lookbackMs,
+        ...params.abortSignal ? { signal: params.abortSignal } : {}
       });
       const context = (0, import_indicators2.buildDerivativesContext)({
         symbol: targetSymbol,
@@ -2448,6 +2495,9 @@ var enrichSignalWithDerivativesContext = async (params) => {
     (0, import_strategies3.refreshSignalBaseContextGateFeatures)(signal);
     return true;
   } catch (error) {
+    if (isMarketContextCancellationError(error, params.abortSignal)) {
+      throw error;
+    }
     derivativesContextUnavailable = true;
     import_logger5.logger.warn(
       "Derivatives context disabled after Timescale read failure: %s",
@@ -2681,7 +2731,7 @@ var resolveHyperliquidPerpFromSignalSymbol = (symbol) => {
 var MAX_CACHE_ENTRIES = 2048;
 var MAX_COVERAGE_SERIES_CACHE_ENTRIES = 20;
 var MAX_FLOW_SERIES_CACHE_ENTRIES = 64;
-var SERIES_CHUNK_MS = 30 * 24 * 60 * 6e4;
+var SERIES_CHUNK_MS = 90 * 24 * 60 * 6e4;
 var MAX_SERIES_LOOKBACK_MS = 60 * 6e4;
 var DEFAULT_MIN_COVERAGE_PCT = 0.8;
 var INTERVAL_MS = {
@@ -2729,6 +2779,7 @@ var setBoundedCache = (key, value) => {
     if (oldestKey != null) contextCache.delete(oldestKey);
   }
   contextCache.set(key, value);
+  void value.catch(() => contextCache.delete(key));
 };
 var setBoundedSeriesCache = (cache, maxEntries, key, value) => {
   if (cache.size >= maxEntries) {
@@ -2736,6 +2787,7 @@ var setBoundedSeriesCache = (cache, maxEntries, key, value) => {
     if (oldestKey != null) cache.delete(oldestKey);
   }
   cache.set(key, value);
+  void value.catch(() => cache.delete(key));
 };
 var uniqueAddressCount = (rows, field) => {
   const addresses = /* @__PURE__ */ new Set();
@@ -2850,7 +2902,8 @@ var loadHyperliquidWhaleFlowAggregateFromSeries = async (params) => {
       fromMs,
       toMs,
       universeFingerprint: params.universeFingerprint,
-      whaleRegistryFingerprint: params.whaleRegistryFingerprint
+      whaleRegistryFingerprint: params.whaleRegistryFingerprint,
+      ...params.abortSignal ? { signal: params.abortSignal } : {}
     });
     setBoundedSeriesCache(
       coverageSeriesCache,
@@ -2867,7 +2920,8 @@ var loadHyperliquidWhaleFlowAggregateFromSeries = async (params) => {
       fromMs,
       toMs,
       universeFingerprint: params.universeFingerprint,
-      whaleRegistryFingerprint: params.whaleRegistryFingerprint
+      whaleRegistryFingerprint: params.whaleRegistryFingerprint,
+      ...params.abortSignal ? { signal: params.abortSignal } : {}
     });
     setBoundedSeriesCache(
       flowSeriesCache,
@@ -2951,7 +3005,8 @@ var loadHyperliquidWhaleFlowContext = async (params) => {
         decisionTimeMs,
         maxAgeMs,
         universeFingerprint: universe.fingerprint,
-        whaleRegistryFingerprint: whales.fingerprint
+        whaleRegistryFingerprint: whales.fingerprint,
+        abortSignal: params.abortSignal
       });
     } else {
       let pending = contextCache.get(cacheKey);
@@ -2962,7 +3017,8 @@ var loadHyperliquidWhaleFlowContext = async (params) => {
           decisionTimeMs,
           maxAgeMs,
           universeFingerprint: universe.fingerprint,
-          whaleRegistryFingerprint: whales.fingerprint
+          whaleRegistryFingerprint: whales.fingerprint,
+          ...params.abortSignal ? { signal: params.abortSignal } : {}
         });
         setBoundedCache(cacheKey, pending);
       }
@@ -2971,6 +3027,9 @@ var loadHyperliquidWhaleFlowContext = async (params) => {
     if (!row) return null;
     return toBaseHyperliquidWhaleFlowContext(row, minimumCoveragePct);
   } catch (error) {
+    if (isMarketContextCancellationError(error, params.abortSignal)) {
+      throw error;
+    }
     hyperliquidWhaleContextUnavailable = true;
     import_logger6.logger.warn(
       "Hyperliquid whale context disabled after Timescale read failure: %s",
@@ -2991,7 +3050,8 @@ var enrichSignalWithHyperliquidWhaleContext = async (params) => {
     env,
     enabled: params.enabled,
     marketInterval: params.interval,
-    maxAgeMs: params.maxAgeMs
+    maxAgeMs: params.maxAgeMs,
+    abortSignal: params.abortSignal
   });
   if (!hyperliquidWhales) return false;
   const baseContext = signal.additionalIndicators.baseContext;
@@ -3009,6 +3069,125 @@ var enrichSignalWithHyperliquidWhaleContext = async (params) => {
   return true;
 };
 
+// src/strategyHelpers/marketContextStages.ts
+var STAGE_ENV_KEYS = {
+  binance: "BINANCE_MARKET_CONTEXT_STAGE_TIMEOUT_MS",
+  coinmarketcap: "COINMARKETCAP_CONTEXT_STAGE_TIMEOUT_MS",
+  derivatives: "DERIVATIVES_CONTEXT_STAGE_TIMEOUT_MS",
+  hyperliquidWhales: "HYPERLIQUID_WHALE_CONTEXT_STAGE_TIMEOUT_MS"
+};
+var parsePositiveInt = (value) => {
+  const parsed = Number.parseInt(String(value ?? ""), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+};
+var resolveMarketContextStageTimeoutMs = (stage) => parsePositiveInt(process.env[STAGE_ENV_KEYS[stage]]) ?? parsePositiveInt(process.env.MARKET_CONTEXT_STAGE_TIMEOUT_MS) ?? 35e3;
+var runMarketContextStage = async ({
+  stage,
+  parentSignal,
+  operation,
+  onStart,
+  onComplete
+}) => {
+  const controller = new AbortController();
+  const timeoutMs = resolveMarketContextStageTimeoutMs(stage);
+  const startedAt = Date.now();
+  const onParentAbort = () => controller.abort(parentSignal?.reason);
+  parentSignal?.addEventListener("abort", onParentAbort, { once: true });
+  if (parentSignal?.aborted) onParentAbort();
+  onStart?.(stage);
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  timer.unref?.();
+  try {
+    let available = false;
+    try {
+      available = await operation(controller.signal);
+    } catch (error) {
+      if (isMarketContextCancellationError(error)) {
+        controller.abort(error);
+      }
+      if (!controller.signal.aborted) throw error;
+    }
+    const status = controller.signal.aborted ? "timed_out" : available ? "available" : "absent";
+    const result = {
+      stage,
+      status,
+      elapsedMs: Date.now() - startedAt
+    };
+    if (status === "timed_out") {
+      import_logger7.logger.warn(
+        "Market context stage timed out: %s after %sms",
+        stage,
+        result.elapsedMs
+      );
+    }
+    onComplete?.(result);
+    return result;
+  } finally {
+    clearTimeout(timer);
+    parentSignal?.removeEventListener("abort", onParentAbort);
+  }
+};
+var enrichSignalWithMarketContextStages = async ({
+  signal,
+  env,
+  coinMarketCapEnabled,
+  includeHyperliquidWhales = true,
+  abortSignal,
+  onStageStart,
+  onStageComplete
+}) => {
+  const stages = [
+    {
+      stage: "binance",
+      operation: (stageSignal) => enrichSignalWithBinanceMarketContext({
+        signal,
+        env,
+        abortSignal: stageSignal
+      })
+    },
+    {
+      stage: "coinmarketcap",
+      operation: (stageSignal) => enrichSignalWithCoinMarketCapContext({
+        signal,
+        env,
+        enabled: coinMarketCapEnabled,
+        abortSignal: stageSignal
+      })
+    },
+    {
+      stage: "derivatives",
+      operation: (stageSignal) => enrichSignalWithDerivativesContext({
+        signal,
+        env,
+        abortSignal: stageSignal
+      })
+    }
+  ];
+  if (includeHyperliquidWhales) {
+    stages.push({
+      stage: "hyperliquidWhales",
+      operation: (stageSignal) => enrichSignalWithHyperliquidWhaleContext({
+        signal,
+        env,
+        abortSignal: stageSignal
+      })
+    });
+  }
+  const results = [];
+  for (const stage of stages) {
+    if (abortSignal?.aborted) break;
+    results.push(
+      await runMarketContextStage({
+        ...stage,
+        parentSignal: abortSignal,
+        onStart: onStageStart,
+        onComplete: onStageComplete
+      })
+    );
+  }
+  return results;
+};
+
 // src/strategyAdapters/ml.ts
 var defaultMlAdapter = {
   normalizeStrategyConfig: (strategyConfig) => strategyConfig
@@ -3058,7 +3237,7 @@ var buildMlPayload = (payload) => {
 };
 
 // src/connectorsRegistry.ts
-var import_logger7 = require("@tradejs/infra/logger");
+var import_logger8 = require("@tradejs/infra/logger");
 var createConnectorRegistryState = () => ({
   connectorCreators: /* @__PURE__ */ new Map(),
   providerToConnectorName: /* @__PURE__ */ new Map(),
@@ -3110,7 +3289,7 @@ var normalizeProviders = (providers, connectorName) => {
 var registerProvider = (provider, connectorName, source, providerToConnectorName) => {
   const existing = providerToConnectorName.get(provider);
   if (existing && existing !== connectorName) {
-    import_logger7.logger.warn(
+    import_logger8.logger.warn(
       'Skip duplicate connector provider "%s" from %s: already mapped to %s',
       provider,
       source,
@@ -3123,11 +3302,11 @@ var registerProvider = (provider, connectorName, source, providerToConnectorName
 var registerEntry = (entry, source, state) => {
   const connectorName = String(entry?.name ?? "").trim();
   if (!connectorName) {
-    import_logger7.logger.warn("Skip connector entry without name from %s", source);
+    import_logger8.logger.warn("Skip connector entry without name from %s", source);
     return;
   }
   if (typeof entry.creator !== "function") {
-    import_logger7.logger.warn(
+    import_logger8.logger.warn(
       'Skip connector entry "%s" from %s: creator must be a function',
       connectorName,
       source
@@ -3139,7 +3318,7 @@ var registerEntry = (entry, source, state) => {
     state.connectorCreators
   );
   if (existingByName) {
-    import_logger7.logger.warn(
+    import_logger8.logger.warn(
       'Skip duplicate connector "%s" from %s: already registered as %s',
       connectorName,
       source,
@@ -3211,7 +3390,7 @@ var ensureConnectorPluginsLoaded = async (cwd = getTradejsProjectCwd()) => {
           );
           const pluginDefinition = extractConnectorPluginDefinition(moduleExport);
           if (!pluginDefinition) {
-            import_logger7.logger.warn(
+            import_logger8.logger.warn(
               'Skip connector plugin "%s": export { connectorEntries } is missing',
               moduleName
             );
@@ -3219,7 +3398,7 @@ var ensureConnectorPluginsLoaded = async (cwd = getTradejsProjectCwd()) => {
           }
           registerEntries2(pluginDefinition.connectorEntries, moduleName, state);
         } catch (error) {
-          import_logger7.logger.warn(
+          import_logger8.logger.warn(
             'Failed to load connector plugin "%s": %s',
             moduleName,
             String(error)
@@ -4692,7 +4871,7 @@ var prepareTestingData = async (params) => {
     throw new Error(`Unknown connector: ${connectorName}`);
   }
   if (!binanceConnector || !coinbaseConnector) {
-    import_logger8.logger.warn(
+    import_logger9.logger.warn(
       "Binance/Coinbase connectors are unavailable. Reusing %s for BTC references.",
       connectorName
     );
@@ -5257,35 +5436,15 @@ var testing = async ({
     }
     const shouldCapturePayload = signal && typeof signal !== "string" && signal.signalId && (ml || ai);
     if (shouldCapturePayload) {
-      await withTimeout(
-        "binance market context",
-        enrichSignalWithBinanceMarketContext({
-          signal,
-          env: "BACKTEST"
-        })
-      );
-      await withTimeout(
-        "coinmarketcap context",
-        enrichSignalWithCoinMarketCapContext({
-          signal,
-          env: "BACKTEST",
-          enabled: Boolean(ml || ai)
-        })
-      );
-      await withTimeout(
-        "derivatives context",
-        enrichSignalWithDerivativesContext({
-          signal,
-          env: "BACKTEST"
-        })
-      );
-      await withTimeout(
-        "hyperliquid whale context",
-        enrichSignalWithHyperliquidWhaleContext({
-          signal,
-          env: "BACKTEST"
-        })
-      );
+      await enrichSignalWithMarketContextStages({
+        signal,
+        env: "BACKTEST",
+        coinMarketCapEnabled: true,
+        onStageStart: (stage) => {
+          activeStageStartedAt = Date.now();
+          emitProgress(`${stage} context`, { force: true });
+        }
+      });
     }
     if (ml && signal && typeof signal !== "string" && signal.signalId) {
       const payload = buildMlPayload({
@@ -5689,35 +5848,15 @@ var testingGroupInSharedCandleLoop = async (tests) => {
       }
       const shouldCapturePayload = signal && typeof signal !== "string" && signal.signalId && (test.ml || test.ai);
       if (shouldCapturePayload) {
-        await withTimeout(
-          "binance market context",
-          enrichSignalWithBinanceMarketContext({
-            signal,
-            env: "BACKTEST"
-          })
-        );
-        await withTimeout(
-          "coinmarketcap context",
-          enrichSignalWithCoinMarketCapContext({
-            signal,
-            env: "BACKTEST",
-            enabled: Boolean(test.ml || test.ai)
-          })
-        );
-        await withTimeout(
-          "derivatives context",
-          enrichSignalWithDerivativesContext({
-            signal,
-            env: "BACKTEST"
-          })
-        );
-        await withTimeout(
-          "hyperliquid whale context",
-          enrichSignalWithHyperliquidWhaleContext({
-            signal,
-            env: "BACKTEST"
-          })
-        );
+        await enrichSignalWithMarketContextStages({
+          signal,
+          env: "BACKTEST",
+          coinMarketCapEnabled: true,
+          onStageStart: (stage) => {
+            activeStageStartedAt = Date.now();
+            emitProgress(`${stage} context`, { force: true });
+          }
+        });
       }
       if (test.ml && signal && typeof signal !== "string" && signal.signalId) {
         const payload = buildMlPayload({