@tradejs/cli 2.0.18 → 2.0.20

package/dist/scripts/replayRuntimeEvidence.js

@@ -31,7 +31,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var replayRuntimeEvidence_exports = {};
 __export(replayRuntimeEvidence_exports, {
   main: () => main,
-  replayRuntimeEvidence: () => replayRuntimeEvidence
+  replayRuntimeEvidence: () => replayRuntimeEvidence,
+  summarizeReplayComparison: () => summarizeReplayComparison
 });
 module.exports = __toCommonJS(replayRuntimeEvidence_exports);
 var import_promises = __toESM(require("fs/promises"));
@@ -46,17 +47,7 @@ var import_redis3 = require("@tradejs/infra/redis");
 // src/lib/runtimeRedis.ts
 var import_redis = require("@tradejs/infra/redis");
 var import_time = require("@tradejs/core/time");
-var RESERVED_STRATEGY_NAMES = /* @__PURE__ */ new Set(["charts"]);
-var RESERVED_CONFIG_IDS = /* @__PURE__ */ new Set(["results"]);
-var resolveStrategyConfigIdentityByKey = (userName, key) => {
-  const parts = key.split(":");
-  if (parts.length !== 5) return null;
-  const [users, keyUserName, strategiesKey, strategyName, configId] = parts;
-  if (users !== "users" || keyUserName !== userName || strategiesKey !== "strategies" || !strategyName || !configId || RESERVED_STRATEGY_NAMES.has(strategyName) || RESERVED_CONFIG_IDS.has(configId) || !/^[a-zA-Z0-9_-]+$/.test(configId)) {
-    return null;
-  }
-  return { strategyName, configId };
-};
+var import_runtimeStrategyConfigs = require("@tradejs/infra/runtimeStrategyConfigs");
 var isRuntimeTradeRecord = (value) => {
   if (!value || typeof value !== "object") {
     return false;
@@ -64,42 +55,6 @@ var isRuntimeTradeRecord = (value) => {
   const record = value;
   return typeof record.orderId === "string" && typeof record.strategy === "string" && typeof record.symbol === "string" && typeof record.entryTimestamp === "number" && typeof record.entryPrice === "number" && typeof record.qty === "number" && (record.direction === "LONG" || record.direction === "SHORT");
 };
-var resolveStrategyNameByConfigKey = (userName, key) => {
-  return resolveStrategyConfigIdentityByKey(userName, key)?.strategyName ?? null;
-};
-var getRuntimeStrategyConfigKeys = async (userName) => {
-  const keys = await (0, import_redis.getKeys)(`${import_redis.redisKeys.strategies(userName)}:`);
-  return keys.filter((key) => resolveStrategyConfigIdentityByKey(userName, key)).sort((left, right) => left.localeCompare(right));
-};
-var loadRuntimeStrategyConfigs = async (userName, {
-  onInvalidConfig
-} = {}) => {
-  const configKeys = await getRuntimeStrategyConfigKeys(userName);
-  const strategyConfigs = await Promise.all(
-    configKeys.map(async (key) => {
-      const strategyName = resolveStrategyNameByConfigKey(userName, key);
-      const identity = resolveStrategyConfigIdentityByKey(userName, key);
-      if (!strategyName || !identity) {
-        return null;
-      }
-      const strategyConfig = await (0, import_redis.getData)(
-        key,
-        null
-      );
-      if (!strategyConfig || typeof strategyConfig !== "object" || Array.isArray(strategyConfig)) {
-        onInvalidConfig?.(key);
-        return null;
-      }
-      return {
-        key,
-        strategyName,
-        configId: identity.configId,
-        strategyConfig
-      };
-    })
-  );
-  return strategyConfigs.filter(Boolean);
-};
 var loadRuntimeTrades = async (userName, {
   startTime,
   endTime
@@ -350,7 +305,7 @@ var collectRuntimeDebugEvidence = async ({
     loadRuntimeSignals(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluations(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluationStatsBuckets(userName),
-    loadRuntimeStrategyConfigs(userName)
+    (0, import_runtimeStrategyConfigs.loadRuntimeStrategyConfigs)(userName)
   ]);
   const tradesByOrderId = new Map(
     entryTrades.map((trade) => [trade.orderId, trade])
@@ -459,8 +414,6 @@ import_args.default.option(
   "Output JSON path",
   "output/replay-runtime-evidence.json"
 );
-var flags = import_args.default.parse(process.argv);
-var projectRoot = String(process.env.PROJECT_CWD || process.cwd()).trim() || process.cwd();
 var toEpochMs = (value) => {
   if (value == null || value === "") {
     return null;
@@ -473,7 +426,7 @@ var toEpochMs = (value) => {
   const parsed = Date.parse(raw);
   return Number.isFinite(parsed) ? parsed : null;
 };
-var resolveWindow = () => {
+var resolveWindow = (flags) => {
   const endTime = toEpochMs(flags.endTime) ?? Date.now();
   const hours = Math.max(
     1,
@@ -563,9 +516,13 @@ var summarizeReplayComparison = (runtimeComparison, strategies) => {
       [...matched, ...backtestOnly, ...runtimeOnly].map(resolveItemStrategy).filter((value) => typeof value === "string")
     )
   ].sort((left, right) => left.localeCompare(right));
+  const comparisonLineage = asRecord(comparison.lineage);
+  const replayLineage = asArray(comparisonLineage.replay).filter(
+    (entry) => !useFilter || strategySet.has(String(asRecord(entry).strategy ?? ""))
+  );
   return {
     mode: comparison.mode ?? null,
-    lineage: comparison.lineage ?? null,
+    lineage: comparisonLineage ? { ...comparisonLineage, replay: replayLineage } : null,
     rows: asArray(comparison.rows).filter(
       (row) => !useFilter || strategySet.has(String(row.strategyName ?? ""))
     ),
@@ -671,9 +628,12 @@ var getReplayStrategies = (replayValue) => {
 var loadRuntimePayload = async ({
   startTime,
   endTime,
-  strategies
+  strategies,
+  userName,
+  runtimeEvidenceFile,
+  projectRoot
 }) => {
-  const runtimeEvidencePath = typeof flags.runtimeEvidence === "string" && flags.runtimeEvidence.trim() ? import_node_path.default.resolve(projectRoot, flags.runtimeEvidence.trim()) : null;
+  const runtimeEvidencePath = typeof runtimeEvidenceFile === "string" && runtimeEvidenceFile.trim() ? import_node_path.default.resolve(projectRoot, runtimeEvidenceFile.trim()) : null;
   if (runtimeEvidencePath) {
     const artifact = JSON.parse(
       await import_promises.default.readFile(runtimeEvidencePath, "utf8")
@@ -685,7 +645,7 @@ var loadRuntimePayload = async ({
     };
   }
   const runtimeEvidence = await collectRuntimeDebugEvidence({
-    userName: flags.user,
+    userName,
     startTime,
     endTime,
     strategies: strategies.length ? strategies : void 0
@@ -694,7 +654,7 @@ var loadRuntimePayload = async ({
     source: "local-redis",
     path: null,
     payload: buildRuntimeEvidenceReportPayload({
-      userName: flags.user,
+      userName,
       startTime,
       endTime,
       signals: runtimeEvidence.signals,
@@ -706,9 +666,12 @@ var loadRuntimePayload = async ({
   };
 };
 var replayRuntimeEvidence = async () => {
-  const { startTime, endTime, source } = resolveWindow();
+  const flags = import_args.default.parse(process.argv);
+  const projectRoot = String(process.env.PROJECT_CWD || process.cwd()).trim() || process.cwd();
+  const userName = String(flags.user ?? "root");
+  const { startTime, endTime, source } = resolveWindow(flags);
   const replay = await loadReplayResult({
-    userName: flags.user,
+    userName,
     replayKey: typeof flags.replayKey === "string" && flags.replayKey.trim() ? flags.replayKey.trim() : void 0
   });
   const explicitStrategies = parseStrategyFilter(flags.strategy);
@@ -716,13 +679,16 @@ var replayRuntimeEvidence = async () => {
   const runtime = await loadRuntimePayload({
     startTime,
     endTime,
-    strategies
+    strategies,
+    userName,
+    runtimeEvidenceFile: flags.runtimeEvidence,
+    projectRoot
   });
   const replayValue = asRecord(replay.value);
   const artifact = {
     reportType: "replay-runtime-evidence",
     generatedAt: Date.now(),
-    userName: flags.user,
+    userName,
     window: {
       startTime,
       endTime,
@@ -774,5 +740,6 @@ var main = replayRuntimeEvidence;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   main,
-  replayRuntimeEvidence
+  replayRuntimeEvidence,
+  summarizeReplayComparison
 });

package/dist/scripts/researchAuto.js

@@ -45,7 +45,7 @@ __export(researchAuto_exports, {
   parseJsonOutput: () => parseJsonOutput,
   releaseResearchAutoLock: () => releaseResearchAutoLock,
   resolveHeapMbFromEnv: () => resolveHeapMbFromEnv,
-  resolveStrategyNameByConfigKey: () => resolveStrategyNameByConfigKey,
+  resolveStrategyNameByConfigKey: () => import_runtimeStrategyConfigs.resolveStrategyNameByConfigKey,
   resolveTarget: () => resolveTarget,
   runCliCommand: () => runCliCommand,
   toStrategyConfigGrid: () => toStrategyConfigGrid,
@@ -67,57 +67,11 @@ var import_strategies = require("@tradejs/strategies");
 // src/lib/runtimeRedis.ts
 var import_redis = require("@tradejs/infra/redis");
 var import_time = require("@tradejs/core/time");
-var RESERVED_STRATEGY_NAMES = /* @__PURE__ */ new Set(["charts"]);
-var RESERVED_CONFIG_IDS = /* @__PURE__ */ new Set(["results"]);
-var resolveStrategyConfigIdentityByKey = (userName, key) => {
-  const parts = key.split(":");
-  if (parts.length !== 5) return null;
-  const [users, keyUserName, strategiesKey, strategyName, configId] = parts;
-  if (users !== "users" || keyUserName !== userName || strategiesKey !== "strategies" || !strategyName || !configId || RESERVED_STRATEGY_NAMES.has(strategyName) || RESERVED_CONFIG_IDS.has(configId) || !/^[a-zA-Z0-9_-]+$/.test(configId)) {
-    return null;
-  }
-  return { strategyName, configId };
-};
+var import_runtimeStrategyConfigs = require("@tradejs/infra/runtimeStrategyConfigs");
 var isRuntimeStrategyEnabled = (strategyConfig) => {
   const enabled = strategyConfig.ENABLE;
   return enabled !== false;
 };
-var resolveStrategyNameByConfigKey = (userName, key) => {
-  return resolveStrategyConfigIdentityByKey(userName, key)?.strategyName ?? null;
-};
-var getRuntimeStrategyConfigKeys = async (userName) => {
-  const keys = await (0, import_redis.getKeys)(`${import_redis.redisKeys.strategies(userName)}:`);
-  return keys.filter((key) => resolveStrategyConfigIdentityByKey(userName, key)).sort((left, right) => left.localeCompare(right));
-};
-var loadRuntimeStrategyConfigs = async (userName, {
-  onInvalidConfig
-} = {}) => {
-  const configKeys = await getRuntimeStrategyConfigKeys(userName);
-  const strategyConfigs = await Promise.all(
-    configKeys.map(async (key) => {
-      const strategyName = resolveStrategyNameByConfigKey(userName, key);
-      const identity = resolveStrategyConfigIdentityByKey(userName, key);
-      if (!strategyName || !identity) {
-        return null;
-      }
-      const strategyConfig = await (0, import_redis.getData)(
-        key,
-        null
-      );
-      if (!strategyConfig || typeof strategyConfig !== "object" || Array.isArray(strategyConfig)) {
-        onInvalidConfig?.(key);
-        return null;
-      }
-      return {
-        key,
-        strategyName,
-        configId: identity.configId,
-        strategyConfig
-      };
-    })
-  );
-  return strategyConfigs.filter(Boolean);
-};
 
 // src/lib/runtimeStrategyBacktest.ts
 var import_chalk = __toESM(require("chalk"));
@@ -413,7 +367,7 @@ var listMergedFiles = async (outDir, strategyName) => {
 };
 var getBacktestResultsPrefix = (userName, config) => `users:${userName}:backtests:results:${config}:`;
 var listRuntimeStrategyNames = async (userName) => {
-  const strategyConfigs = await loadRuntimeStrategyConfigs(userName);
+  const strategyConfigs = await (0, import_runtimeStrategyConfigs.loadRuntimeStrategyConfigs)(userName);
   return strategyConfigs.filter(({ strategyConfig }) => isRuntimeStrategyEnabled(strategyConfig)).map(({ strategyName }) => strategyName).sort((left, right) => left.localeCompare(right));
 };
 var toStrategyConfigGrid = (strategyConfig) => {