@tradejs/cli 3.1.27 → 3.1.28-beta.252

package/dist/scripts/signals.js

@@ -4614,6 +4614,7 @@ var createSignalsTickerEvaluator = ({
     primaryEthClosedData,
     primaryEthByTimestamp,
     runtimeStrategies,
+    matchesStrategySymbol,
     strategyStats,
     runtimeCloseNotifications,
     lifecycle,
@@ -4654,6 +4655,9 @@ var createSignalsTickerEvaluator = ({
   );
   const strategySignals = [];
   for (const runtimeStrategy of runtimeStrategies) {
+    if (matchesStrategySymbol && !matchesStrategySymbol(runtimeStrategy, symbol)) {
+      continue;
+    }
     const {
       strategyName,
       strategyRevision,
@@ -4858,6 +4862,28 @@ var createSignalsTickerEvaluator = ({
 
 // src/lib/signals/configuredScopes.ts
 var sorted = (values) => values ? [...values].sort() : [];
+var normalizeSymbol = (value) => value.trim().toUpperCase();
+var isActiveTradeInScope = ({
+  trade,
+  deploymentId,
+  universe,
+  accountId,
+  interval
+}) => trade.status === "active" && trade.deploymentId === deploymentId && (trade.universe ?? "crypto") === universe && (!trade.accountId || trade.accountId === accountId) && (!trade.interval || String(trade.interval) === String(interval));
+var mergeConfiguredStrategySelections = (strategies) => {
+  if (strategies.some(({ selection }) => !selection)) {
+    return void 0;
+  }
+  return {
+    tickers: [
+      ...new Set(
+        strategies.flatMap(
+          ({ selection }) => (selection?.tickers ?? []).map(normalizeSymbol)
+        )
+      )
+    ].sort()
+  };
+};
 var formatConfiguredStrategyIdentity = (strategy) => `${strategy.strategyName}@${strategy.strategyRevision}[${strategy.controlState}]`;
 var getConfiguredScopeActiveSymbols = ({
   trades,
@@ -4871,11 +4897,48 @@ var getConfiguredScopeActiveSymbols = ({
   return [
     ...new Set(
       trades.filter(
-        (trade) => trade.status === "active" && trade.deploymentId === deploymentId && strategyNameSet.has(trade.strategy) && (trade.universe ?? "crypto") === universe && (!trade.accountId || trade.accountId === accountId) && (!trade.interval || String(trade.interval) === String(interval))
-      ).map(({ symbol }) => symbol)
+        (trade) => isActiveTradeInScope({
+          trade,
+          deploymentId,
+          universe,
+          accountId,
+          interval
+        }) && strategyNameSet.has(trade.strategy) && Boolean(trade.symbol)
+      ).map(({ symbol }) => normalizeSymbol(symbol))
     )
   ].sort();
 };
+var createConfiguredStrategySymbolMatcher = ({
+  trades,
+  deploymentId,
+  universe,
+  accountId,
+  interval
+}) => {
+  const activeStrategySymbols = new Set(
+    trades.filter(
+      (trade) => isActiveTradeInScope({
+        trade,
+        deploymentId,
+        universe,
+        accountId,
+        interval
+      })
+    ).map(
+      ({ strategy, symbol }) => `${strategy}\0${normalizeSymbol(symbol)}`
+    )
+  );
+  return (strategy, symbol) => {
+    if (!strategy.selection) return true;
+    const normalizedSymbol = normalizeSymbol(symbol);
+    return strategy.selection.tickers.some((ticker) => {
+      const normalizedTicker = normalizeSymbol(ticker);
+      return normalizedTicker === normalizedSymbol || universe === "crypto" && `${normalizedTicker}USDT` === normalizedSymbol;
+    }) || activeStrategySymbols.has(
+      `${strategy.strategyName}\0${normalizedSymbol}`
+    );
+  };
+};
 var buildConfiguredSignalsScopes = ({
   connectorName,
   deployment,
@@ -4893,15 +4956,11 @@ var buildConfiguredSignalsScopes = ({
   });
   const groups = /* @__PURE__ */ new Map();
   for (const strategy of strategies) {
-    const selectionIdentity = JSON.stringify({
-      tickers: sorted(strategy.selection?.tickers)
-    });
     const baseKey = [
       connectorName,
       strategy.universe,
       strategy.accountId ?? "default",
-      strategy.interval,
-      selectionIdentity
+      strategy.interval
     ].join(":");
     const group = groups.get(baseKey) ?? {
       scope: {
@@ -4909,26 +4968,31 @@ var buildConfiguredSignalsScopes = ({
         universe: strategy.universe,
         accountId: strategy.accountId,
         interval: strategy.interval,
-        strategyNames: [],
-        ...strategy.selection ? {
-          selection: { tickers: [...strategy.selection.tickers] }
-        } : {}
+        strategyNames: []
       },
-      strategyIdentities: []
+      strategyIdentities: [],
+      strategies: []
     };
     group.scope.strategyNames.push(strategy.strategyName);
     group.strategyIdentities.push(formatConfiguredStrategyIdentity(strategy));
+    group.strategies.push(strategy);
     groups.set(baseKey, group);
   }
-  return [...groups.entries()].map(([baseKey, group]) => ({
-    key: [baseKey, deploymentIdentity, ...group.strategyIdentities.sort()].join(
-      ":"
-    ),
-    scope: {
-      ...group.scope,
-      strategyNames: [...group.scope.strategyNames].sort()
-    }
-  }));
+  return [...groups.entries()].map(([baseKey, group]) => {
+    const selection = mergeConfiguredStrategySelections(group.strategies);
+    return {
+      key: [
+        baseKey,
+        deploymentIdentity,
+        ...group.strategyIdentities.sort()
+      ].join(":"),
+      scope: {
+        ...group.scope,
+        strategyNames: [...group.scope.strategyNames].sort(),
+        ...selection ? { selection } : {}
+      }
+    };
+  });
 };
 
 // src/lib/runtimeEvidenceCompositionSnapshots.ts
@@ -5453,10 +5517,12 @@ var createSignalsRunner = (config2) => {
         selection
       } = session;
       const universe = sessionUniverse ?? marketConnector.universe ?? "crypto";
-      const selectedActiveSymbols = !config2.tickers && selection?.tickers?.length && strategyNames?.length ? getConfiguredScopeActiveSymbols({
-        trades: await loadRuntimeActiveTrades(config2.userName),
+      const activeScopeStrategyNames = strategyNames?.length ? strategyNames : deployment?.strategies.filter(({ enabled }) => enabled).map(({ strategyName }) => strategyName) ?? [];
+      const runtimeActiveTrades = deployment?.id && activeScopeStrategyNames.length ? await loadRuntimeActiveTrades(config2.userName) : [];
+      const selectedActiveSymbols = !config2.tickers && activeScopeStrategyNames.length ? getConfiguredScopeActiveSymbols({
+        trades: runtimeActiveTrades,
         deploymentId: deployment?.id ?? "",
-        strategyNames,
+        strategyNames: activeScopeStrategyNames,
         universe,
         accountId,
         interval: interval2
@@ -5465,11 +5531,11 @@ var createSignalsRunner = (config2) => {
       if (selectedActiveSymbols.length) {
         import_logger4.logger.info(
           import_chalk7.default.gray(
-            `strategy selection retained active symbols: ${selectedActiveSymbols.join(", ")}`
+            `runtime scope retained active symbols: ${selectedActiveSymbols.join(", ")}`
           )
         );
       }
-      const tickers = await timeOperation2("tickers load", () => {
+      const loadedTickers = await timeOperation2("tickers load", () => {
         const baseArgs = [
           marketConnector,
           config2.tickers || selectedTickers?.join(",") || deployment?.tickers?.join(","),
@@ -5482,6 +5548,7 @@ var createSignalsRunner = (config2) => {
           assetClasses: deployment?.assetClasses
         }) : (0, import_cli2.getTickers)(...baseArgs);
       });
+      const tickers = config2.tickers ? loadedTickers : [.../* @__PURE__ */ new Set([...loadedTickers, ...selectedActiveSymbols])];
       if (universe === "tradfi" && typeof marketConnector.listInstruments !== "function") {
         throw new Error("TradFi connector must implement listInstruments");
       }
@@ -5635,10 +5702,19 @@ var createSignalsRunner = (config2) => {
         );
         return;
       }
+      const matchesStrategySymbol = createConfiguredStrategySymbolMatcher({
+        trades: runtimeActiveTrades,
+        deploymentId: deployment?.id ?? "",
+        universe,
+        accountId,
+        interval: interval2
+      });
       lifecycle.retain(
         new Set(
           tickers.flatMap(
-            (symbol) => runtimeStrategies.map(
+            (symbol) => runtimeStrategies.filter(
+              (runtimeStrategy) => matchesStrategySymbol(runtimeStrategy, symbol)
+            ).map(
               ({ strategyName, strategyRevision }) => buildSignalsStrategyLifecycleKey({
                 connectorName,
                 universe: sessionUniverse,
@@ -5705,6 +5781,7 @@ var createSignalsRunner = (config2) => {
           primaryEthClosedData,
           primaryEthByTimestamp,
           runtimeStrategies,
+          matchesStrategySymbol,
           strategyStats,
           runtimeCloseNotifications,
           lifecycle,

package/dist/scripts/signalsDaemon.js

@@ -4612,6 +4612,7 @@ var createSignalsTickerEvaluator = ({
     primaryEthClosedData,
     primaryEthByTimestamp,
     runtimeStrategies,
+    matchesStrategySymbol,
     strategyStats,
     runtimeCloseNotifications,
     lifecycle,
@@ -4652,6 +4653,9 @@ var createSignalsTickerEvaluator = ({
   );
   const strategySignals = [];
   for (const runtimeStrategy of runtimeStrategies) {
+    if (matchesStrategySymbol && !matchesStrategySymbol(runtimeStrategy, symbol)) {
+      continue;
+    }
     const {
       strategyName,
       strategyRevision,
@@ -4856,6 +4860,28 @@ var createSignalsTickerEvaluator = ({
 
 // src/lib/signals/configuredScopes.ts
 var sorted = (values) => values ? [...values].sort() : [];
+var normalizeSymbol = (value) => value.trim().toUpperCase();
+var isActiveTradeInScope = ({
+  trade,
+  deploymentId,
+  universe,
+  accountId,
+  interval
+}) => trade.status === "active" && trade.deploymentId === deploymentId && (trade.universe ?? "crypto") === universe && (!trade.accountId || trade.accountId === accountId) && (!trade.interval || String(trade.interval) === String(interval));
+var mergeConfiguredStrategySelections = (strategies) => {
+  if (strategies.some(({ selection }) => !selection)) {
+    return void 0;
+  }
+  return {
+    tickers: [
+      ...new Set(
+        strategies.flatMap(
+          ({ selection }) => (selection?.tickers ?? []).map(normalizeSymbol)
+        )
+      )
+    ].sort()
+  };
+};
 var formatConfiguredStrategyIdentity = (strategy) => `${strategy.strategyName}@${strategy.strategyRevision}[${strategy.controlState}]`;
 var getConfiguredScopeActiveSymbols = ({
   trades,
@@ -4869,11 +4895,48 @@ var getConfiguredScopeActiveSymbols = ({
   return [
     ...new Set(
       trades.filter(
-        (trade) => trade.status === "active" && trade.deploymentId === deploymentId && strategyNameSet.has(trade.strategy) && (trade.universe ?? "crypto") === universe && (!trade.accountId || trade.accountId === accountId) && (!trade.interval || String(trade.interval) === String(interval))
-      ).map(({ symbol }) => symbol)
+        (trade) => isActiveTradeInScope({
+          trade,
+          deploymentId,
+          universe,
+          accountId,
+          interval
+        }) && strategyNameSet.has(trade.strategy) && Boolean(trade.symbol)
+      ).map(({ symbol }) => normalizeSymbol(symbol))
     )
   ].sort();
 };
+var createConfiguredStrategySymbolMatcher = ({
+  trades,
+  deploymentId,
+  universe,
+  accountId,
+  interval
+}) => {
+  const activeStrategySymbols = new Set(
+    trades.filter(
+      (trade) => isActiveTradeInScope({
+        trade,
+        deploymentId,
+        universe,
+        accountId,
+        interval
+      })
+    ).map(
+      ({ strategy, symbol }) => `${strategy}\0${normalizeSymbol(symbol)}`
+    )
+  );
+  return (strategy, symbol) => {
+    if (!strategy.selection) return true;
+    const normalizedSymbol = normalizeSymbol(symbol);
+    return strategy.selection.tickers.some((ticker) => {
+      const normalizedTicker = normalizeSymbol(ticker);
+      return normalizedTicker === normalizedSymbol || universe === "crypto" && `${normalizedTicker}USDT` === normalizedSymbol;
+    }) || activeStrategySymbols.has(
+      `${strategy.strategyName}\0${normalizedSymbol}`
+    );
+  };
+};
 var buildConfiguredSignalsScopes = ({
   connectorName,
   deployment,
@@ -4891,15 +4954,11 @@ var buildConfiguredSignalsScopes = ({
   });
   const groups = /* @__PURE__ */ new Map();
   for (const strategy of strategies) {
-    const selectionIdentity = JSON.stringify({
-      tickers: sorted(strategy.selection?.tickers)
-    });
     const baseKey = [
       connectorName,
       strategy.universe,
       strategy.accountId ?? "default",
-      strategy.interval,
-      selectionIdentity
+      strategy.interval
     ].join(":");
     const group = groups.get(baseKey) ?? {
       scope: {
@@ -4907,26 +4966,31 @@ var buildConfiguredSignalsScopes = ({
         universe: strategy.universe,
         accountId: strategy.accountId,
         interval: strategy.interval,
-        strategyNames: [],
-        ...strategy.selection ? {
-          selection: { tickers: [...strategy.selection.tickers] }
-        } : {}
+        strategyNames: []
       },
-      strategyIdentities: []
+      strategyIdentities: [],
+      strategies: []
     };
     group.scope.strategyNames.push(strategy.strategyName);
     group.strategyIdentities.push(formatConfiguredStrategyIdentity(strategy));
+    group.strategies.push(strategy);
     groups.set(baseKey, group);
   }
-  return [...groups.entries()].map(([baseKey, group]) => ({
-    key: [baseKey, deploymentIdentity, ...group.strategyIdentities.sort()].join(
-      ":"
-    ),
-    scope: {
-      ...group.scope,
-      strategyNames: [...group.scope.strategyNames].sort()
-    }
-  }));
+  return [...groups.entries()].map(([baseKey, group]) => {
+    const selection = mergeConfiguredStrategySelections(group.strategies);
+    return {
+      key: [
+        baseKey,
+        deploymentIdentity,
+        ...group.strategyIdentities.sort()
+      ].join(":"),
+      scope: {
+        ...group.scope,
+        strategyNames: [...group.scope.strategyNames].sort(),
+        ...selection ? { selection } : {}
+      }
+    };
+  });
 };
 
 // src/lib/runtimeEvidenceCompositionSnapshots.ts
@@ -5451,10 +5515,12 @@ var createSignalsRunner = (config2) => {
         selection
       } = session;
       const universe = sessionUniverse ?? marketConnector.universe ?? "crypto";
-      const selectedActiveSymbols = !config2.tickers && selection?.tickers?.length && strategyNames?.length ? getConfiguredScopeActiveSymbols({
-        trades: await loadRuntimeActiveTrades(config2.userName),
+      const activeScopeStrategyNames = strategyNames?.length ? strategyNames : deployment?.strategies.filter(({ enabled }) => enabled).map(({ strategyName }) => strategyName) ?? [];
+      const runtimeActiveTrades = deployment?.id && activeScopeStrategyNames.length ? await loadRuntimeActiveTrades(config2.userName) : [];
+      const selectedActiveSymbols = !config2.tickers && activeScopeStrategyNames.length ? getConfiguredScopeActiveSymbols({
+        trades: runtimeActiveTrades,
         deploymentId: deployment?.id ?? "",
-        strategyNames,
+        strategyNames: activeScopeStrategyNames,
         universe,
         accountId,
         interval: interval2
@@ -5463,11 +5529,11 @@ var createSignalsRunner = (config2) => {
       if (selectedActiveSymbols.length) {
         import_logger4.logger.info(
           import_chalk7.default.gray(
-            `strategy selection retained active symbols: ${selectedActiveSymbols.join(", ")}`
+            `runtime scope retained active symbols: ${selectedActiveSymbols.join(", ")}`
           )
         );
       }
-      const tickers = await timeOperation2("tickers load", () => {
+      const loadedTickers = await timeOperation2("tickers load", () => {
         const baseArgs = [
           marketConnector,
           config2.tickers || selectedTickers?.join(",") || deployment?.tickers?.join(","),
@@ -5480,6 +5546,7 @@ var createSignalsRunner = (config2) => {
           assetClasses: deployment?.assetClasses
         }) : (0, import_cli2.getTickers)(...baseArgs);
       });
+      const tickers = config2.tickers ? loadedTickers : [.../* @__PURE__ */ new Set([...loadedTickers, ...selectedActiveSymbols])];
       if (universe === "tradfi" && typeof marketConnector.listInstruments !== "function") {
         throw new Error("TradFi connector must implement listInstruments");
       }
@@ -5633,10 +5700,19 @@ var createSignalsRunner = (config2) => {
         );
         return;
       }
+      const matchesStrategySymbol = createConfiguredStrategySymbolMatcher({
+        trades: runtimeActiveTrades,
+        deploymentId: deployment?.id ?? "",
+        universe,
+        accountId,
+        interval: interval2
+      });
       lifecycle.retain(
         new Set(
           tickers.flatMap(
-            (symbol) => runtimeStrategies.map(
+            (symbol) => runtimeStrategies.filter(
+              (runtimeStrategy) => matchesStrategySymbol(runtimeStrategy, symbol)
+            ).map(
               ({ strategyName, strategyRevision }) => buildSignalsStrategyLifecycleKey({
                 connectorName,
                 universe: sessionUniverse,
@@ -5703,6 +5779,7 @@ var createSignalsRunner = (config2) => {
           primaryEthClosedData,
           primaryEthByTimestamp,
           runtimeStrategies,
+          matchesStrategySymbol,
           strategyStats,
           runtimeCloseNotifications,
           lifecycle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradejs/cli",
-  "version": "3.1.27",
+  "version": "3.1.28-beta.252",
   "description": "Official CLI for the TradeJS TypeScript framework: infra setup, backtests, signals, bots, and ML workflows.",
   "keywords": [
     "tradejs",
@@ -36,13 +36,13 @@
     "tradejs": "dist/cli.js"
   },
   "dependencies": {
-    "@tradejs/connectors": "^3.1.27",
-    "@tradejs/core": "^3.1.27",
-    "@tradejs/indicators": "^3.1.27",
-    "@tradejs/infra": "^3.1.27",
-    "@tradejs/node": "^3.1.27",
+    "@tradejs/connectors": "^3.1.28-beta.252",
+    "@tradejs/core": "^3.1.28-beta.252",
+    "@tradejs/indicators": "^3.1.28-beta.252",
+    "@tradejs/infra": "^3.1.28-beta.252",
+    "@tradejs/node": "^3.1.28-beta.252",
     "@tradejs/strategy-kit": "3.0.4",
-    "@tradejs/types": "^3.1.27",
+    "@tradejs/types": "^3.1.28-beta.252",
     "args": "^5.0.3",
     "bcryptjs": "^2.4.3",
     "chalk": "4.1.2",