@tradejs/cli 2.0.9 → 2.0.11

package/dist/cli.js

@@ -4728,10 +4728,13 @@ var init_aiPocketSearch = __esm({
             ["selected_rows", run.selectedRows],
             ["evaluated_rows", run.evaluatedRows],
             ["scope", run.scope],
+            ["direction", run.direction ?? "all"],
             ["scope_rows", run.scopeRows],
             ["train_rows", run.trainRows],
             ["validation_rows", run.validationRows],
+            ["test_rows", run.testRows],
             ["validation_split", formatMdPercent(run.validationSplit)],
+            ["test_split", formatMdPercent(run.testSplit)],
             ["min_validation_support", run.minValidationSupport],
             ["failed", run.failed],
             ["recent", run.recent === 0 ? "all" : run.recent],
@@ -4869,7 +4872,7 @@ var init_aiPocketSearch = __esm({
 });
 
 // src/lib/aiPocketSearchCli.ts
-var AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS, readAiPocketSearchCliOption;
+var AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS, splitAiPocketResearchRowsByTimestamp, readAiPocketSearchCliOption;
 var init_aiPocketSearchCli = __esm({
   "src/lib/aiPocketSearchCli.ts"() {
     "use strict";
@@ -4877,7 +4880,47 @@ var init_aiPocketSearchCli = __esm({
       minProfitFactor: "1.2",
       minWinRate: "0",
       minTotalProfit: "0",
-      validationSplit: "0.25"
+      validationSplit: "0.25",
+      testSplit: "0"
+    };
+    splitAiPocketResearchRowsByTimestamp = (rows, validationSplit, testSplit = 0) => {
+      const timestamps = [
+        ...new Set(
+          rows.map((row) => row.timestamp).filter((timestamp) => Number.isFinite(timestamp))
+        )
+      ].sort((left, right) => left - right);
+      if (timestamps.length < 2) {
+        return { trainRows: rows, validationRows: [], testRows: [] };
+      }
+      const getSplitCount = (ratio) => ratio > 0 ? Math.max(1, Math.floor(timestamps.length * ratio)) : 0;
+      let testEvents = getSplitCount(testSplit);
+      let validationEvents = getSplitCount(validationSplit);
+      const maximumHeldOut = timestamps.length - 1;
+      if (testEvents + validationEvents > maximumHeldOut) {
+        validationEvents = Math.max(
+          0,
+          validationEvents - (testEvents + validationEvents - maximumHeldOut)
+        );
+      }
+      if (testEvents + validationEvents > maximumHeldOut) {
+        testEvents = Math.max(0, maximumHeldOut - validationEvents);
+      }
+      const testStart = timestamps.length - testEvents;
+      const validationStart = testStart - validationEvents;
+      const validationTimestamps = new Set(
+        timestamps.slice(validationStart, testStart)
+      );
+      const testTimestamps = new Set(timestamps.slice(testStart));
+      const isIn = (timestampsSet, timestamp) => typeof timestamp === "number" && timestampsSet.has(timestamp);
+      return {
+        trainRows: rows.filter(
+          (row) => !isIn(validationTimestamps, row.timestamp) && !isIn(testTimestamps, row.timestamp)
+        ),
+        validationRows: rows.filter(
+          (row) => isIn(validationTimestamps, row.timestamp)
+        ),
+        testRows: rows.filter((row) => isIn(testTimestamps, row.timestamp))
+      };
     };
     readAiPocketSearchCliOption = ({
       argv,
@@ -4904,7 +4947,7 @@ var aiPocketSearch_exports = {};
 __export(aiPocketSearch_exports, {
   main: () => main3
 });
-var import_args3, import_chalk4, import_promises4, import_path2, import_progress2, import_ai3, import_ai4, ListIt2, flags3, createListIt2, createTable2, formatRatio, formatProfit, formatNumber2, colorizeRatio, colorizeProfit, colorizeNumber, toReportTimestamp, markdownPlainTable, buildPendingMarkdownReport, normalizeInt, normalizePositiveInt, normalizeNonNegativeNumber, normalizeRatio, normalizeFeatureProfile, normalizeQuality, isAiApproval, listMergedFiles, deriveStrategyNameFromFile, getMergedGroupId, resolveMarkdownReportPath, sortDatasetPartPaths, resolveMergedDatasetFiles, getDatasetRowTimestamp, findMaxSelectedTimestamp, getDeterministicModelCandidate, resolveScopeRows, splitValidationRows, printSection, buildSummaryRows, buildPocketRows, buildQualityRows, tickProgressBarTo, searchPhaseLabels, hasCliOption2, main3;
+var import_args3, import_chalk4, import_promises4, import_path2, import_progress2, import_ai3, import_ai4, ListIt2, flags3, createListIt2, createTable2, formatRatio, formatProfit, formatNumber2, colorizeRatio, colorizeProfit, colorizeNumber, toReportTimestamp, markdownPlainTable, buildPendingMarkdownReport, normalizeInt, normalizePositiveInt, normalizeNonNegativeNumber, normalizeRatio, normalizeFeatureProfile, normalizeQuality, isAiApproval, listMergedFiles, deriveStrategyNameFromFile, getMergedGroupId, resolveMarkdownReportPath, sortDatasetPartPaths, resolveMergedDatasetFiles, getDatasetRowTimestamp, findMaxSelectedTimestamp, getDeterministicModelCandidate, resolveScopeRows, printSection, buildSummaryRows, buildPocketRows, buildQualityRows, tickProgressBarTo, searchPhaseLabels, hasCliOption2, main3;
 var init_aiPocketSearch2 = __esm({
   "src/scripts/aiPocketSearch.ts"() {
     "use strict";
@@ -4968,6 +5011,11 @@ var init_aiPocketSearch2 = __esm({
       "Search scope: all, approved, rejected, or candidates",
       "all"
     );
+    import_args3.default.option(
+      ["I", "direction"],
+      "Only search rows with this signal direction: LONG or SHORT",
+      ""
+    );
     import_args3.default.option(["d", "maxDepth"], "Maximum predicate-combination depth", 2);
     import_args3.default.option(["m", "minSupport"], "Minimum rows required for a pocket", 20);
     import_args3.default.option(
@@ -5000,6 +5048,11 @@ var init_aiPocketSearch2 = __esm({
       "Trailing time-ordered scope share reserved for validation (0 disables)",
       AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS.validationSplit
     );
+    import_args3.default.option(
+      ["T", "testSplit"],
+      "Trailing timestamp-grouped scope share withheld as untouched test",
+      AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS.testSplit
+    );
     import_args3.default.option(
       ["N", "minValidationSupport"],
       "Minimum validation rows required for positive pockets (0 = auto)",
@@ -5288,31 +5341,6 @@ var init_aiPocketSearch2 = __esm({
       }
       return rows;
     };
-    splitValidationRows = (rows, validationSplit) => {
-      if (validationSplit <= 0 || rows.length < 2) {
-        return {
-          trainRows: rows,
-          validationRows: []
-        };
-      }
-      const sortedRows = [...rows].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;
-        return leftTimestamp - rightTimestamp;
-      });
-      const validationCount = Math.max(
-        1,
-        Math.min(
-          sortedRows.length - 1,
-          Math.floor(sortedRows.length * validationSplit)
-        )
-      );
-      const splitIndex = sortedRows.length - validationCount;
-      return {
-        trainRows: sortedRows.slice(0, splitIndex),
-        validationRows: sortedRows.slice(splitIndex)
-      };
-    };
     printSection = (title, table) => {
       console.log(import_chalk4.default.gray(`${title}:`));
       console.log(table);
@@ -5412,6 +5440,12 @@ var init_aiPocketSearch2 = __esm({
           `Unsupported --scope "${scope}". Use all, approved, rejected, or candidates.`
         );
       }
+      const direction = String(flags3.direction || "").trim().toUpperCase();
+      if (direction && !["LONG", "SHORT"].includes(direction)) {
+        throw new Error(
+          `Unsupported --direction "${direction}". Use LONG or SHORT.`
+        );
+      }
       const maxDepth = normalizePositiveInt(flags3.maxDepth, 2);
       const minSupport = normalizePositiveInt(flags3.minSupport, 20);
       const minProfitFactor = normalizeNonNegativeNumber(
@@ -5449,6 +5483,14 @@ var init_aiPocketSearch2 = __esm({
         }) ?? flags3.validationSplit,
         0.25
       ) : 0.25;
+      const testSplit = hasCliOption2("testSplit", "T") ? normalizeRatio(
+        readAiPocketSearchCliOption({
+          argv: process.argv,
+          longName: "testSplit",
+          shortName: "T"
+        }) ?? flags3.testSplit,
+        0
+      ) : 0;
       const explicitMinValidationSupport = normalizeInt(
         flags3.minValidationSupport,
         0
@@ -5588,11 +5630,9 @@ var init_aiPocketSearch2 = __esm({
           }
         }
       });
-      const scopeRows = resolveScopeRows(rows, scope);
-      const { trainRows, validationRows } = splitValidationRows(
-        scopeRows,
-        validationSplit
-      );
+      const scopedRows = resolveScopeRows(rows, scope);
+      const scopeRows = direction ? scopedRows.filter((row) => row.direction === direction) : scopedRows;
+      const { trainRows, validationRows, testRows } = splitAiPocketResearchRowsByTimestamp(scopeRows, validationSplit, testSplit);
       const minValidationSupport = explicitMinValidationSupport > 0 ? explicitMinValidationSupport : validationRows.length ? Math.max(3, Math.ceil(minSupport * validationSplit * 0.5)) : 0;
       const currentGateSummary = summarizeAiTrainEvaluations(rows);
       const currentGateQualityThresholds = summarizeAiTrainEvaluationsByQualityThreshold(rows, qualityThresholds);
@@ -5655,9 +5695,11 @@ var init_aiPocketSearch2 = __esm({
           selectedRows,
           evaluatedRows: rows.length,
           scope,
+          direction: direction || null,
           scopeRows: scopeRows.length,
           trainRows: trainRows.length,
           validationRows: validationRows.length,
+          testRows: testRows.length,
           scanned,
           dateSkipped,
           failed,
@@ -5672,6 +5714,7 @@ var init_aiPocketSearch2 = __esm({
           includeGateContext,
           featureProfile,
           validationSplit,
+          testSplit,
           minValidationSupport,
           reportPath,
           search: {
@@ -5683,6 +5726,7 @@ var init_aiPocketSearch2 = __esm({
             maxAtomicPredicates,
             maxCombinations,
             validationSplit,
+            testSplit,
             minValidationSupport,
             dedupeEquivalentSelections,
             top
@@ -5724,9 +5768,11 @@ var init_aiPocketSearch2 = __esm({
             ["selected", import_chalk4.default.blue(String(selectedRows))],
             ["evaluated", import_chalk4.default.blue(String(rows.length))],
             ["scope", import_chalk4.default.yellow(scope)],
+            ["direction", direction ? import_chalk4.default.yellow(direction) : import_chalk4.default.gray("all")],
             ["scope_rows", import_chalk4.default.blue(String(scopeRows.length))],
             ["train_rows", import_chalk4.default.blue(String(trainRows.length))],
             ["validation_rows", import_chalk4.default.blue(String(validationRows.length))],
+            ["test_rows", import_chalk4.default.blue(String(testRows.length))],
             ["source_rows", import_chalk4.default.blue(String(totalRows))],
             ["date_skipped", import_chalk4.default.blue(String(dateSkipped))],
             [
@@ -5753,6 +5799,7 @@ var init_aiPocketSearch2 = __esm({
             ["max_atomic_predicates", import_chalk4.default.magenta(String(maxAtomicPredicates))],
             ["max_combinations", import_chalk4.default.magenta(String(maxCombinations))],
             ["validation_split", import_chalk4.default.magenta(formatRatio(validationSplit))],
+            ["test_split", import_chalk4.default.magenta(formatRatio(testSplit))],
             ["min_validation_support", import_chalk4.default.magenta(String(minValidationSupport))],
             [
               "dedupe_equivalent",
@@ -11160,7 +11207,7 @@ var init_timeWindow = __esm({
 });
 
 // src/lib/runtimeRedis.ts
-var import_redis4, import_time, RESERVED_STRATEGY_NAMES, RESERVED_CONFIG_IDS, resolveStrategyConfigIdentityByKey, isRuntimeStrategyEnabled, isRuntimeTradeRecord, resolveStrategyNameByConfigKey, getRuntimeStrategyConfigKeys, loadRuntimeStrategyNames, loadRuntimeStrategyConfigs, loadRuntimeTrades, loadStrategyResultSymbols;
+var import_redis4, import_time, RESERVED_STRATEGY_NAMES, RESERVED_CONFIG_IDS, resolveStrategyConfigIdentityByKey, isRuntimeStrategyEnabled, isRuntimeTradeRecord, resolveStrategyNameByConfigKey, getRuntimeStrategyConfigKeys, loadRuntimeStrategyNames, loadRuntimeStrategyConfigs, loadRuntimeTrades, loadRuntimeActiveTradeOrderIds, loadStrategyResultSymbols;
 var init_runtimeRedis = __esm({
   "src/lib/runtimeRedis.ts"() {
     "use strict";
@@ -11264,6 +11311,15 @@ var init_runtimeRedis = __esm({
       const trades = await Promise.all(keys.map((key) => (0, import_redis4.getData)(key, null)));
       return trades.filter(isRuntimeTradeRecord).filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
     };
+    loadRuntimeActiveTradeOrderIds = async (userName2) => {
+      const keys = await (0, import_redis4.getKeys)(import_redis4.redisKeys.runtimeActiveTrades(userName2));
+      const refs = await Promise.all(keys.map((key) => (0, import_redis4.getData)(key, null)));
+      return new Set(
+        refs.map(
+          (ref) => ref && typeof ref === "object" && "orderId" in ref && typeof ref.orderId === "string" && ref.orderId.trim() ? ref.orderId.trim() : null
+        ).filter((orderId) => orderId != null)
+      );
+    };
     loadStrategyResultSymbols = async ({
       userName: userName2,
       strategy
@@ -24892,7 +24948,8 @@ var init_runtimeDebugEvidence = __esm({
           );
           const activeTradeKey = import_redis14.redisKeys.runtimeActiveTrade(
             userName2,
-            trade.symbol
+            trade.symbol,
+            trade.deploymentId ?? trade.accountId
           );
           const signalKey = trade.signalId != null ? import_redis14.redisKeys.storeSignal(trade.symbol, trade.signalId) : null;
           const evaluationBucketKey = import_redis14.redisKeys.runtimeSignalEvaluationBucket(
@@ -33975,7 +34032,7 @@ __export(signalsSummary_exports, {
   main: () => main36,
   signalsSummary: () => signalsSummary
 });
-var import_config11, import_args29, import_logger12, import_connectors18, flags27, projectRoot13, SUMMARY_TIMEZONE2, SUMMARY_TIMEZONE_LABEL2, escapeHtml5, formatMskDateTime3, formatSigned3, formatPnlMoneyText, formatWinRateText, resolveSummaryTitle, normalizeStatus, shouldAttachDebugReport, getSummaryDateParts, formatSummaryIsoDayKey, unescapeHtml, stripTelegramHtml, buildSignalsSummaryAttachment, appendReportAttachmentSummary, resolveSummaryConnectorName, createRuntimeSignalStats, mergeRuntimeSignalStats, buildSummaryPrelude, resolveTradeStatusEmoji, isTimestampInWindow, isRuntimeTradeClosedInWindow, buildSummaryMessages, signalsSummary, main36;
+var import_config11, import_args29, import_logger12, import_connectors18, import_tradingAccounts4, flags27, projectRoot13, SUMMARY_TIMEZONE2, SUMMARY_TIMEZONE_LABEL2, escapeHtml5, formatMskDateTime3, formatSigned3, formatPnlMoneyText, formatWinRateText, resolveSummaryTitle, normalizeStatus, shouldAttachDebugReport, getSummaryDateParts, formatSummaryIsoDayKey, unescapeHtml, stripTelegramHtml, buildSignalsSummaryAttachment, appendReportAttachmentSummary, resolveSummaryConnectorName, groupRuntimeTradesByConnectorScope, syncRuntimeTradeScopes, createRuntimeSignalStats, mergeRuntimeSignalStats, buildSummaryPrelude, resolveTradeStatusEmoji, isTimestampInWindow, isRuntimeTradeClosedInWindow, buildSummaryMessages, signalsSummary, main36;
 var init_signalsSummary = __esm({
   "src/scripts/signalsSummary.ts"() {
     "use strict";
@@ -33989,6 +34046,7 @@ var init_signalsSummary = __esm({
     init_runtimeSignalsLoader();
     init_runtimeSignalsStorage();
     init_runtimeDebugEvidence();
+    import_tradingAccounts4 = require("@tradejs/infra/tradingAccounts");
     import_args29.default.option(["u", "user"], "Use user config", "root");
     import_args29.default.option(
       "connector",
@@ -34101,6 +34159,108 @@ var init_signalsSummary = __esm({
       );
       return import_connectors18.DEFAULT_CONNECTOR_NAME;
     };
+    groupRuntimeTradesByConnectorScope = ({
+      trades,
+      deployments,
+      fallbackConnectorName
+    }) => {
+      const deploymentById = new Map(
+        deployments.map((deployment) => [deployment.id, deployment])
+      );
+      const scopes = /* @__PURE__ */ new Map();
+      for (const trade of trades) {
+        const deployment = trade.deploymentId ? deploymentById.get(trade.deploymentId) : void 0;
+        const connectorName = deployment?.connectorName ?? fallbackConnectorName;
+        const universe = trade.universe ?? deployment?.universe ?? "crypto";
+        const accountId = trade.accountId ?? deployment?.accountId;
+        const deploymentId = trade.deploymentId;
+        const scopeKey = JSON.stringify([
+          connectorName,
+          universe,
+          accountId ?? null,
+          deploymentId ?? null
+        ]);
+        const scope = scopes.get(scopeKey) ?? {
+          connectorName,
+          universe,
+          ...accountId ? { accountId } : {},
+          ...deploymentId ? { deploymentId } : {},
+          trades: []
+        };
+        scope.trades.push(trade);
+        scopes.set(scopeKey, scope);
+      }
+      return [...scopes.values()];
+    };
+    syncRuntimeTradeScopes = async ({
+      userName: userName2,
+      startTime,
+      endTime,
+      fallbackConnectorName,
+      trades,
+      deployments
+    }) => {
+      const scopes = groupRuntimeTradesByConnectorScope({
+        trades,
+        deployments,
+        fallbackConnectorName
+      });
+      const syncedTrades = [];
+      const connectorNames = /* @__PURE__ */ new Set();
+      for (const scope of scopes) {
+        const connectorName = await resolveSummaryConnectorName(
+          scope.connectorName
+        );
+        const connectorFactory = await (0, import_connectors18.getConnectorCreatorByName)(
+          connectorName,
+          projectRoot13
+        );
+        if (!connectorFactory) {
+          throw new Error(`Connector "${connectorName}" is not registered`);
+        }
+        const connector = await connectorFactory({
+          userName: userName2,
+          universe: scope.universe,
+          accountId: scope.accountId,
+          deploymentId: scope.deploymentId
+        });
+        connectorNames.add(connectorName);
+        syncedTrades.push(
+          ...await syncRuntimeTrades({
+            userName: userName2,
+            connector,
+            trades: scope.trades,
+            startTime,
+            endTime,
+            openPositionCallbacks: {
+              onError: (error) => {
+                import_logger12.logger.warn(
+                  "signals summary: getOpenPositionPnl failed for scope account=%s deployment=%s: %s",
+                  scope.accountId ?? "default",
+                  scope.deploymentId ?? "default",
+                  formatRuntimeTradeSyncError(error)
+                );
+              }
+            },
+            closedPnlCallbacks: {
+              onError: (error) => {
+                import_logger12.logger.warn(
+                  "signals summary: getClosedPnl failed for scope account=%s deployment=%s: %s",
+                  scope.accountId ?? "default",
+                  scope.deploymentId ?? "default",
+                  formatRuntimeTradeSyncError(error)
+                );
+              }
+            }
+          })
+        );
+      }
+      return {
+        trades: syncedTrades,
+        connectorNames: [...connectorNames].sort(),
+        scopesCount: scopes.length
+      };
+    };
     createRuntimeSignalStats = () => ({
       evaluated: 0,
       signals: 0,
@@ -34410,46 +34570,35 @@ none`
       );
       const endTime = Date.now();
       const startTime = endTime - hours * 60 * 60 * 1e3;
-      const connectorName = await resolveSummaryConnectorName(flags27.connector);
-      const connectorFactory = await (0, import_connectors18.getConnectorCreatorByName)(
-        connectorName,
-        projectRoot13
+      const fallbackConnectorName = await resolveSummaryConnectorName(
+        flags27.connector
       );
-      if (!connectorFactory) {
-        throw new Error(`Connector "${connectorName}" is not registered`);
-      }
-      const connector = await connectorFactory({
-        userName: flags27.user
-      });
-      const [configuredStrategyNames, signals2, evaluationStatsBuckets, trades] = await Promise.all([
+      const [
+        configuredStrategyNames,
+        signals2,
+        evaluationStatsBuckets,
+        trades,
+        runtimeDeployments
+      ] = await Promise.all([
         loadRuntimeStrategyNames(flags27.user),
         loadRuntimeSignals(flags27.user, { startTime, endTime }),
         loadRuntimeSignalEvaluationStatsBuckets(flags27.user),
-        loadRuntimeTrades(flags27.user)
+        loadRuntimeTrades(flags27.user),
+        (0, import_tradingAccounts4.listRuntimeDeployments)(flags27.user)
       ]);
-      const syncedTrades = await syncRuntimeTrades({
+      const {
+        trades: syncedTrades,
+        connectorNames,
+        scopesCount
+      } = await syncRuntimeTradeScopes({
         userName: flags27.user,
-        connector,
-        trades,
         startTime,
         endTime,
-        openPositionCallbacks: {
-          onError: (error) => {
-            import_logger12.logger.warn(
-              "signals summary: getOpenPositionPnl failed: %s",
-              formatRuntimeTradeSyncError(error)
-            );
-          }
-        },
-        closedPnlCallbacks: {
-          onError: (error) => {
-            import_logger12.logger.warn(
-              "signals summary: getClosedPnl failed: %s",
-              formatRuntimeTradeSyncError(error)
-            );
-          }
-        }
+        fallbackConnectorName,
+        trades,
+        deployments: runtimeDeployments
       });
+      const activeTradeOrderIds = await loadRuntimeActiveTradeOrderIds(flags27.user);
       const windowSignals = signals2.filter(
         (signal) => signal.timestamp >= startTime && signal.timestamp < endTime
       );
@@ -34467,7 +34616,7 @@ none`
         (trade) => isRuntimeTradeClosedInWindow(trade, startTime, endTime)
       );
       const openSnapshotTrades = syncedTrades.filter(
-        (trade) => trade.status === "active" && typeof trade.entryTimestamp === "number" && Number.isFinite(trade.entryTimestamp) && trade.entryTimestamp < endTime
+        (trade) => trade.status === "active" && activeTradeOrderIds.has(trade.orderId) && typeof trade.entryTimestamp === "number" && Number.isFinite(trade.entryTimestamp) && trade.entryTimestamp < endTime
       );
       const windowTrades = [...windowClosedTrades, ...openSnapshotTrades];
       const windowTradeSignalIds = new Set(
@@ -34490,12 +34639,13 @@ none`
         0
       );
       import_logger12.logger.info(
-        "signals summary window=%sh signals=%s evaluations=%s trades=%s connector=%s user=%s",
+        "signals summary window=%sh signals=%s evaluations=%s trades=%s connectors=%s scopes=%s user=%s",
         hours,
         windowSignals.length,
         windowEvaluationsCount,
         windowClosedTrades.length,
-        connectorName,
+        connectorNames.join(",") || fallbackConnectorName,
+        scopesCount,
         flags27.user
       );
       const debugAttachment = shouldAttachDebugReport(flags27.debugAttachment) ? await buildRuntimeDebugReportAttachment({

package/dist/lib/aiPocketSearch.js

@@ -1187,10 +1187,13 @@ var buildAiPocketMarkdownReport = ({
         ["selected_rows", run.selectedRows],
         ["evaluated_rows", run.evaluatedRows],
         ["scope", run.scope],
+        ["direction", run.direction ?? "all"],
         ["scope_rows", run.scopeRows],
         ["train_rows", run.trainRows],
         ["validation_rows", run.validationRows],
+        ["test_rows", run.testRows],
         ["validation_split", formatMdPercent(run.validationSplit)],
+        ["test_split", formatMdPercent(run.testSplit)],
         ["min_validation_support", run.minValidationSupport],
         ["failed", run.failed],
         ["recent", run.recent === 0 ? "all" : run.recent],

package/dist/lib/aiPocketSearchCli.js

@@ -21,14 +21,55 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var aiPocketSearchCli_exports = {};
 __export(aiPocketSearchCli_exports, {
   AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS: () => AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS,
-  readAiPocketSearchCliOption: () => readAiPocketSearchCliOption
+  readAiPocketSearchCliOption: () => readAiPocketSearchCliOption,
+  splitAiPocketResearchRowsByTimestamp: () => splitAiPocketResearchRowsByTimestamp
 });
 module.exports = __toCommonJS(aiPocketSearchCli_exports);
 var AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS = {
   minProfitFactor: "1.2",
   minWinRate: "0",
   minTotalProfit: "0",
-  validationSplit: "0.25"
+  validationSplit: "0.25",
+  testSplit: "0"
+};
+var splitAiPocketResearchRowsByTimestamp = (rows, validationSplit, testSplit = 0) => {
+  const timestamps = [
+    ...new Set(
+      rows.map((row) => row.timestamp).filter((timestamp) => Number.isFinite(timestamp))
+    )
+  ].sort((left, right) => left - right);
+  if (timestamps.length < 2) {
+    return { trainRows: rows, validationRows: [], testRows: [] };
+  }
+  const getSplitCount = (ratio) => ratio > 0 ? Math.max(1, Math.floor(timestamps.length * ratio)) : 0;
+  let testEvents = getSplitCount(testSplit);
+  let validationEvents = getSplitCount(validationSplit);
+  const maximumHeldOut = timestamps.length - 1;
+  if (testEvents + validationEvents > maximumHeldOut) {
+    validationEvents = Math.max(
+      0,
+      validationEvents - (testEvents + validationEvents - maximumHeldOut)
+    );
+  }
+  if (testEvents + validationEvents > maximumHeldOut) {
+    testEvents = Math.max(0, maximumHeldOut - validationEvents);
+  }
+  const testStart = timestamps.length - testEvents;
+  const validationStart = testStart - validationEvents;
+  const validationTimestamps = new Set(
+    timestamps.slice(validationStart, testStart)
+  );
+  const testTimestamps = new Set(timestamps.slice(testStart));
+  const isIn = (timestampsSet, timestamp) => typeof timestamp === "number" && timestampsSet.has(timestamp);
+  return {
+    trainRows: rows.filter(
+      (row) => !isIn(validationTimestamps, row.timestamp) && !isIn(testTimestamps, row.timestamp)
+    ),
+    validationRows: rows.filter(
+      (row) => isIn(validationTimestamps, row.timestamp)
+    ),
+    testRows: rows.filter((row) => isIn(testTimestamps, row.timestamp))
+  };
 };
 var readAiPocketSearchCliOption = ({
   argv,
@@ -50,5 +91,6 @@ var readAiPocketSearchCliOption = ({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS,
-  readAiPocketSearchCliOption
+  readAiPocketSearchCliOption,
+  splitAiPocketResearchRowsByTimestamp
 });

package/dist/lib/runtimeDebugEvidence.js

@@ -382,7 +382,8 @@ var buildRuntimeDebugReportPayload = async ({
       );
       const activeTradeKey = import_redis3.redisKeys.runtimeActiveTrade(
         userName,
-        trade.symbol
+        trade.symbol,
+        trade.deploymentId ?? trade.accountId
       );
       const signalKey = trade.signalId != null ? import_redis3.redisKeys.storeSignal(trade.symbol, trade.signalId) : null;
       const evaluationBucketKey = import_redis3.redisKeys.runtimeSignalEvaluationBucket(

package/dist/lib/runtimeRedis.js

@@ -23,6 +23,7 @@ __export(runtimeRedis_exports, {
   getRuntimeStrategyConfigKeys: () => getRuntimeStrategyConfigKeys,
   isRuntimeStrategyEnabled: () => isRuntimeStrategyEnabled,
   isRuntimeTradeRecord: () => isRuntimeTradeRecord,
+  loadRuntimeActiveTradeOrderIds: () => loadRuntimeActiveTradeOrderIds,
   loadRuntimeStrategyConfigs: () => loadRuntimeStrategyConfigs,
   loadRuntimeStrategyNames: () => loadRuntimeStrategyNames,
   loadRuntimeTrades: () => loadRuntimeTrades,
@@ -131,6 +132,15 @@ var loadRuntimeTrades = async (userName, {
   const trades = await Promise.all(keys.map((key) => (0, import_redis.getData)(key, null)));
   return trades.filter(isRuntimeTradeRecord).filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
 };
+var loadRuntimeActiveTradeOrderIds = async (userName) => {
+  const keys = await (0, import_redis.getKeys)(import_redis.redisKeys.runtimeActiveTrades(userName));
+  const refs = await Promise.all(keys.map((key) => (0, import_redis.getData)(key, null)));
+  return new Set(
+    refs.map(
+      (ref) => ref && typeof ref === "object" && "orderId" in ref && typeof ref.orderId === "string" && ref.orderId.trim() ? ref.orderId.trim() : null
+    ).filter((orderId) => orderId != null)
+  );
+};
 var loadStrategyResultSymbols = async ({
   userName,
   strategy
@@ -148,6 +158,7 @@ var loadStrategyResultSymbols = async ({
   getRuntimeStrategyConfigKeys,
   isRuntimeStrategyEnabled,
   isRuntimeTradeRecord,
+  loadRuntimeActiveTradeOrderIds,
   loadRuntimeStrategyConfigs,
   loadRuntimeStrategyNames,
   loadRuntimeTrades,

package/dist/scripts/aiPocketSearch.js

@@ -3176,10 +3176,13 @@ var buildAiPocketMarkdownReport = ({
         ["selected_rows", run.selectedRows],
         ["evaluated_rows", run.evaluatedRows],
         ["scope", run.scope],
+        ["direction", run.direction ?? "all"],
         ["scope_rows", run.scopeRows],
         ["train_rows", run.trainRows],
         ["validation_rows", run.validationRows],
+        ["test_rows", run.testRows],
         ["validation_split", formatMdPercent(run.validationSplit)],
+        ["test_split", formatMdPercent(run.testSplit)],
         ["min_validation_support", run.minValidationSupport],
         ["failed", run.failed],
         ["recent", run.recent === 0 ? "all" : run.recent],
@@ -3319,7 +3322,47 @@ var AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS = {
   minProfitFactor: "1.2",
   minWinRate: "0",
   minTotalProfit: "0",
-  validationSplit: "0.25"
+  validationSplit: "0.25",
+  testSplit: "0"
+};
+var splitAiPocketResearchRowsByTimestamp = (rows, validationSplit, testSplit = 0) => {
+  const timestamps = [
+    ...new Set(
+      rows.map((row) => row.timestamp).filter((timestamp) => Number.isFinite(timestamp))
+    )
+  ].sort((left, right) => left - right);
+  if (timestamps.length < 2) {
+    return { trainRows: rows, validationRows: [], testRows: [] };
+  }
+  const getSplitCount = (ratio) => ratio > 0 ? Math.max(1, Math.floor(timestamps.length * ratio)) : 0;
+  let testEvents = getSplitCount(testSplit);
+  let validationEvents = getSplitCount(validationSplit);
+  const maximumHeldOut = timestamps.length - 1;
+  if (testEvents + validationEvents > maximumHeldOut) {
+    validationEvents = Math.max(
+      0,
+      validationEvents - (testEvents + validationEvents - maximumHeldOut)
+    );
+  }
+  if (testEvents + validationEvents > maximumHeldOut) {
+    testEvents = Math.max(0, maximumHeldOut - validationEvents);
+  }
+  const testStart = timestamps.length - testEvents;
+  const validationStart = testStart - validationEvents;
+  const validationTimestamps = new Set(
+    timestamps.slice(validationStart, testStart)
+  );
+  const testTimestamps = new Set(timestamps.slice(testStart));
+  const isIn = (timestampsSet, timestamp) => typeof timestamp === "number" && timestampsSet.has(timestamp);
+  return {
+    trainRows: rows.filter(
+      (row) => !isIn(validationTimestamps, row.timestamp) && !isIn(testTimestamps, row.timestamp)
+    ),
+    validationRows: rows.filter(
+      (row) => isIn(validationTimestamps, row.timestamp)
+    ),
+    testRows: rows.filter((row) => isIn(testTimestamps, row.timestamp))
+  };
 };
 var readAiPocketSearchCliOption = ({
   argv,
@@ -3388,6 +3431,11 @@ import_args.default.option(
   "Search scope: all, approved, rejected, or candidates",
   "all"
 );
+import_args.default.option(
+  ["I", "direction"],
+  "Only search rows with this signal direction: LONG or SHORT",
+  ""
+);
 import_args.default.option(["d", "maxDepth"], "Maximum predicate-combination depth", 2);
 import_args.default.option(["m", "minSupport"], "Minimum rows required for a pocket", 20);
 import_args.default.option(
@@ -3420,6 +3468,11 @@ import_args.default.option(
   "Trailing time-ordered scope share reserved for validation (0 disables)",
   AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS.validationSplit
 );
+import_args.default.option(
+  ["T", "testSplit"],
+  "Trailing timestamp-grouped scope share withheld as untouched test",
+  AI_POCKET_SEARCH_CLI_DECIMAL_DEFAULTS.testSplit
+);
 import_args.default.option(
   ["N", "minValidationSupport"],
   "Minimum validation rows required for positive pockets (0 = auto)",
@@ -3708,31 +3761,6 @@ var resolveScopeRows = (rows, scope) => {
   }
   return rows;
 };
-var splitValidationRows = (rows, validationSplit) => {
-  if (validationSplit <= 0 || rows.length < 2) {
-    return {
-      trainRows: rows,
-      validationRows: []
-    };
-  }
-  const sortedRows = [...rows].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;
-    return leftTimestamp - rightTimestamp;
-  });
-  const validationCount = Math.max(
-    1,
-    Math.min(
-      sortedRows.length - 1,
-      Math.floor(sortedRows.length * validationSplit)
-    )
-  );
-  const splitIndex = sortedRows.length - validationCount;
-  return {
-    trainRows: sortedRows.slice(0, splitIndex),
-    validationRows: sortedRows.slice(splitIndex)
-  };
-};
 var printSection = (title, table) => {
   console.log(import_chalk.default.gray(`${title}:`));
   console.log(table);
@@ -3832,6 +3860,12 @@ var main = async () => {
       `Unsupported --scope "${scope}". Use all, approved, rejected, or candidates.`
     );
   }
+  const direction = String(flags.direction || "").trim().toUpperCase();
+  if (direction && !["LONG", "SHORT"].includes(direction)) {
+    throw new Error(
+      `Unsupported --direction "${direction}". Use LONG or SHORT.`
+    );
+  }
   const maxDepth = normalizePositiveInt(flags.maxDepth, 2);
   const minSupport = normalizePositiveInt(flags.minSupport, 20);
   const minProfitFactor = normalizeNonNegativeNumber(
@@ -3869,6 +3903,14 @@ var main = async () => {
     }) ?? flags.validationSplit,
     0.25
   ) : 0.25;
+  const testSplit = hasCliOption2("testSplit", "T") ? normalizeRatio(
+    readAiPocketSearchCliOption({
+      argv: process.argv,
+      longName: "testSplit",
+      shortName: "T"
+    }) ?? flags.testSplit,
+    0
+  ) : 0;
   const explicitMinValidationSupport = normalizeInt(
     flags.minValidationSupport,
     0
@@ -4008,11 +4050,9 @@ var main = async () => {
       }
     }
   });
-  const scopeRows = resolveScopeRows(rows, scope);
-  const { trainRows, validationRows } = splitValidationRows(
-    scopeRows,
-    validationSplit
-  );
+  const scopedRows = resolveScopeRows(rows, scope);
+  const scopeRows = direction ? scopedRows.filter((row) => row.direction === direction) : scopedRows;
+  const { trainRows, validationRows, testRows } = splitAiPocketResearchRowsByTimestamp(scopeRows, validationSplit, testSplit);
   const minValidationSupport = explicitMinValidationSupport > 0 ? explicitMinValidationSupport : validationRows.length ? Math.max(3, Math.ceil(minSupport * validationSplit * 0.5)) : 0;
   const currentGateSummary = summarizeAiTrainEvaluations(rows);
   const currentGateQualityThresholds = summarizeAiTrainEvaluationsByQualityThreshold(rows, qualityThresholds);
@@ -4075,9 +4115,11 @@ var main = async () => {
       selectedRows,
       evaluatedRows: rows.length,
       scope,
+      direction: direction || null,
       scopeRows: scopeRows.length,
       trainRows: trainRows.length,
       validationRows: validationRows.length,
+      testRows: testRows.length,
       scanned,
       dateSkipped,
       failed,
@@ -4092,6 +4134,7 @@ var main = async () => {
       includeGateContext,
       featureProfile,
       validationSplit,
+      testSplit,
       minValidationSupport,
       reportPath,
       search: {
@@ -4103,6 +4146,7 @@ var main = async () => {
         maxAtomicPredicates,
         maxCombinations,
         validationSplit,
+        testSplit,
         minValidationSupport,
         dedupeEquivalentSelections,
         top
@@ -4144,9 +4188,11 @@ var main = async () => {
         ["selected", import_chalk.default.blue(String(selectedRows))],
         ["evaluated", import_chalk.default.blue(String(rows.length))],
         ["scope", import_chalk.default.yellow(scope)],
+        ["direction", direction ? import_chalk.default.yellow(direction) : import_chalk.default.gray("all")],
         ["scope_rows", import_chalk.default.blue(String(scopeRows.length))],
         ["train_rows", import_chalk.default.blue(String(trainRows.length))],
         ["validation_rows", import_chalk.default.blue(String(validationRows.length))],
+        ["test_rows", import_chalk.default.blue(String(testRows.length))],
         ["source_rows", import_chalk.default.blue(String(totalRows))],
         ["date_skipped", import_chalk.default.blue(String(dateSkipped))],
         [
@@ -4173,6 +4219,7 @@ var main = async () => {
         ["max_atomic_predicates", import_chalk.default.magenta(String(maxAtomicPredicates))],
         ["max_combinations", import_chalk.default.magenta(String(maxCombinations))],
         ["validation_split", import_chalk.default.magenta(formatRatio(validationSplit))],
+        ["test_split", import_chalk.default.magenta(formatRatio(testSplit))],
         ["min_validation_support", import_chalk.default.magenta(String(minValidationSupport))],
         [
           "dedupe_equivalent",

package/dist/scripts/replayRuntimeEvidence.js

@@ -382,7 +382,8 @@ var buildRuntimeDebugReportPayload = async ({
       );
       const activeTradeKey = import_redis3.redisKeys.runtimeActiveTrade(
         userName,
-        trade.symbol
+        trade.symbol,
+        trade.deploymentId ?? trade.accountId
       );
       const signalKey = trade.signalId != null ? import_redis3.redisKeys.storeSignal(trade.symbol, trade.signalId) : null;
       const evaluationBucketKey = import_redis3.redisKeys.runtimeSignalEvaluationBucket(

package/dist/scripts/runtimeEvidence.js

@@ -381,7 +381,8 @@ var buildRuntimeDebugReportPayload = async ({
       );
       const activeTradeKey = import_redis3.redisKeys.runtimeActiveTrade(
         userName,
-        trade.symbol
+        trade.symbol,
+        trade.deploymentId ?? trade.accountId
       );
       const signalKey = trade.signalId != null ? import_redis3.redisKeys.storeSignal(trade.symbol, trade.signalId) : null;
       const evaluationBucketKey = import_redis3.redisKeys.runtimeSignalEvaluationBucket(

package/dist/scripts/signalsSummary.js

@@ -107,6 +107,15 @@ var loadRuntimeTrades = async (userName, {
   const trades = await Promise.all(keys.map((key) => (0, import_redis.getData)(key, null)));
   return trades.filter(isRuntimeTradeRecord).filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
 };
+var loadRuntimeActiveTradeOrderIds = async (userName) => {
+  const keys = await (0, import_redis.getKeys)(import_redis.redisKeys.runtimeActiveTrades(userName));
+  const refs = await Promise.all(keys.map((key) => (0, import_redis.getData)(key, null)));
+  return new Set(
+    refs.map(
+      (ref) => ref && typeof ref === "object" && "orderId" in ref && typeof ref.orderId === "string" && ref.orderId.trim() ? ref.orderId.trim() : null
+    ).filter((orderId) => orderId != null)
+  );
+};
 
 // src/lib/runtimeTradeSync.ts
 var import_constants = require("@tradejs/core/constants");
@@ -636,7 +645,8 @@ var buildRuntimeDebugReportPayload = async ({
       );
       const activeTradeKey = import_redis4.redisKeys.runtimeActiveTrade(
         userName,
-        trade.symbol
+        trade.symbol,
+        trade.deploymentId ?? trade.accountId
       );
       const signalKey = trade.signalId != null ? import_redis4.redisKeys.storeSignal(trade.symbol, trade.signalId) : null;
       const evaluationBucketKey = import_redis4.redisKeys.runtimeSignalEvaluationBucket(
@@ -771,6 +781,7 @@ var buildRuntimeDebugReportAttachment = async (params) => {
 };
 
 // src/scripts/signalsSummary.ts
+var import_tradingAccounts = require("@tradejs/infra/tradingAccounts");
 import_args.default.option(["u", "user"], "Use user config", "root");
 import_args.default.option(
   "connector",
@@ -883,6 +894,108 @@ var resolveSummaryConnectorName = async (value) => {
   );
   return import_connectors.DEFAULT_CONNECTOR_NAME;
 };
+var groupRuntimeTradesByConnectorScope = ({
+  trades,
+  deployments,
+  fallbackConnectorName
+}) => {
+  const deploymentById = new Map(
+    deployments.map((deployment) => [deployment.id, deployment])
+  );
+  const scopes = /* @__PURE__ */ new Map();
+  for (const trade of trades) {
+    const deployment = trade.deploymentId ? deploymentById.get(trade.deploymentId) : void 0;
+    const connectorName = deployment?.connectorName ?? fallbackConnectorName;
+    const universe = trade.universe ?? deployment?.universe ?? "crypto";
+    const accountId = trade.accountId ?? deployment?.accountId;
+    const deploymentId = trade.deploymentId;
+    const scopeKey = JSON.stringify([
+      connectorName,
+      universe,
+      accountId ?? null,
+      deploymentId ?? null
+    ]);
+    const scope = scopes.get(scopeKey) ?? {
+      connectorName,
+      universe,
+      ...accountId ? { accountId } : {},
+      ...deploymentId ? { deploymentId } : {},
+      trades: []
+    };
+    scope.trades.push(trade);
+    scopes.set(scopeKey, scope);
+  }
+  return [...scopes.values()];
+};
+var syncRuntimeTradeScopes = async ({
+  userName,
+  startTime,
+  endTime,
+  fallbackConnectorName,
+  trades,
+  deployments
+}) => {
+  const scopes = groupRuntimeTradesByConnectorScope({
+    trades,
+    deployments,
+    fallbackConnectorName
+  });
+  const syncedTrades = [];
+  const connectorNames = /* @__PURE__ */ new Set();
+  for (const scope of scopes) {
+    const connectorName = await resolveSummaryConnectorName(
+      scope.connectorName
+    );
+    const connectorFactory = await (0, import_connectors.getConnectorCreatorByName)(
+      connectorName,
+      projectRoot
+    );
+    if (!connectorFactory) {
+      throw new Error(`Connector "${connectorName}" is not registered`);
+    }
+    const connector = await connectorFactory({
+      userName,
+      universe: scope.universe,
+      accountId: scope.accountId,
+      deploymentId: scope.deploymentId
+    });
+    connectorNames.add(connectorName);
+    syncedTrades.push(
+      ...await syncRuntimeTrades({
+        userName,
+        connector,
+        trades: scope.trades,
+        startTime,
+        endTime,
+        openPositionCallbacks: {
+          onError: (error) => {
+            import_logger.logger.warn(
+              "signals summary: getOpenPositionPnl failed for scope account=%s deployment=%s: %s",
+              scope.accountId ?? "default",
+              scope.deploymentId ?? "default",
+              formatRuntimeTradeSyncError(error)
+            );
+          }
+        },
+        closedPnlCallbacks: {
+          onError: (error) => {
+            import_logger.logger.warn(
+              "signals summary: getClosedPnl failed for scope account=%s deployment=%s: %s",
+              scope.accountId ?? "default",
+              scope.deploymentId ?? "default",
+              formatRuntimeTradeSyncError(error)
+            );
+          }
+        }
+      })
+    );
+  }
+  return {
+    trades: syncedTrades,
+    connectorNames: [...connectorNames].sort(),
+    scopesCount: scopes.length
+  };
+};
 var createRuntimeSignalStats = () => ({
   evaluated: 0,
   signals: 0,
@@ -1192,46 +1305,35 @@ var signalsSummary = async () => {
   );
   const endTime = Date.now();
   const startTime = endTime - hours * 60 * 60 * 1e3;
-  const connectorName = await resolveSummaryConnectorName(flags.connector);
-  const connectorFactory = await (0, import_connectors.getConnectorCreatorByName)(
-    connectorName,
-    projectRoot
+  const fallbackConnectorName = await resolveSummaryConnectorName(
+    flags.connector
   );
-  if (!connectorFactory) {
-    throw new Error(`Connector "${connectorName}" is not registered`);
-  }
-  const connector = await connectorFactory({
-    userName: flags.user
-  });
-  const [configuredStrategyNames, signals, evaluationStatsBuckets, trades] = await Promise.all([
+  const [
+    configuredStrategyNames,
+    signals,
+    evaluationStatsBuckets,
+    trades,
+    runtimeDeployments
+  ] = await Promise.all([
     loadRuntimeStrategyNames(flags.user),
     loadRuntimeSignals(flags.user, { startTime, endTime }),
     loadRuntimeSignalEvaluationStatsBuckets(flags.user),
-    loadRuntimeTrades(flags.user)
+    loadRuntimeTrades(flags.user),
+    (0, import_tradingAccounts.listRuntimeDeployments)(flags.user)
   ]);
-  const syncedTrades = await syncRuntimeTrades({
+  const {
+    trades: syncedTrades,
+    connectorNames,
+    scopesCount
+  } = await syncRuntimeTradeScopes({
     userName: flags.user,
-    connector,
-    trades,
     startTime,
     endTime,
-    openPositionCallbacks: {
-      onError: (error) => {
-        import_logger.logger.warn(
-          "signals summary: getOpenPositionPnl failed: %s",
-          formatRuntimeTradeSyncError(error)
-        );
-      }
-    },
-    closedPnlCallbacks: {
-      onError: (error) => {
-        import_logger.logger.warn(
-          "signals summary: getClosedPnl failed: %s",
-          formatRuntimeTradeSyncError(error)
-        );
-      }
-    }
+    fallbackConnectorName,
+    trades,
+    deployments: runtimeDeployments
   });
+  const activeTradeOrderIds = await loadRuntimeActiveTradeOrderIds(flags.user);
   const windowSignals = signals.filter(
     (signal) => signal.timestamp >= startTime && signal.timestamp < endTime
   );
@@ -1249,7 +1351,7 @@ var signalsSummary = async () => {
     (trade) => isRuntimeTradeClosedInWindow(trade, startTime, endTime)
   );
   const openSnapshotTrades = syncedTrades.filter(
-    (trade) => trade.status === "active" && typeof trade.entryTimestamp === "number" && Number.isFinite(trade.entryTimestamp) && trade.entryTimestamp < endTime
+    (trade) => trade.status === "active" && activeTradeOrderIds.has(trade.orderId) && typeof trade.entryTimestamp === "number" && Number.isFinite(trade.entryTimestamp) && trade.entryTimestamp < endTime
   );
   const windowTrades = [...windowClosedTrades, ...openSnapshotTrades];
   const windowTradeSignalIds = new Set(
@@ -1272,12 +1374,13 @@ var signalsSummary = async () => {
     0
   );
   import_logger.logger.info(
-    "signals summary window=%sh signals=%s evaluations=%s trades=%s connector=%s user=%s",
+    "signals summary window=%sh signals=%s evaluations=%s trades=%s connectors=%s scopes=%s user=%s",
     hours,
     windowSignals.length,
     windowEvaluationsCount,
     windowClosedTrades.length,
-    connectorName,
+    connectorNames.join(",") || fallbackConnectorName,
+    scopesCount,
     flags.user
   );
   const debugAttachment = shouldAttachDebugReport(flags.debugAttachment) ? await buildRuntimeDebugReportAttachment({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradejs/cli",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Official CLI for the TradeJS TypeScript framework: infra setup, backtests, signals, bots, and ML workflows.",
   "keywords": [
     "tradejs",
@@ -29,14 +29,14 @@
     "tradejs": "dist/cli.js"
   },
   "dependencies": {
-    "@tradejs/base": "^2.0.9",
-    "@tradejs/connectors": "^2.0.9",
-    "@tradejs/core": "^2.0.9",
-    "@tradejs/indicators": "^2.0.9",
-    "@tradejs/infra": "^2.0.9",
-    "@tradejs/node": "^2.0.9",
-    "@tradejs/strategies": "^2.0.9",
-    "@tradejs/types": "^2.0.9",
+    "@tradejs/base": "^2.0.11",
+    "@tradejs/connectors": "^2.0.11",
+    "@tradejs/core": "^2.0.11",
+    "@tradejs/indicators": "^2.0.11",
+    "@tradejs/infra": "^2.0.11",
+    "@tradejs/node": "^2.0.11",
+    "@tradejs/strategies": "^2.0.11",
+    "@tradejs/types": "^2.0.11",
     "args": "^5.0.3",
     "bcryptjs": "^2.4.3",
     "chalk": "4.1.2",