@tradejs/node 3.1.18 → 3.1.19-beta.233

package/dist/runtimeDashboard.js

@@ -7764,26 +7764,52 @@ var loadRuntimeTrades = async (userName, {
 }) => {
   const filterByWindow = (trade) => trade.entryTimestamp >= startTime || typeof trade.exitTimestamp === "number" && trade.exitTimestamp >= startTime;
   const dayKeys = (0, import_time4.getRuntimeStorageDayKeys)(startTime, endTime);
-  const bucketTrades = (await Promise.all(
-    dayKeys.map(
-      (dayKey) => (0, import_redis4.getHashJsonValues)(
-        import_redis4.redisKeys.runtimeTradeBucket(userName, dayKey)
+  const [bucketTradeGroups, legacyKeys] = await Promise.all([
+    Promise.all(
+      dayKeys.map(
+        (dayKey) => (0, import_redis4.getHashJsonValues)(
+          import_redis4.redisKeys.runtimeTradeBucket(userName, dayKey)
+        )
       )
-    )
-  )).flat();
-  const dedupedBucketTrades = /* @__PURE__ */ new Map();
-  for (const trade of bucketTrades) {
+    ),
+    (0, import_redis4.getKeys)(import_redis4.redisKeys.runtimeTrades(userName))
+  ]);
+  const legacyTradeKeys = legacyKeys.filter(
+    (key) => !key.startsWith(import_redis4.redisKeys.runtimeTradeBuckets(userName))
+  );
+  const legacyTrades = await Promise.all(
+    legacyTradeKeys.map((key) => (0, import_redis4.getData)(key, null))
+  );
+  const dedupedTrades = /* @__PURE__ */ new Map();
+  for (const trade of [...legacyTrades, ...bucketTradeGroups.flat()]) {
     if (!(0, import_runtimeTrades3.isRuntimeTradeRecord)(trade)) {
       continue;
     }
-    dedupedBucketTrades.set(trade.orderId, trade);
+    const existing = dedupedTrades.get(trade.orderId);
+    if (!existing || (trade.lastSyncedAt ?? Number.NEGATIVE_INFINITY) >= (existing.lastSyncedAt ?? Number.NEGATIVE_INFINITY)) {
+      dedupedTrades.set(trade.orderId, trade);
+    }
   }
-  if (dedupedBucketTrades.size > 0 || dayKeys.length === 0) {
-    return [...dedupedBucketTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
+  return [...dedupedTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
+};
+var getTradeStrategyRevision = (trade) => trade.strategyRevision ?? (trade.runtimeLineage?.schemaVersion === 3 ? trade.runtimeLineage.strategyRevision : void 0);
+var buildStrategyRevisionChanges = (trades) => {
+  const changes = [];
+  let previousRevision;
+  for (const trade of [...trades].sort(
+    (left, right) => left.entryTimestamp - right.entryTimestamp || left.orderId.localeCompare(right.orderId)
+  )) {
+    const strategyRevision = getTradeStrategyRevision(trade);
+    if (!strategyRevision) continue;
+    if (previousRevision && strategyRevision !== previousRevision) {
+      changes.push({
+        timestamp: trade.entryTimestamp,
+        strategyRevision
+      });
+    }
+    previousRevision = strategyRevision;
   }
-  const keys = await (0, import_redis4.getKeys)(import_redis4.redisKeys.runtimeTrades(userName));
-  const trades = await Promise.all(keys.map((key) => (0, import_redis4.getData)(key, null)));
-  return trades.filter(import_runtimeTrades3.isRuntimeTradeRecord).filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
+  return changes;
 };
 var buildExchangeTimeRanges = (startTime, endTime) => {
   const ranges = [];
@@ -8024,14 +8050,6 @@ var loadRuntimeDashboard = async ({
       )
     )
   );
-  const runtimeIdentityKey = (trade) => (0, import_runtimeTrades3.buildRuntimeStrategyIdentityKey)({
-    strategyName: trade.strategy,
-    configId: trade.strategyRevision,
-    universe: trade.universe,
-    accountId: trade.accountId,
-    deploymentId: trade.deploymentId,
-    policyProfileId: trade.policyProfileId
-  });
   const identityByKey = /* @__PURE__ */ new Map();
   for (const deployment of runtimeDeployments) {
     for (const resolvedStrategy of resolvedStrategiesByDeployment.get(
@@ -8067,24 +8085,12 @@ var loadRuntimeDashboard = async ({
       });
     }
   }
-  const accountScopedTrades = allTrades;
-  for (const trade of accountScopedTrades) {
-    const key = runtimeIdentityKey(trade);
-    const configuredIdentity = identityByKey.get(key);
-    if (!configuredIdentity) continue;
-    const strategyRevision = trade.strategyRevision ?? (trade.runtimeLineage?.schemaVersion === 3 ? trade.runtimeLineage.strategyRevision : void 0);
-    if (strategyRevision !== configuredIdentity.strategyRevision) continue;
-    identityByKey.set(key, {
-      ...configuredIdentity,
-      interval: String(
-        trade.interval ?? configuredIdentity.interval
-      )
-    });
-  }
   const strategies2 = await Promise.all(
     [...identityByKey.entries()].map(async ([runtimeKey, identity]) => {
       const { strategyName } = identity;
-      const strategyTrades = accountScopedTrades.filter((trade) => runtimeIdentityKey(trade) === runtimeKey).sort((left, right) => right.entryTimestamp - left.entryTimestamp);
+      const strategyTrades = allTrades.filter(
+        (trade) => trade.strategy === strategyName && String(trade.interval) === String(identity.interval)
+      ).sort((left, right) => right.entryTimestamp - left.entryTimestamp);
       const orders = strategyTrades.sort((left, right) => {
         const leftDate = left.exitTimestamp ?? left.entryTimestamp;
         const rightDate = right.exitTimestamp ?? right.entryTimestamp;
@@ -8116,6 +8122,7 @@ var loadRuntimeDashboard = async ({
         stat: analytics.stat,
         summary: analytics.summary,
         orderLog: analytics.orderLog,
+        revisionChanges: buildStrategyRevisionChanges(strategyTrades),
         recentTrades: strategyTrades.slice(0, 8).map((trade) => (0, import_runtimeTrades3.toRuntimeTradeView)(trade, endTime)),
         orders
       };

package/dist/runtimeDashboard.mjs

@@ -271,26 +271,52 @@ var loadRuntimeTrades = async (userName, {
 }) => {
   const filterByWindow = (trade) => trade.entryTimestamp >= startTime || typeof trade.exitTimestamp === "number" && trade.exitTimestamp >= startTime;
   const dayKeys = getRuntimeStorageDayKeys(startTime, endTime);
-  const bucketTrades = (await Promise.all(
-    dayKeys.map(
-      (dayKey) => getHashJsonValues(
-        redisKeys2.runtimeTradeBucket(userName, dayKey)
+  const [bucketTradeGroups, legacyKeys] = await Promise.all([
+    Promise.all(
+      dayKeys.map(
+        (dayKey) => getHashJsonValues(
+          redisKeys2.runtimeTradeBucket(userName, dayKey)
+        )
       )
-    )
-  )).flat();
-  const dedupedBucketTrades = /* @__PURE__ */ new Map();
-  for (const trade of bucketTrades) {
+    ),
+    getKeys(redisKeys2.runtimeTrades(userName))
+  ]);
+  const legacyTradeKeys = legacyKeys.filter(
+    (key) => !key.startsWith(redisKeys2.runtimeTradeBuckets(userName))
+  );
+  const legacyTrades = await Promise.all(
+    legacyTradeKeys.map((key) => getData2(key, null))
+  );
+  const dedupedTrades = /* @__PURE__ */ new Map();
+  for (const trade of [...legacyTrades, ...bucketTradeGroups.flat()]) {
     if (!isRuntimeTradeRecord(trade)) {
       continue;
     }
-    dedupedBucketTrades.set(trade.orderId, trade);
+    const existing = dedupedTrades.get(trade.orderId);
+    if (!existing || (trade.lastSyncedAt ?? Number.NEGATIVE_INFINITY) >= (existing.lastSyncedAt ?? Number.NEGATIVE_INFINITY)) {
+      dedupedTrades.set(trade.orderId, trade);
+    }
   }
-  if (dedupedBucketTrades.size > 0 || dayKeys.length === 0) {
-    return [...dedupedBucketTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
+  return [...dedupedTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
+};
+var getTradeStrategyRevision = (trade) => trade.strategyRevision ?? (trade.runtimeLineage?.schemaVersion === 3 ? trade.runtimeLineage.strategyRevision : void 0);
+var buildStrategyRevisionChanges = (trades) => {
+  const changes = [];
+  let previousRevision;
+  for (const trade of [...trades].sort(
+    (left, right) => left.entryTimestamp - right.entryTimestamp || left.orderId.localeCompare(right.orderId)
+  )) {
+    const strategyRevision = getTradeStrategyRevision(trade);
+    if (!strategyRevision) continue;
+    if (previousRevision && strategyRevision !== previousRevision) {
+      changes.push({
+        timestamp: trade.entryTimestamp,
+        strategyRevision
+      });
+    }
+    previousRevision = strategyRevision;
   }
-  const keys = await getKeys(redisKeys2.runtimeTrades(userName));
-  const trades = await Promise.all(keys.map((key) => getData2(key, null)));
-  return trades.filter(isRuntimeTradeRecord).filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
+  return changes;
 };
 var buildExchangeTimeRanges = (startTime, endTime) => {
   const ranges = [];
@@ -531,14 +557,6 @@ var loadRuntimeDashboard = async ({
       )
     )
   );
-  const runtimeIdentityKey = (trade) => buildRuntimeStrategyIdentityKey({
-    strategyName: trade.strategy,
-    configId: trade.strategyRevision,
-    universe: trade.universe,
-    accountId: trade.accountId,
-    deploymentId: trade.deploymentId,
-    policyProfileId: trade.policyProfileId
-  });
   const identityByKey = /* @__PURE__ */ new Map();
   for (const deployment of runtimeDeployments) {
     for (const resolvedStrategy of resolvedStrategiesByDeployment.get(
@@ -574,24 +592,12 @@ var loadRuntimeDashboard = async ({
       });
     }
   }
-  const accountScopedTrades = allTrades;
-  for (const trade of accountScopedTrades) {
-    const key = runtimeIdentityKey(trade);
-    const configuredIdentity = identityByKey.get(key);
-    if (!configuredIdentity) continue;
-    const strategyRevision = trade.strategyRevision ?? (trade.runtimeLineage?.schemaVersion === 3 ? trade.runtimeLineage.strategyRevision : void 0);
-    if (strategyRevision !== configuredIdentity.strategyRevision) continue;
-    identityByKey.set(key, {
-      ...configuredIdentity,
-      interval: String(
-        trade.interval ?? configuredIdentity.interval
-      )
-    });
-  }
   const strategies = await Promise.all(
     [...identityByKey.entries()].map(async ([runtimeKey, identity]) => {
       const { strategyName } = identity;
-      const strategyTrades = accountScopedTrades.filter((trade) => runtimeIdentityKey(trade) === runtimeKey).sort((left, right) => right.entryTimestamp - left.entryTimestamp);
+      const strategyTrades = allTrades.filter(
+        (trade) => trade.strategy === strategyName && String(trade.interval) === String(identity.interval)
+      ).sort((left, right) => right.entryTimestamp - left.entryTimestamp);
       const orders = strategyTrades.sort((left, right) => {
         const leftDate = left.exitTimestamp ?? left.entryTimestamp;
         const rightDate = right.exitTimestamp ?? right.entryTimestamp;
@@ -623,6 +629,7 @@ var loadRuntimeDashboard = async ({
         stat: analytics.stat,
         summary: analytics.summary,
         orderLog: analytics.orderLog,
+        revisionChanges: buildStrategyRevisionChanges(strategyTrades),
         recentTrades: strategyTrades.slice(0, 8).map((trade) => toRuntimeTradeView(trade, endTime)),
         orders
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradejs/node",
-  "version": "3.1.18",
+  "version": "3.1.19-beta.233",
   "description": "Node-only runtime for the TradeJS TypeScript framework: strategies, backtests, Pine strategy loading, and plugin registries.",
   "keywords": [
     "tradejs",
@@ -89,9 +89,9 @@
   "dependencies": {
     "@langchain/core": "^1.2.3",
     "@langchain/openai": "^1.5.5",
-    "@tradejs/core": "^3.1.18",
-    "@tradejs/infra": "^3.1.18",
-    "@tradejs/types": "^3.1.18",
+    "@tradejs/core": "^3.1.19-beta.233",
+    "@tradejs/infra": "^3.1.19-beta.233",
+    "@tradejs/types": "^3.1.19-beta.233",
     "@types/node": "^24",
     "chalk": "4.1.2",
     "ioredis": "5.11.1",
@@ -104,7 +104,7 @@
     "typescript": "^5.9"
   },
   "devDependencies": {
-    "@tradejs/indicators": "^3.1.18",
+    "@tradejs/indicators": "^3.1.19-beta.233",
     "@tradejs/strategy-adaptive-momentum-ribbon": "3.0.2",
     "@tradejs/strategy-hyperliquid-consensus": "3.0.2",
     "@tradejs/strategy-kit": "3.0.3",