@tradejs/cli 3.1.29-beta.281 → 3.1.29-beta.282

package/dist/cli.js

@@ -12818,7 +12818,7 @@ var init_marketContextPrepare = __esm({
 });
 
 // src/lib/runtimeRedis.ts
-var import_redis4, import_time, import_runtimeStrategyConfigs, isRuntimeStrategyEnabled, isRuntimeTradeRecord, loadRuntimeTrades, loadRuntimeClosedTrades, loadRuntimeActiveTradeOrderIds, loadRuntimeActiveTrades, loadStrategyResultSymbols;
+var import_redis4, import_time, import_runtimeStrategyConfigs, isRuntimeStrategyEnabled, isRuntimeTradeRecord, loadRuntimeTrades, loadRuntimeClosedTrades, loadRuntimeEvidenceTrades, loadRuntimeActiveTradeOrderIds, loadRuntimeActiveTrades, loadStrategyResultSymbols;
 var init_runtimeRedis = __esm({
   "src/lib/runtimeRedis.ts"() {
     "use strict";
@@ -12892,6 +12892,49 @@ var init_runtimeRedis = __esm({
         (left, right) => left.exitTimestamp - right.exitTimestamp
       );
     };
+    loadRuntimeEvidenceTrades = async (userName3, { startTime, endTime }) => {
+      const prefix = import_redis4.redisKeys.runtimeTradeBuckets(userName3);
+      const lastDay = (0, import_time.getRuntimeStorageDayKey)(endTime - 1);
+      const keys = (await (0, import_redis4.getKeys)(prefix)).filter((key) => {
+        const day = key.slice(prefix.length);
+        return key.startsWith(prefix) && /^\d{4}-\d{2}-\d{2}$/.test(day) && day <= lastDay;
+      });
+      const retained = /* @__PURE__ */ new Map();
+      for (let offset = 0; offset < keys.length; offset += 16) {
+        const buckets = await Promise.all(
+          keys.slice(offset, offset + 16).map((key) => (0, import_redis4.getHashJsonValues)(key))
+        );
+        for (const row of buckets.flat())
+          if (isRuntimeTradeRecord(row)) retained.set(row.orderId, row);
+      }
+      for (const row of await loadRuntimeClosedTrades(userName3, {
+        startTime,
+        endTime
+      }))
+        retained.set(row.orderId, row);
+      return [...retained.values()].filter(
+        (row) => row.entryTimestamp < endTime && (row.status === "active" || Number.isFinite(row.exitTimestamp) && row.exitTimestamp >= startTime)
+      ).map((row) => {
+        const closesAfterCutoff = row.status === "closed" && row.exitTimestamp >= endTime;
+        if (!closesAfterCutoff && !(row.status === "active" && row.lastSyncedAt >= endTime))
+          return row;
+        return {
+          ...row,
+          status: "active",
+          currentPrice: null,
+          currentPnl: null,
+          closedPnl: null,
+          exitPrice: null,
+          actualExitPrice: null,
+          exitTimestamp: null,
+          exitType: null,
+          closeFee: null,
+          fundingFee: null,
+          totalFee: null,
+          lastSyncedAt: void 0
+        };
+      }).sort((a, b) => a.entryTimestamp - b.entryTimestamp);
+    };
     loadRuntimeActiveTradeOrderIds = async (userName3) => {
       const keys = await (0, import_redis4.getKeys)(import_redis4.redisKeys.runtimeActiveTrades(userName3));
       const refs = await Promise.all(keys.map((key) => (0, import_redis4.getData)(key, null)));
@@ -24601,8 +24644,21 @@ const timer = setInterval(() => {
   try {
     const result = JSON.parse(fs.readFileSync(file + '.result', 'utf8'));
     console.log(result.message);
+    if (result.exitCode !== 0) {
+      let fd;
+      try {
+        fd = fs.openSync(file + '.log', fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
+        const size = fs.fstatSync(fd).size;
+        const tail = Buffer.alloc(Math.min(size, 65536));
+        fs.readSync(fd, tail, 0, tail.length, Math.max(0, size - tail.length));
+        // The worker redacts each line before persisting or returning it through MCP.
+        for (const line of tail.toString('utf8').split(/[\\r\\n]+/).filter(Boolean).slice(-150)) console.error('Host replay: ' + line);
+      } catch (error) {
+        console.error('Host replay log unavailable: ' + error.code);
+      } finally { if (fd !== undefined) fs.closeSync(fd); }
+    }
     clearInterval(timer);
-    process.exit(result.exitCode === 0 ? 0 : 1);
+    process.exitCode = result.exitCode === 0 ? 0 : 1;
   } catch (error) { if (error.code !== 'ENOENT') throw error; }
 }, 1000);
 `;
@@ -24850,7 +24906,7 @@ var init_mcpWorker = __esm({
                 status: "failed",
                 finishedAt: Date.now(),
                 updatedAt: Date.now(),
-                error: error instanceof Error ? error.message : "Replay preparation failed"
+                error: error instanceof Error ? (0, import_mcp.redactMcpJobLog)(error.message) : "Replay preparation failed"
               },
               import_mcp.MCP_JOB_TTL
             );
@@ -24871,14 +24927,7 @@ var init_mcpWorker = __esm({
           const logs = [];
           const log = (chunk) => {
             const lines = chunk.toString().replace(/\u001b\[[0-9;]*m/g, "").split(/[\r\n]+/).filter(Boolean);
-            logs.push(
-              ...lines.map(
-                (line) => line.slice(0, 1e3).replace(
-                  /((?:secret|password|api.?key|token|authorization)\s*[:=]\s*)\S+/gi,
-                  "$1[redacted]"
-                )
-              )
-            );
+            logs.push(...lines.map(import_mcp.redactMcpJobLog));
             if (logs.length > 150) logs.splice(0, logs.length - 150);
           };
           currentChild.stdout?.on("data", log);
@@ -24908,7 +24957,7 @@ var init_mcpWorker = __esm({
               "error",
               () => resolve({ code: null, error: "Unable to start research process" })
             );
-            currentChild.once("exit", (code) => resolve({ code }));
+            currentChild.once("close", (code) => resolve({ code }));
           });
           clearTimeout(timeout);
           clearInterval(monitor);
@@ -24925,7 +24974,11 @@ var init_mcpWorker = __esm({
                 exitCode: outcome.code,
                 updatedAt: Date.now(),
                 finishedAt: Date.now(),
-                ...cancelled ? {} : timedOut ? { error: "Job exceeded one hour" } : stopping ? { error: "Worker stopped; this job was not replayed" } : outcome.code !== 0 ? { error: outcome.error || "Research process failed" } : {}
+                ...cancelled ? {} : timedOut ? { error: "Job exceeded one hour" } : stopping ? { error: "Worker stopped; this job was not replayed" } : outcome.code !== 0 ? {
+                  error: outcome.error || (started.kind === "runtime-feedback-replay" ? logs.find(
+                    (line) => line.startsWith("Host replay: ")
+                  ) || logs.at(-1) : void 0) || "Research process failed"
+                } : {}
               };
               if (await import_redis15.mcpStorage.compare(jobKey, latest, next, import_mcp.MCP_JOB_TTL))
                 break;
@@ -31364,30 +31417,13 @@ var init_runtimeDebugEvidence = __esm({
     }) => {
       const dayKeys = (0, import_time5.getRuntimeStorageDayKeys)(startTime, endTime);
       const dayKeySet = new Set(dayKeys);
-      const [
-        entryTrades,
-        closedTrades,
-        signals2,
-        evaluations,
-        evaluationStatsBuckets,
-        lineageScopes
-      ] = await Promise.all([
-        loadRuntimeTrades(userName3, { startTime, endTime }),
-        loadRuntimeClosedTrades(userName3, { startTime, endTime }),
+      const [trades, signals2, evaluations, evaluationStatsBuckets, lineageScopes] = await Promise.all([
+        loadRuntimeEvidenceTrades(userName3, { startTime, endTime }),
         loadRuntimeSignals(userName3, { startTime, endTime }),
         loadRuntimeSignalEvaluations(userName3, { startTime, endTime }),
         loadRuntimeSignalEvaluationStatsBuckets(userName3),
         loadRuntimeLineageScopes(userName3, { startTime, endTime })
       ]);
-      const tradesByOrderId = new Map(
-        entryTrades.map((trade) => [trade.orderId, trade])
-      );
-      for (const trade of closedTrades) {
-        tradesByOrderId.set(trade.orderId, trade);
-      }
-      const trades = [...tradesByOrderId.values()].sort(
-        (left, right) => left.entryTimestamp - right.entryTimestamp
-      );
       const filteredStats = evaluationStatsBuckets.filter(
         (entry) => dayKeySet.has(entry.dayKey) && (!deploymentId || entry.deploymentId === deploymentId) && (!strategies?.length || strategies.includes(entry.strategy))
       );

package/dist/lib/mcpReplayProcess.js

@@ -59,8 +59,21 @@ const timer = setInterval(() => {
   try {
     const result = JSON.parse(fs.readFileSync(file + '.result', 'utf8'));
     console.log(result.message);
+    if (result.exitCode !== 0) {
+      let fd;
+      try {
+        fd = fs.openSync(file + '.log', fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
+        const size = fs.fstatSync(fd).size;
+        const tail = Buffer.alloc(Math.min(size, 65536));
+        fs.readSync(fd, tail, 0, tail.length, Math.max(0, size - tail.length));
+        // The worker redacts each line before persisting or returning it through MCP.
+        for (const line of tail.toString('utf8').split(/[\\r\\n]+/).filter(Boolean).slice(-150)) console.error('Host replay: ' + line);
+      } catch (error) {
+        console.error('Host replay log unavailable: ' + error.code);
+      } finally { if (fd !== undefined) fs.closeSync(fd); }
+    }
     clearInterval(timer);
-    process.exit(result.exitCode === 0 ? 0 : 1);
+    process.exitCode = result.exitCode === 0 ? 0 : 1;
   } catch (error) { if (error.code !== 'ENOENT') throw error; }
 }, 1000);
 `;

package/dist/lib/runtimeDebugEvidence.js

@@ -42,39 +42,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 loadRuntimeTrades = async (userName, {
-  startTime,
-  endTime
-} = {}) => {
-  const hasWindow = Number.isFinite(startTime) && Number.isFinite(endTime) && startTime != null && endTime != null;
-  const filterByWindow = (trade) => !hasWindow || trade.entryTimestamp >= startTime && trade.entryTimestamp <= endTime;
-  if (hasWindow) {
-    const dayKeys = (0, import_time.getRuntimeStorageDayKeys)(startTime, endTime);
-    const bucketTrades = (await Promise.all(
-      dayKeys.map(
-        (dayKey) => (0, import_redis.getHashJsonValues)(
-          import_redis.redisKeys.runtimeTradeBucket(userName, dayKey)
-        )
-      )
-    )).flat();
-    const dedupedBucketTrades = /* @__PURE__ */ new Map();
-    for (const trade of bucketTrades) {
-      if (!isRuntimeTradeRecord(trade)) {
-        continue;
-      }
-      dedupedBucketTrades.set(trade.orderId, trade);
-    }
-    const windowedTrades = [...dedupedBucketTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
-    return windowedTrades;
-  }
-  const tradePrefix = import_redis.redisKeys.runtimeTrades(userName);
-  const bucketPrefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
-  const keys = (await (0, import_redis.getKeys)(tradePrefix)).filter(
-    (key) => !key.startsWith(bucketPrefix)
-  );
-  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 loadRuntimeClosedTrades = async (userName, {
   startTime,
   endTime
@@ -98,6 +65,49 @@ var loadRuntimeClosedTrades = async (userName, {
     (left, right) => left.exitTimestamp - right.exitTimestamp
   );
 };
+var loadRuntimeEvidenceTrades = async (userName, { startTime, endTime }) => {
+  const prefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
+  const lastDay = (0, import_time.getRuntimeStorageDayKey)(endTime - 1);
+  const keys = (await (0, import_redis.getKeys)(prefix)).filter((key) => {
+    const day = key.slice(prefix.length);
+    return key.startsWith(prefix) && /^\d{4}-\d{2}-\d{2}$/.test(day) && day <= lastDay;
+  });
+  const retained = /* @__PURE__ */ new Map();
+  for (let offset = 0; offset < keys.length; offset += 16) {
+    const buckets = await Promise.all(
+      keys.slice(offset, offset + 16).map((key) => (0, import_redis.getHashJsonValues)(key))
+    );
+    for (const row of buckets.flat())
+      if (isRuntimeTradeRecord(row)) retained.set(row.orderId, row);
+  }
+  for (const row of await loadRuntimeClosedTrades(userName, {
+    startTime,
+    endTime
+  }))
+    retained.set(row.orderId, row);
+  return [...retained.values()].filter(
+    (row) => row.entryTimestamp < endTime && (row.status === "active" || Number.isFinite(row.exitTimestamp) && row.exitTimestamp >= startTime)
+  ).map((row) => {
+    const closesAfterCutoff = row.status === "closed" && row.exitTimestamp >= endTime;
+    if (!closesAfterCutoff && !(row.status === "active" && row.lastSyncedAt >= endTime))
+      return row;
+    return {
+      ...row,
+      status: "active",
+      currentPrice: null,
+      currentPnl: null,
+      closedPnl: null,
+      exitPrice: null,
+      actualExitPrice: null,
+      exitTimestamp: null,
+      exitType: null,
+      closeFee: null,
+      fundingFee: null,
+      totalFee: null,
+      lastSyncedAt: void 0
+    };
+  }).sort((a, b) => a.entryTimestamp - b.entryTimestamp);
+};
 
 // src/lib/runtimeSignalsLoader.ts
 var import_redis2 = require("@tradejs/infra/redis");
@@ -318,30 +328,13 @@ var collectRuntimeDebugEvidence = async ({
 }) => {
   const dayKeys = (0, import_time2.getRuntimeStorageDayKeys)(startTime, endTime);
   const dayKeySet = new Set(dayKeys);
-  const [
-    entryTrades,
-    closedTrades,
-    signals,
-    evaluations,
-    evaluationStatsBuckets,
-    lineageScopes
-  ] = await Promise.all([
-    loadRuntimeTrades(userName, { startTime, endTime }),
-    loadRuntimeClosedTrades(userName, { startTime, endTime }),
+  const [trades, signals, evaluations, evaluationStatsBuckets, lineageScopes] = await Promise.all([
+    loadRuntimeEvidenceTrades(userName, { startTime, endTime }),
     loadRuntimeSignals(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluations(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluationStatsBuckets(userName),
     loadRuntimeLineageScopes(userName, { startTime, endTime })
   ]);
-  const tradesByOrderId = new Map(
-    entryTrades.map((trade) => [trade.orderId, trade])
-  );
-  for (const trade of closedTrades) {
-    tradesByOrderId.set(trade.orderId, trade);
-  }
-  const trades = [...tradesByOrderId.values()].sort(
-    (left, right) => left.entryTimestamp - right.entryTimestamp
-  );
   const filteredStats = evaluationStatsBuckets.filter(
     (entry) => dayKeySet.has(entry.dayKey) && (!deploymentId || entry.deploymentId === deploymentId) && (!strategies?.length || strategies.includes(entry.strategy))
   );

package/dist/lib/runtimeRedis.js

@@ -26,6 +26,7 @@ __export(runtimeRedis_exports, {
   loadRuntimeActiveTradeOrderIds: () => loadRuntimeActiveTradeOrderIds,
   loadRuntimeActiveTrades: () => loadRuntimeActiveTrades,
   loadRuntimeClosedTrades: () => loadRuntimeClosedTrades,
+  loadRuntimeEvidenceTrades: () => loadRuntimeEvidenceTrades,
   loadRuntimeStrategyConfigs: () => import_runtimeStrategyConfigs.loadRuntimeStrategyConfigs,
   loadRuntimeStrategyNames: () => import_runtimeStrategyConfigs.loadRuntimeStrategyNames,
   loadRuntimeTrades: () => loadRuntimeTrades,
@@ -104,6 +105,49 @@ var loadRuntimeClosedTrades = async (userName, {
     (left, right) => left.exitTimestamp - right.exitTimestamp
   );
 };
+var loadRuntimeEvidenceTrades = async (userName, { startTime, endTime }) => {
+  const prefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
+  const lastDay = (0, import_time.getRuntimeStorageDayKey)(endTime - 1);
+  const keys = (await (0, import_redis.getKeys)(prefix)).filter((key) => {
+    const day = key.slice(prefix.length);
+    return key.startsWith(prefix) && /^\d{4}-\d{2}-\d{2}$/.test(day) && day <= lastDay;
+  });
+  const retained = /* @__PURE__ */ new Map();
+  for (let offset = 0; offset < keys.length; offset += 16) {
+    const buckets = await Promise.all(
+      keys.slice(offset, offset + 16).map((key) => (0, import_redis.getHashJsonValues)(key))
+    );
+    for (const row of buckets.flat())
+      if (isRuntimeTradeRecord(row)) retained.set(row.orderId, row);
+  }
+  for (const row of await loadRuntimeClosedTrades(userName, {
+    startTime,
+    endTime
+  }))
+    retained.set(row.orderId, row);
+  return [...retained.values()].filter(
+    (row) => row.entryTimestamp < endTime && (row.status === "active" || Number.isFinite(row.exitTimestamp) && row.exitTimestamp >= startTime)
+  ).map((row) => {
+    const closesAfterCutoff = row.status === "closed" && row.exitTimestamp >= endTime;
+    if (!closesAfterCutoff && !(row.status === "active" && row.lastSyncedAt >= endTime))
+      return row;
+    return {
+      ...row,
+      status: "active",
+      currentPrice: null,
+      currentPnl: null,
+      closedPnl: null,
+      exitPrice: null,
+      actualExitPrice: null,
+      exitTimestamp: null,
+      exitType: null,
+      closeFee: null,
+      fundingFee: null,
+      totalFee: null,
+      lastSyncedAt: void 0
+    };
+  }).sort((a, b) => a.entryTimestamp - b.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)));
@@ -144,6 +188,7 @@ var loadStrategyResultSymbols = async ({
   loadRuntimeActiveTradeOrderIds,
   loadRuntimeActiveTrades,
   loadRuntimeClosedTrades,
+  loadRuntimeEvidenceTrades,
   loadRuntimeStrategyConfigs,
   loadRuntimeStrategyNames,
   loadRuntimeTrades,

package/dist/scripts/mcpWorker.js

@@ -66,8 +66,21 @@ const timer = setInterval(() => {
   try {
     const result = JSON.parse(fs.readFileSync(file + '.result', 'utf8'));
     console.log(result.message);
+    if (result.exitCode !== 0) {
+      let fd;
+      try {
+        fd = fs.openSync(file + '.log', fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
+        const size = fs.fstatSync(fd).size;
+        const tail = Buffer.alloc(Math.min(size, 65536));
+        fs.readSync(fd, tail, 0, tail.length, Math.max(0, size - tail.length));
+        // The worker redacts each line before persisting or returning it through MCP.
+        for (const line of tail.toString('utf8').split(/[\\r\\n]+/).filter(Boolean).slice(-150)) console.error('Host replay: ' + line);
+      } catch (error) {
+        console.error('Host replay log unavailable: ' + error.code);
+      } finally { if (fd !== undefined) fs.closeSync(fd); }
+    }
     clearInterval(timer);
-    process.exit(result.exitCode === 0 ? 0 : 1);
+    process.exitCode = result.exitCode === 0 ? 0 : 1;
   } catch (error) { if (error.code !== 'ENOENT') throw error; }
 }, 1000);
 `;
@@ -299,7 +312,7 @@ var main = async (options = {}) => {
             status: "failed",
             finishedAt: Date.now(),
             updatedAt: Date.now(),
-            error: error instanceof Error ? error.message : "Replay preparation failed"
+            error: error instanceof Error ? (0, import_mcp.redactMcpJobLog)(error.message) : "Replay preparation failed"
           },
           import_mcp.MCP_JOB_TTL
         );
@@ -320,14 +333,7 @@ var main = async (options = {}) => {
       const logs = [];
       const log = (chunk) => {
         const lines = chunk.toString().replace(/\u001b\[[0-9;]*m/g, "").split(/[\r\n]+/).filter(Boolean);
-        logs.push(
-          ...lines.map(
-            (line) => line.slice(0, 1e3).replace(
-              /((?:secret|password|api.?key|token|authorization)\s*[:=]\s*)\S+/gi,
-              "$1[redacted]"
-            )
-          )
-        );
+        logs.push(...lines.map(import_mcp.redactMcpJobLog));
         if (logs.length > 150) logs.splice(0, logs.length - 150);
       };
       currentChild.stdout?.on("data", log);
@@ -357,7 +363,7 @@ var main = async (options = {}) => {
           "error",
           () => resolve({ code: null, error: "Unable to start research process" })
         );
-        currentChild.once("exit", (code) => resolve({ code }));
+        currentChild.once("close", (code) => resolve({ code }));
       });
       clearTimeout(timeout);
       clearInterval(monitor);
@@ -374,7 +380,11 @@ var main = async (options = {}) => {
             exitCode: outcome.code,
             updatedAt: Date.now(),
             finishedAt: Date.now(),
-            ...cancelled ? {} : timedOut ? { error: "Job exceeded one hour" } : stopping ? { error: "Worker stopped; this job was not replayed" } : outcome.code !== 0 ? { error: outcome.error || "Research process failed" } : {}
+            ...cancelled ? {} : timedOut ? { error: "Job exceeded one hour" } : stopping ? { error: "Worker stopped; this job was not replayed" } : outcome.code !== 0 ? {
+              error: outcome.error || (started.kind === "runtime-feedback-replay" ? logs.find(
+                (line) => line.startsWith("Host replay: ")
+              ) || logs.at(-1) : void 0) || "Research process failed"
+            } : {}
           };
           if (await import_redis.mcpStorage.compare(jobKey, latest, next, import_mcp.MCP_JOB_TTL))
             break;

package/dist/scripts/replayRuntimeEvidence.js

@@ -55,39 +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 loadRuntimeTrades = async (userName, {
-  startTime,
-  endTime
-} = {}) => {
-  const hasWindow = Number.isFinite(startTime) && Number.isFinite(endTime) && startTime != null && endTime != null;
-  const filterByWindow = (trade) => !hasWindow || trade.entryTimestamp >= startTime && trade.entryTimestamp <= endTime;
-  if (hasWindow) {
-    const dayKeys = (0, import_time.getRuntimeStorageDayKeys)(startTime, endTime);
-    const bucketTrades = (await Promise.all(
-      dayKeys.map(
-        (dayKey) => (0, import_redis.getHashJsonValues)(
-          import_redis.redisKeys.runtimeTradeBucket(userName, dayKey)
-        )
-      )
-    )).flat();
-    const dedupedBucketTrades = /* @__PURE__ */ new Map();
-    for (const trade of bucketTrades) {
-      if (!isRuntimeTradeRecord(trade)) {
-        continue;
-      }
-      dedupedBucketTrades.set(trade.orderId, trade);
-    }
-    const windowedTrades = [...dedupedBucketTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
-    return windowedTrades;
-  }
-  const tradePrefix = import_redis.redisKeys.runtimeTrades(userName);
-  const bucketPrefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
-  const keys = (await (0, import_redis.getKeys)(tradePrefix)).filter(
-    (key) => !key.startsWith(bucketPrefix)
-  );
-  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 loadRuntimeClosedTrades = async (userName, {
   startTime,
   endTime
@@ -111,6 +78,49 @@ var loadRuntimeClosedTrades = async (userName, {
     (left, right) => left.exitTimestamp - right.exitTimestamp
   );
 };
+var loadRuntimeEvidenceTrades = async (userName, { startTime, endTime }) => {
+  const prefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
+  const lastDay = (0, import_time.getRuntimeStorageDayKey)(endTime - 1);
+  const keys = (await (0, import_redis.getKeys)(prefix)).filter((key) => {
+    const day = key.slice(prefix.length);
+    return key.startsWith(prefix) && /^\d{4}-\d{2}-\d{2}$/.test(day) && day <= lastDay;
+  });
+  const retained = /* @__PURE__ */ new Map();
+  for (let offset = 0; offset < keys.length; offset += 16) {
+    const buckets = await Promise.all(
+      keys.slice(offset, offset + 16).map((key) => (0, import_redis.getHashJsonValues)(key))
+    );
+    for (const row of buckets.flat())
+      if (isRuntimeTradeRecord(row)) retained.set(row.orderId, row);
+  }
+  for (const row of await loadRuntimeClosedTrades(userName, {
+    startTime,
+    endTime
+  }))
+    retained.set(row.orderId, row);
+  return [...retained.values()].filter(
+    (row) => row.entryTimestamp < endTime && (row.status === "active" || Number.isFinite(row.exitTimestamp) && row.exitTimestamp >= startTime)
+  ).map((row) => {
+    const closesAfterCutoff = row.status === "closed" && row.exitTimestamp >= endTime;
+    if (!closesAfterCutoff && !(row.status === "active" && row.lastSyncedAt >= endTime))
+      return row;
+    return {
+      ...row,
+      status: "active",
+      currentPrice: null,
+      currentPnl: null,
+      closedPnl: null,
+      exitPrice: null,
+      actualExitPrice: null,
+      exitTimestamp: null,
+      exitType: null,
+      closeFee: null,
+      fundingFee: null,
+      totalFee: null,
+      lastSyncedAt: void 0
+    };
+  }).sort((a, b) => a.entryTimestamp - b.entryTimestamp);
+};
 
 // src/lib/runtimeSignalsLoader.ts
 var import_redis2 = require("@tradejs/infra/redis");
@@ -313,30 +323,13 @@ var collectRuntimeDebugEvidence = async ({
 }) => {
   const dayKeys = (0, import_time2.getRuntimeStorageDayKeys)(startTime, endTime);
   const dayKeySet = new Set(dayKeys);
-  const [
-    entryTrades,
-    closedTrades,
-    signals,
-    evaluations,
-    evaluationStatsBuckets,
-    lineageScopes
-  ] = await Promise.all([
-    loadRuntimeTrades(userName, { startTime, endTime }),
-    loadRuntimeClosedTrades(userName, { startTime, endTime }),
+  const [trades, signals, evaluations, evaluationStatsBuckets, lineageScopes] = await Promise.all([
+    loadRuntimeEvidenceTrades(userName, { startTime, endTime }),
     loadRuntimeSignals(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluations(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluationStatsBuckets(userName),
     loadRuntimeLineageScopes(userName, { startTime, endTime })
   ]);
-  const tradesByOrderId = new Map(
-    entryTrades.map((trade) => [trade.orderId, trade])
-  );
-  for (const trade of closedTrades) {
-    tradesByOrderId.set(trade.orderId, trade);
-  }
-  const trades = [...tradesByOrderId.values()].sort(
-    (left, right) => left.entryTimestamp - right.entryTimestamp
-  );
   const filteredStats = evaluationStatsBuckets.filter(
     (entry) => dayKeySet.has(entry.dayKey) && (!deploymentId || entry.deploymentId === deploymentId) && (!strategies?.length || strategies.includes(entry.strategy))
   );

package/dist/scripts/runtimeEvidence.js

@@ -54,39 +54,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 loadRuntimeTrades = async (userName, {
-  startTime,
-  endTime
-} = {}) => {
-  const hasWindow = Number.isFinite(startTime) && Number.isFinite(endTime) && startTime != null && endTime != null;
-  const filterByWindow = (trade) => !hasWindow || trade.entryTimestamp >= startTime && trade.entryTimestamp <= endTime;
-  if (hasWindow) {
-    const dayKeys = (0, import_time.getRuntimeStorageDayKeys)(startTime, endTime);
-    const bucketTrades = (await Promise.all(
-      dayKeys.map(
-        (dayKey) => (0, import_redis.getHashJsonValues)(
-          import_redis.redisKeys.runtimeTradeBucket(userName, dayKey)
-        )
-      )
-    )).flat();
-    const dedupedBucketTrades = /* @__PURE__ */ new Map();
-    for (const trade of bucketTrades) {
-      if (!isRuntimeTradeRecord(trade)) {
-        continue;
-      }
-      dedupedBucketTrades.set(trade.orderId, trade);
-    }
-    const windowedTrades = [...dedupedBucketTrades.values()].filter(filterByWindow).sort((left, right) => left.entryTimestamp - right.entryTimestamp);
-    return windowedTrades;
-  }
-  const tradePrefix = import_redis.redisKeys.runtimeTrades(userName);
-  const bucketPrefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
-  const keys = (await (0, import_redis.getKeys)(tradePrefix)).filter(
-    (key) => !key.startsWith(bucketPrefix)
-  );
-  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 loadRuntimeClosedTrades = async (userName, {
   startTime,
   endTime
@@ -110,6 +77,49 @@ var loadRuntimeClosedTrades = async (userName, {
     (left, right) => left.exitTimestamp - right.exitTimestamp
   );
 };
+var loadRuntimeEvidenceTrades = async (userName, { startTime, endTime }) => {
+  const prefix = import_redis.redisKeys.runtimeTradeBuckets(userName);
+  const lastDay = (0, import_time.getRuntimeStorageDayKey)(endTime - 1);
+  const keys = (await (0, import_redis.getKeys)(prefix)).filter((key) => {
+    const day = key.slice(prefix.length);
+    return key.startsWith(prefix) && /^\d{4}-\d{2}-\d{2}$/.test(day) && day <= lastDay;
+  });
+  const retained = /* @__PURE__ */ new Map();
+  for (let offset = 0; offset < keys.length; offset += 16) {
+    const buckets = await Promise.all(
+      keys.slice(offset, offset + 16).map((key) => (0, import_redis.getHashJsonValues)(key))
+    );
+    for (const row of buckets.flat())
+      if (isRuntimeTradeRecord(row)) retained.set(row.orderId, row);
+  }
+  for (const row of await loadRuntimeClosedTrades(userName, {
+    startTime,
+    endTime
+  }))
+    retained.set(row.orderId, row);
+  return [...retained.values()].filter(
+    (row) => row.entryTimestamp < endTime && (row.status === "active" || Number.isFinite(row.exitTimestamp) && row.exitTimestamp >= startTime)
+  ).map((row) => {
+    const closesAfterCutoff = row.status === "closed" && row.exitTimestamp >= endTime;
+    if (!closesAfterCutoff && !(row.status === "active" && row.lastSyncedAt >= endTime))
+      return row;
+    return {
+      ...row,
+      status: "active",
+      currentPrice: null,
+      currentPnl: null,
+      closedPnl: null,
+      exitPrice: null,
+      actualExitPrice: null,
+      exitTimestamp: null,
+      exitType: null,
+      closeFee: null,
+      fundingFee: null,
+      totalFee: null,
+      lastSyncedAt: void 0
+    };
+  }).sort((a, b) => a.entryTimestamp - b.entryTimestamp);
+};
 
 // src/lib/runtimeSignalsLoader.ts
 var import_redis2 = require("@tradejs/infra/redis");
@@ -312,30 +322,13 @@ var collectRuntimeDebugEvidence = async ({
 }) => {
   const dayKeys = (0, import_time2.getRuntimeStorageDayKeys)(startTime, endTime);
   const dayKeySet = new Set(dayKeys);
-  const [
-    entryTrades,
-    closedTrades,
-    signals,
-    evaluations,
-    evaluationStatsBuckets,
-    lineageScopes
-  ] = await Promise.all([
-    loadRuntimeTrades(userName, { startTime, endTime }),
-    loadRuntimeClosedTrades(userName, { startTime, endTime }),
+  const [trades, signals, evaluations, evaluationStatsBuckets, lineageScopes] = await Promise.all([
+    loadRuntimeEvidenceTrades(userName, { startTime, endTime }),
     loadRuntimeSignals(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluations(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluationStatsBuckets(userName),
     loadRuntimeLineageScopes(userName, { startTime, endTime })
   ]);
-  const tradesByOrderId = new Map(
-    entryTrades.map((trade) => [trade.orderId, trade])
-  );
-  for (const trade of closedTrades) {
-    tradesByOrderId.set(trade.orderId, trade);
-  }
-  const trades = [...tradesByOrderId.values()].sort(
-    (left, right) => left.entryTimestamp - right.entryTimestamp
-  );
   const filteredStats = evaluationStatsBuckets.filter(
     (entry) => dayKeySet.has(entry.dayKey) && (!deploymentId || entry.deploymentId === deploymentId) && (!strategies?.length || strategies.includes(entry.strategy))
   );

package/package.json

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