@tradejs/cli 3.1.8-beta.213 → 3.1.9-beta.214

package/dist/scripts/runtimeScorecard.js

@@ -34,9 +34,9 @@ __export(runtimeScorecard_exports, {
   runtimeScorecard: () => runtimeScorecard
 });
 module.exports = __toCommonJS(runtimeScorecard_exports);
-var import_promises4 = __toESM(require("fs/promises"));
-var import_node_crypto3 = require("crypto");
-var import_node_path4 = __toESM(require("path"));
+var import_promises6 = __toESM(require("fs/promises"));
+var import_node_crypto5 = require("crypto");
+var import_node_path6 = __toESM(require("path"));
 var import_args = __toESM(require("args"));
 var import_chalk = __toESM(require("chalk"));
 
@@ -192,6 +192,37 @@ var markRuntimeEvidenceBundleProcessed = async ({
   return finalPath;
 };
 
+// src/lib/runtimeLineage.ts
+var import_node_child_process2 = require("child_process");
+var import_node_crypto3 = require("crypto");
+var import_promises4 = __toESM(require("fs/promises"));
+var import_node_path4 = __toESM(require("path"));
+var import_types = require("@tradejs/types");
+var import_strategies = require("@tradejs/node/strategies");
+var import_strategyReleaseEvidence = require("@tradejs/infra/strategyReleaseEvidence");
+
+// src/lib/strategyGateFingerprint.ts
+var import_node_crypto2 = require("crypto");
+var import_node_module = require("module");
+var import_promises3 = __toESM(require("fs/promises"));
+var import_node_path3 = __toESM(require("path"));
+
+// src/lib/runtimeLineage.ts
+var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? [
+  "v2",
+  lineage.version,
+  lineage.strategyPackageVersion ?? "strategy:unknown",
+  lineage.runtimePackageVersion ?? "runtime:unknown"
+].join(":") : [
+  lineage.schemaVersion,
+  lineage.compositionId ?? "unbound-composition",
+  lineage.gitSha ?? "unknown",
+  lineage.gitDirty == null ? "unknown" : lineage.gitDirty ? "dirty" : "clean",
+  lineage.gateFingerprint,
+  lineage.configFingerprint,
+  lineage.contextFingerprint
+].join(":");
+
 // src/lib/runtimeScorecard.ts
 var asRecord2 = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
 var asArray = (value) => Array.isArray(value) ? value : [];
@@ -213,15 +244,32 @@ var extractRuntimeRows = (artifact) => {
     evaluations: unwrapRows(runtime.evaluations, "evaluation"),
     signals: unwrapRows(runtime.signals, "signal"),
     trades: unwrapRows(runtime.trades, "trade"),
+    lineageScopes: unwrapRows(runtime.lineageScopes, "lineageScope"),
     statsBuckets: asArray(runtime.evaluationStatsBuckets).map(asRecord2).filter((item) => item != null)
   };
 };
 var buildRuntimeLineageSummary = (rows) => {
-  const lineageRows = [...rows.evaluations, ...rows.signals, ...rows.trades];
+  const lineageRows = [
+    ...rows.evaluations,
+    ...rows.signals,
+    ...rows.trades,
+    ...rows.lineageScopes.map((scope) => ({
+      runtimeLineage: scope.lineage
+    }))
+  ];
   const lineages = lineageRows.map((row) => asRecord2(row.runtimeLineage)).filter((lineage) => lineage != null);
   const identities = /* @__PURE__ */ new Map();
   for (const lineage of lineages) {
-    const identity2 = {
+    const identity2 = lineage.schemaVersion === 2 ? {
+      schemaVersion: 2,
+      version: finiteNumber(lineage.version),
+      strategyPackageVersion: finiteString(
+        lineage.strategyPackageVersion
+      ),
+      runtimePackageVersion: finiteString(lineage.runtimePackageVersion),
+      maxLossValue: finiteNumber(lineage.maxLossValue)
+    } : {
+      schemaVersion: 1,
       compositionId: finiteString(lineage.compositionId),
       gitSha: finiteString(lineage.gitSha),
       gitDirty: typeof lineage.gitDirty === "boolean" ? lineage.gitDirty : null,
@@ -233,12 +281,23 @@ var buildRuntimeLineageSummary = (rows) => {
     identities.set(JSON.stringify(identity2), identity2);
   }
   const identity = identities.size === 1 ? [...identities.values()][0] : null;
-  const complete = lineageRows.length > 0 && lineages.length === lineageRows.length && identity != null && identity.compositionId != null && identity.gitSha != null && identity.gitDirty === false && identity.gateFingerprint != null && identity.configFingerprint != null && identity.contextFingerprint != null && identity.maxLossValue != null;
+  const schemaVersion = finiteNumber(identity?.schemaVersion);
+  const identityComplete = lineages.length > 0 && identity != null && (schemaVersion === 2 && finiteNumber(identity.version) != null && finiteString(identity.strategyPackageVersion) != null && finiteString(identity.runtimePackageVersion) != null || schemaVersion === 1 && identity.compositionId != null && identity.gitSha != null && identity.gitDirty === false && identity.gateFingerprint != null && identity.configFingerprint != null && identity.contextFingerprint != null) && identity.maxLossValue != null;
+  const coverageComplete = lineageRows.length > 0 && lineages.length === lineageRows.length;
+  const complete = identityComplete && coverageComplete;
+  const lineageKey = identityComplete ? runtimeLineageKey(identity) : null;
   return {
     complete,
+    identityComplete,
+    coverageComplete,
     conflicts: identities.size > 1,
     rows: lineageRows.length,
     rowsWithLineage: lineages.length,
+    schemaVersion,
+    lineageKey,
+    version: finiteNumber(identity?.version),
+    strategyPackageVersion: finiteString(identity?.strategyPackageVersion),
+    runtimePackageVersion: finiteString(identity?.runtimePackageVersion),
     compositionId: finiteString(identity?.compositionId),
     gitSha: finiteString(identity?.gitSha),
     gitDirty: typeof identity?.gitDirty === "boolean" ? identity.gitDirty : null,
@@ -248,6 +307,20 @@ var buildRuntimeLineageSummary = (rows) => {
     maxLossValue: finiteNumber(identity?.maxLossValue)
   };
 };
+var belongsToRuntimeLineage = (row, summary) => {
+  if (!summary.identityComplete || !summary.lineageKey) return false;
+  const lineage = asRecord2(row.runtimeLineage);
+  if (!lineage) return false;
+  return runtimeLineageKey(lineage) === summary.lineageKey && finiteNumber(lineage.maxLossValue) === summary.maxLossValue;
+};
+var runtimeDeploymentBinding = (artifact) => {
+  const deployment = asRecord2(asRecord2(artifact)?.deployment);
+  return {
+    deploymentId: finiteString(deployment?.id),
+    accountId: finiteString(deployment?.accountId)
+  };
+};
+var belongsToRuntimeDeployment = (row, binding) => binding.deploymentId == null && binding.accountId == null ? true : finiteString(row.deploymentId) === binding.deploymentId && finiteString(row.accountId) === binding.accountId;
 var belongsToStrategy = (row, strategy) => strategy == null || finiteString(row.strategy) === strategy;
 var filterArtifactByStrategy = (artifact, strategy) => {
   if (!strategy) return artifact;
@@ -275,6 +348,9 @@ var filterArtifactByStrategy = (artifact, strategy) => {
           strategy
         )
       ),
+      lineageScopes: asArray(runtime.lineageScopes).filter(
+        (item) => belongsToStrategy(asRecord2(item) ?? {}, strategy)
+      ),
       evaluationStatsBuckets: asArray(runtime.evaluationStatsBuckets).filter(
         (item) => belongsToStrategy(asRecord2(item) ?? {}, strategy)
       )
@@ -454,6 +530,7 @@ var buildRuntimeScorecard = ({
   const scopedHistoryArtifacts = historyRuntimeArtifacts.map(
     (artifact) => filterArtifactByStrategy(artifact, strategy)
   );
+  const deploymentBinding = runtimeDeploymentBinding(runtimeArtifact);
   const rows = extractRuntimeRows(scopedRuntimeArtifact);
   const runtimeLineage = buildRuntimeLineageSummary(rows);
   const window = runtimeWindow(runtimeArtifact);
@@ -516,6 +593,12 @@ var buildRuntimeScorecard = ({
     ...scopedHistoryArtifacts,
     scopedRuntimeArtifact
   ]);
+  const comparableHistoryTrades = historyTrades.filter(
+    (trade) => belongsToRuntimeDeployment(trade, deploymentBinding) && belongsToRuntimeLineage(trade, runtimeLineage)
+  );
+  const comparableCurrentClosedTrades = currentClosedTrades.filter(
+    (trade) => belongsToRuntimeDeployment(trade, deploymentBinding) && belongsToRuntimeLineage(trade, runtimeLineage)
+  );
   const currentDistributions = buildDistributions(rows);
   const previousArtifact = scopedHistoryArtifacts.map((artifact) => ({ artifact, window: runtimeWindow(artifact) })).filter(({ window: candidateWindow }) => {
     const candidateEndTime = finiteNumber(candidateWindow.endTime);
@@ -526,7 +609,7 @@ var buildRuntimeScorecard = ({
   const previousDistributions = previousArtifact ? buildDistributions(extractRuntimeRows(previousArtifact.artifact)) : null;
   const rolling = [7, 30, 90].map(
     (days) => buildRollingPerformance({
-      trades: [...historyTrades],
+      trades: [...comparableHistoryTrades],
       anchorTime: endTime,
       days
     })
@@ -540,6 +623,13 @@ var buildRuntimeScorecard = ({
       message: lineageReason
     });
   }
+  if (!runtimeLineage.complete) {
+    reactions.push({
+      code: "RUNTIME_LINEAGE_INCOMPLETE",
+      severity: "blocking",
+      message: "Runtime rows do not share one complete composition lineage."
+    });
+  }
   if (parityRatio != null && parityRatio < thresholds.minimumParityRatio) {
     reactions.push({
       code: "PARITY_REGRESSION",
@@ -577,6 +667,7 @@ var buildRuntimeScorecard = ({
     generatedAt,
     window: { startTime, endTime },
     strategy,
+    deployment: deploymentBinding,
     lineage: runtimeLineage,
     promotionStatus,
     thresholds,
@@ -621,17 +712,25 @@ var buildRuntimeScorecard = ({
         )
       ).length,
       fills: rows.trades.length,
-      closedTrades: currentClosedTrades.length
+      closedTrades: currentClosedTrades.length,
+      comparableClosedTrades: comparableCurrentClosedTrades.length,
+      nonComparableClosedTrades: currentClosedTrades.length - comparableCurrentClosedTrades.length
     },
     realized: {
       pnl: sum(
-        currentClosedTrades.map((trade) => finiteNumber(trade.closedPnl))
+        comparableCurrentClosedTrades.map(
+          (trade) => finiteNumber(trade.closedPnl)
+        )
       ),
       fees: sum(
-        currentClosedTrades.map((trade) => finiteNumber(trade.totalFee))
+        comparableCurrentClosedTrades.map(
+          (trade) => finiteNumber(trade.totalFee)
+        )
       ),
       funding: sum(
-        currentClosedTrades.map((trade) => finiteNumber(trade.fundingFee))
+        comparableCurrentClosedTrades.map(
+          (trade) => finiteNumber(trade.fundingFee)
+        )
       )
     },
     gateComparison: {
@@ -749,14 +848,14 @@ ${reactions}
 };
 
 // src/lib/strategyRelease.ts
-var import_node_crypto2 = require("crypto");
-var import_promises3 = __toESM(require("fs/promises"));
-var import_node_path3 = __toESM(require("path"));
-var import_types2 = require("@tradejs/types");
-var import_strategyReleaseEvidence = require("@tradejs/infra/strategyReleaseEvidence");
+var import_node_crypto4 = require("crypto");
+var import_promises5 = __toESM(require("fs/promises"));
+var import_node_path5 = __toESM(require("path"));
+var import_types3 = require("@tradejs/types");
+var import_strategyReleaseEvidence2 = require("@tradejs/infra/strategyReleaseEvidence");
 
 // src/lib/strategyRelease/liveDiagnosis.ts
-var import_types = require("@tradejs/types");
+var import_types2 = require("@tradejs/types");
 var buildStrategyLiveDiagnosis = (input) => {
   const minimumClosedTrades = input.minimumClosedTrades ?? 20;
   const minimumParityRatio = input.minimumParityRatio ?? 0.95;
@@ -784,7 +883,7 @@ var buildStrategyLiveDiagnosis = (input) => {
     attributionIncomplete && verdict === "GENERALIZATION_FAILURE" ? "Collect matched shadow raw-core, deterministic-gate, and causal regime evidence without changing the composition." : "Collect more verified prospective outcomes without changing the composition."
   ];
   return {
-    schema: import_types.STRATEGY_LIVE_DIAGNOSIS_SCHEMA,
+    schema: import_types2.STRATEGY_LIVE_DIAGNOSIS_SCHEMA,
     strategy: input.strategy,
     compositionId: input.compositionId,
     createdAt: input.createdAt,
@@ -861,10 +960,10 @@ var buildStrategyLiveDiagnosisFromScorecard = ({
 // src/lib/strategyRelease.ts
 var SHA256_RE = /^[a-f0-9]{64}$/;
 var LINEAGE_FINGERPRINT_RE = /^[a-f0-9]{16}$/;
-var safeSegment2 = import_strategyReleaseEvidence.safeStrategyEvidenceSegment;
-var compactTimestamp = import_strategyReleaseEvidence.compactStrategyEvidenceTimestamp;
-var canonicalStrategyReleaseJson = (value) => (0, import_strategyReleaseEvidence.canonicalStrategyEvidenceJson)(value);
-var strategyReleaseSha256 = (value) => (0, import_strategyReleaseEvidence.strategyEvidenceSha256)(value);
+var safeSegment2 = import_strategyReleaseEvidence2.safeStrategyEvidenceSegment;
+var compactTimestamp = import_strategyReleaseEvidence2.compactStrategyEvidenceTimestamp;
+var canonicalStrategyReleaseJson = (value) => (0, import_strategyReleaseEvidence2.canonicalStrategyEvidenceJson)(value);
+var strategyReleaseSha256 = (value) => (0, import_strategyReleaseEvidence2.strategyEvidenceSha256)(value);
 function assert(condition, message) {
   if (!condition) throw new Error(`Invalid strategy release: ${message}`);
 }
@@ -1233,7 +1332,7 @@ var createStrategyReleaseManifest = (input) => {
     verdict
   };
   return {
-    schema: import_types2.STRATEGY_RELEASE_SCHEMA,
+    schema: import_types3.STRATEGY_RELEASE_SCHEMA,
     releaseId: `${safeSegment2(input.strategy, "strategy")}_${compactTimestamp(input.createdAt)}_${strategyReleaseSha256(releaseIdentity).slice(0, 16)}`,
     strategy: input.strategy,
     createdAt: input.createdAt,
@@ -1252,7 +1351,7 @@ var createStrategyReleaseManifest = (input) => {
   };
 };
 var verifyStrategyReleaseEnvelope = async (valueOrPath) => {
-  const value = typeof valueOrPath === "string" ? JSON.parse(await import_promises3.default.readFile(valueOrPath, "utf8")) : valueOrPath;
+  const value = typeof valueOrPath === "string" ? JSON.parse(await import_promises5.default.readFile(valueOrPath, "utf8")) : valueOrPath;
   const envelope = value;
   assert(
     envelope?.schema === "tradejs-strategy-release-envelope/v1",
@@ -1268,7 +1367,7 @@ var verifyStrategyReleaseEnvelope = async (valueOrPath) => {
   );
   const manifest = envelope.manifest;
   assert(
-    manifest.schema === import_types2.STRATEGY_RELEASE_SCHEMA,
+    manifest.schema === import_types3.STRATEGY_RELEASE_SCHEMA,
     "manifest schema mismatch"
   );
   const rebuilt = createStrategyReleaseManifest({
@@ -1303,19 +1402,19 @@ var verifyStrategyReleaseEnvelope = async (valueOrPath) => {
   return envelope;
 };
 var verifyStrategyEvidenceMarkerEnvelope = async (valueOrPath) => {
-  const value = typeof valueOrPath === "string" ? JSON.parse(await import_promises3.default.readFile(valueOrPath, "utf8")) : valueOrPath;
-  return (0, import_strategyReleaseEvidence.verifyStrategyEvidenceMarkerEnvelope)(value);
+  const value = typeof valueOrPath === "string" ? JSON.parse(await import_promises5.default.readFile(valueOrPath, "utf8")) : valueOrPath;
+  return (0, import_strategyReleaseEvidence2.verifyStrategyEvidenceMarkerEnvelope)(value);
 };
 var writeJsonAtomic = async (filePath, value) => {
   const temporaryPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
-  await import_promises3.default.mkdir(import_node_path3.default.dirname(filePath), { recursive: true });
-  await import_promises3.default.writeFile(
+  await import_promises5.default.mkdir(import_node_path5.default.dirname(filePath), { recursive: true });
+  await import_promises5.default.writeFile(
     temporaryPath,
     `${canonicalStrategyReleaseJson(value)}
 `,
     "utf8"
   );
-  await import_promises3.default.rename(temporaryPath, filePath);
+  await import_promises5.default.rename(temporaryPath, filePath);
 };
 var publishStrategyLiveDiagnosis = async ({
   rootDir,
@@ -1375,19 +1474,19 @@ var publishStrategyLiveDiagnosis = async ({
       severity: diagnosis.verdict === "EXPECTED_DRAWDOWN" ? "info" : "warning"
     }
   ];
-  const markerEnvelope = (0, import_strategyReleaseEvidence.createStrategyEvidenceMarkerEnvelope)({
+  const markerEnvelope = (0, import_strategyReleaseEvidence2.createStrategyEvidenceMarkerEnvelope)({
     strategy: diagnosis.strategy,
     createdAt: diagnosis.createdAt,
     markers,
     sourceArtifacts
   });
-  const diagnosisPath = import_node_path3.default.join(
+  const diagnosisPath = import_node_path5.default.join(
     rootDir,
     "diagnoses",
     safeSegment2(diagnosis.strategy, "strategy"),
     `${diagnosisId}.json`
   );
-  const markerPath = import_node_path3.default.join(
+  const markerPath = import_node_path5.default.join(
     rootDir,
     "markers",
     safeSegment2(diagnosis.strategy, "strategy"),
@@ -1459,15 +1558,15 @@ var flags = import_args.default.parse(process.argv);
 var projectRoot = String(process.env.PROJECT_CWD || process.cwd()).trim() || process.cwd();
 var resolveOptionalPath = (value) => {
   const raw = String(value ?? "").trim();
-  return raw ? import_node_path4.default.resolve(projectRoot, raw) : null;
+  return raw ? import_node_path6.default.resolve(projectRoot, raw) : null;
 };
-var readJson = async (filePath) => filePath ? JSON.parse(await import_promises4.default.readFile(filePath, "utf8")) : void 0;
+var readJson = async (filePath) => filePath ? JSON.parse(await import_promises6.default.readFile(filePath, "utf8")) : void 0;
 var assertReportType = (artifact, expected, label) => {
   if (artifact != null && (!artifact || typeof artifact !== "object" || Array.isArray(artifact) || artifact.reportType !== expected)) {
     throw new Error(`${label} must be a ${expected} artifact`);
   }
 };
-var sha256File = async (filePath) => (0, import_node_crypto3.createHash)("sha256").update(await import_promises4.default.readFile(filePath)).digest("hex");
+var sha256File = async (filePath) => (0, import_node_crypto5.createHash)("sha256").update(await import_promises6.default.readFile(filePath)).digest("hex");
 var loadHistoryArtifacts = async (historyDir) => {
   if (!historyDir) return [];
   const bundleDirs = await discoverRuntimeEvidenceBundles(historyDir);
@@ -1537,13 +1636,13 @@ var runtimeScorecard = async () => {
     strategy: scorecardStrategy,
     llmComparatorPolicy: verifiedRelease?.manifest.prospective.llmComparatorPolicy ?? "ai_approved_only"
   });
-  const outPath = import_node_path4.default.resolve(projectRoot, String(flags.out));
+  const outPath = import_node_path6.default.resolve(projectRoot, String(flags.out));
   const markdownPath = outPath.replace(/\.json$/i, "") + ".md";
-  await import_promises4.default.mkdir(import_node_path4.default.dirname(outPath), { recursive: true });
+  await import_promises6.default.mkdir(import_node_path6.default.dirname(outPath), { recursive: true });
   await Promise.all([
-    import_promises4.default.writeFile(outPath, `${JSON.stringify(scorecard, null, 2)}
+    import_promises6.default.writeFile(outPath, `${JSON.stringify(scorecard, null, 2)}
 `, "utf8"),
-    import_promises4.default.writeFile(
+    import_promises6.default.writeFile(
       markdownPath,
       formatRuntimeScorecardMarkdown(scorecard),
       "utf8"
@@ -1557,7 +1656,7 @@ var runtimeScorecard = async () => {
   const diagnosisPath = diagnosis ? outPath.replace(/\.json$/i, "") + ".diagnosis.json" : null;
   const strategyReleaseRoot = resolveOptionalPath(flags.strategyReleaseRoot);
   if (diagnosis && diagnosisPath) {
-    await import_promises4.default.writeFile(
+    await import_promises6.default.writeFile(
       diagnosisPath,
       `${JSON.stringify(diagnosis, null, 2)}
 `,
@@ -1578,7 +1677,7 @@ var runtimeScorecard = async () => {
         composition: verifiedRelease?.manifest.composition,
         sourceArtifacts: await Promise.all(
           sourcePaths.map(async (sourcePath) => ({
-            artifactId: import_node_path4.default.basename(sourcePath),
+            artifactId: import_node_path6.default.basename(sourcePath),
             path: sourcePath,
             sha256: await sha256File(sourcePath)
           }))
@@ -1589,9 +1688,9 @@ var runtimeScorecard = async () => {
   let receiptPath2 = null;
   if (flags.markProcessed) {
     receiptPath2 = await markRuntimeEvidenceBundleProcessed({
-      evidenceRoot: import_node_path4.default.resolve(projectRoot, String(flags.evidenceDir)),
+      evidenceRoot: import_node_path6.default.resolve(projectRoot, String(flags.evidenceDir)),
       deploymentId: String(flags.deployment),
-      bundleDir: import_node_path4.default.dirname(runtimeEvidencePath),
+      bundleDir: import_node_path6.default.dirname(runtimeEvidencePath),
       scorecardPath: outPath
     });
   }

package/dist/scripts/signals.js

@@ -4191,7 +4191,12 @@ async function buildRuntimeLineage({
     maxLossValue: resolveRuntimeMaxLossValue(config2)
   };
 }
-var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? ["v2", lineage.version].join(":") : [
+var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? [
+  "v2",
+  lineage.version,
+  lineage.strategyPackageVersion ?? "strategy:unknown",
+  lineage.runtimePackageVersion ?? "runtime:unknown"
+].join(":") : [
   lineage.schemaVersion,
   lineage.compositionId ?? "unbound-composition",
   lineage.gitSha ?? "unknown",
@@ -4210,9 +4215,28 @@ var buildRuntimeSignalEvaluationId = ({
   symbol,
   timestamp,
   runtimeConfigId,
-  runtimeVersion
-}) => runtimeVersion ? [strategyName, `v${runtimeVersion}`, symbol, timestamp].join(":") : runtimeConfigId && runtimeConfigId !== "config" ? [strategyName, runtimeConfigId, symbol, timestamp].join(":") : [strategyName, symbol, timestamp].join(":");
+  runtimeVersion,
+  deploymentId,
+  accountId
+}) => {
+  const runtimeScope = deploymentId ? [deploymentId, accountId ?? "default-account"] : [];
+  return runtimeVersion ? [
+    ...runtimeScope,
+    strategyName,
+    `v${runtimeVersion}`,
+    symbol,
+    timestamp
+  ].join(":") : runtimeConfigId && runtimeConfigId !== "config" ? [
+    ...runtimeScope,
+    strategyName,
+    runtimeConfigId,
+    symbol,
+    timestamp
+  ].join(":") : [...runtimeScope, strategyName, symbol, timestamp].join(":");
+};
 var buildLineageField = (scope) => [
+  scope.deploymentId ?? "default-deployment",
+  scope.accountId ?? "default-account",
   scope.strategy,
   scope.runtimeConfigId ?? "config",
   scope.runtimeVersion ? `v${scope.runtimeVersion}` : "legacy",
@@ -4254,6 +4278,8 @@ var flushRuntimeSignalEvaluations = async (evaluations) => {
     for (const evaluation of lineageEvaluations) {
       const lineageField = buildLineageField({
         strategy: evaluation.strategy,
+        deploymentId: evaluation.deploymentId,
+        accountId: evaluation.accountId,
         runtimeConfigId: evaluation.runtimeConfigId,
         runtimeVersion: evaluation.runtimeVersion,
         symbol: evaluation.symbol,
@@ -4264,6 +4290,8 @@ var flushRuntimeSignalEvaluations = async (evaluations) => {
       const scope = {
         strategy: evaluation.strategy,
         symbol: evaluation.symbol,
+        ...evaluation.deploymentId ? { deploymentId: evaluation.deploymentId } : {},
+        ...evaluation.accountId ? { accountId: evaluation.accountId } : {},
         runtimeConfigId: evaluation.runtimeConfigId,
         runtimeVersion: evaluation.runtimeVersion,
         lineage: evaluation.runtimeLineage,
@@ -4307,7 +4335,8 @@ var flushRuntimeSignalEvaluations = async (evaluations) => {
       const statsBucket = import_redis.redisKeys.runtimeSignalEvaluationStatsBucket(
         evaluation.userName,
         dayKey,
-        evaluation.strategy
+        evaluation.strategy,
+        evaluation.deploymentId
       );
       const increments = statsIncrements.get(statsBucket) ?? {};
       for (const [field, increment] of Object.entries(
@@ -4920,7 +4949,9 @@ var createSignalsTickerEvaluator = ({
           symbol,
           timestamp: lastCandle.timestamp,
           runtimeConfigId: runtimeIdentity,
-          runtimeVersion: version
+          runtimeVersion: version,
+          deploymentId,
+          accountId
         }),
         userName,
         strategy: strategyName,
@@ -4945,8 +4976,14 @@ var createSignalsTickerEvaluator = ({
     signal.runtimeConfigId = runtimeIdentity;
     signal.runtimeVersion = version;
     signal.runtimeLineage = runtimeLineage;
-    if (version && !signal.signalId.endsWith(`:v${version}`)) {
-      signal.signalId = `${signal.signalId}:v${version}`;
+    signal.deploymentId = deploymentId;
+    signal.accountId = accountId;
+    const signalRuntimeIdentity = [
+      ...deploymentId ? [deploymentId, accountId ?? "default-account"] : [],
+      ...version ? [`v${version}`] : []
+    ].join(":");
+    if (signalRuntimeIdentity && !signal.signalId.endsWith(`:${signalRuntimeIdentity}`)) {
+      signal.signalId = `${signal.signalId}:${signalRuntimeIdentity}`;
     }
     await (0, import_strategies4.enrichSignalWithBinanceMarketContext)({ signal, env: "CRON" });
     if (signal.orderStatus === "skipped" && typeof signal.orderSkipReason === "string" && signal.orderSkipReason.trim()) {
@@ -4965,7 +5002,9 @@ var createSignalsTickerEvaluator = ({
         symbol,
         timestamp: lastCandle.timestamp,
         runtimeConfigId: runtimeIdentity,
-        runtimeVersion: version
+        runtimeVersion: version,
+        deploymentId,
+        accountId
       }),
       userName,
       strategy: strategyName,

package/dist/scripts/signalsDaemon.js

@@ -4189,7 +4189,12 @@ async function buildRuntimeLineage({
     maxLossValue: resolveRuntimeMaxLossValue(config2)
   };
 }
-var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? ["v2", lineage.version].join(":") : [
+var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? [
+  "v2",
+  lineage.version,
+  lineage.strategyPackageVersion ?? "strategy:unknown",
+  lineage.runtimePackageVersion ?? "runtime:unknown"
+].join(":") : [
   lineage.schemaVersion,
   lineage.compositionId ?? "unbound-composition",
   lineage.gitSha ?? "unknown",
@@ -4208,9 +4213,28 @@ var buildRuntimeSignalEvaluationId = ({
   symbol,
   timestamp,
   runtimeConfigId,
-  runtimeVersion
-}) => runtimeVersion ? [strategyName, `v${runtimeVersion}`, symbol, timestamp].join(":") : runtimeConfigId && runtimeConfigId !== "config" ? [strategyName, runtimeConfigId, symbol, timestamp].join(":") : [strategyName, symbol, timestamp].join(":");
+  runtimeVersion,
+  deploymentId,
+  accountId
+}) => {
+  const runtimeScope = deploymentId ? [deploymentId, accountId ?? "default-account"] : [];
+  return runtimeVersion ? [
+    ...runtimeScope,
+    strategyName,
+    `v${runtimeVersion}`,
+    symbol,
+    timestamp
+  ].join(":") : runtimeConfigId && runtimeConfigId !== "config" ? [
+    ...runtimeScope,
+    strategyName,
+    runtimeConfigId,
+    symbol,
+    timestamp
+  ].join(":") : [...runtimeScope, strategyName, symbol, timestamp].join(":");
+};
 var buildLineageField = (scope) => [
+  scope.deploymentId ?? "default-deployment",
+  scope.accountId ?? "default-account",
   scope.strategy,
   scope.runtimeConfigId ?? "config",
   scope.runtimeVersion ? `v${scope.runtimeVersion}` : "legacy",
@@ -4252,6 +4276,8 @@ var flushRuntimeSignalEvaluations = async (evaluations) => {
     for (const evaluation of lineageEvaluations) {
       const lineageField = buildLineageField({
         strategy: evaluation.strategy,
+        deploymentId: evaluation.deploymentId,
+        accountId: evaluation.accountId,
         runtimeConfigId: evaluation.runtimeConfigId,
         runtimeVersion: evaluation.runtimeVersion,
         symbol: evaluation.symbol,
@@ -4262,6 +4288,8 @@ var flushRuntimeSignalEvaluations = async (evaluations) => {
       const scope = {
         strategy: evaluation.strategy,
         symbol: evaluation.symbol,
+        ...evaluation.deploymentId ? { deploymentId: evaluation.deploymentId } : {},
+        ...evaluation.accountId ? { accountId: evaluation.accountId } : {},
         runtimeConfigId: evaluation.runtimeConfigId,
         runtimeVersion: evaluation.runtimeVersion,
         lineage: evaluation.runtimeLineage,
@@ -4305,7 +4333,8 @@ var flushRuntimeSignalEvaluations = async (evaluations) => {
       const statsBucket = import_redis.redisKeys.runtimeSignalEvaluationStatsBucket(
         evaluation.userName,
         dayKey,
-        evaluation.strategy
+        evaluation.strategy,
+        evaluation.deploymentId
       );
       const increments = statsIncrements.get(statsBucket) ?? {};
       for (const [field, increment] of Object.entries(
@@ -4918,7 +4947,9 @@ var createSignalsTickerEvaluator = ({
           symbol,
           timestamp: lastCandle.timestamp,
           runtimeConfigId: runtimeIdentity,
-          runtimeVersion: version
+          runtimeVersion: version,
+          deploymentId,
+          accountId
         }),
         userName,
         strategy: strategyName,
@@ -4943,8 +4974,14 @@ var createSignalsTickerEvaluator = ({
     signal.runtimeConfigId = runtimeIdentity;
     signal.runtimeVersion = version;
     signal.runtimeLineage = runtimeLineage;
-    if (version && !signal.signalId.endsWith(`:v${version}`)) {
-      signal.signalId = `${signal.signalId}:v${version}`;
+    signal.deploymentId = deploymentId;
+    signal.accountId = accountId;
+    const signalRuntimeIdentity = [
+      ...deploymentId ? [deploymentId, accountId ?? "default-account"] : [],
+      ...version ? [`v${version}`] : []
+    ].join(":");
+    if (signalRuntimeIdentity && !signal.signalId.endsWith(`:${signalRuntimeIdentity}`)) {
+      signal.signalId = `${signal.signalId}:${signalRuntimeIdentity}`;
     }
     await (0, import_strategies4.enrichSignalWithBinanceMarketContext)({ signal, env: "CRON" });
     if (signal.orderStatus === "skipped" && typeof signal.orderSkipReason === "string" && signal.orderSkipReason.trim()) {
@@ -4963,7 +5000,9 @@ var createSignalsTickerEvaluator = ({
         symbol,
         timestamp: lastCandle.timestamp,
         runtimeConfigId: runtimeIdentity,
-        runtimeVersion: version
+        runtimeVersion: version,
+        deploymentId,
+        accountId
       }),
       userName,
       strategy: strategyName,

package/dist/scripts/signalsSummary.js

@@ -532,13 +532,17 @@ var parseBucketKey = (prefix, key) => {
     return null;
   }
   const suffix = key.slice(prefix.length);
-  const firstColon = suffix.indexOf(":");
-  if (firstColon <= 0 || firstColon >= suffix.length - 1) {
+  const parts = suffix.split(":");
+  if (parts.length < 2 || parts.some((part) => !part)) {
     return null;
   }
+  const [dayKey, ...scopeParts] = parts;
+  const strategy = scopeParts.at(-1);
+  if (!dayKey || !strategy) return null;
   return {
-    dayKey: suffix.slice(0, firstColon),
-    strategy: suffix.slice(firstColon + 1)
+    dayKey,
+    ...scopeParts.length > 1 ? { deploymentId: scopeParts.slice(0, -1).join(":") } : {},
+    strategy
   };
 };
 var loadRuntimeSignalEvaluationStatsBuckets = async (userName) => {
@@ -598,7 +602,8 @@ var buildRuntimeDebugReportPayload = async ({
   evaluations,
   trades,
   strategyConfigs,
-  evaluationStatsBuckets
+  evaluationStatsBuckets,
+  lineageScopes
 }) => {
   const signalById = new Map(
     signals.map((signal) => [signal.signalId, signal])
@@ -726,6 +731,7 @@ var buildRuntimeDebugReportPayload = async ({
       signals: signals.length,
       evaluations: reportEvaluations.length,
       evaluationStatsBuckets: evaluationStatsBuckets?.length ?? 0,
+      lineageScopes: lineageScopes?.length ?? 0,
       strategyConfigs: strategyConfigs?.length ?? 0
     },
     trades: debugTrades,
@@ -749,6 +755,7 @@ var buildRuntimeDebugReportPayload = async ({
       evaluation
     })),
     evaluationStatsBuckets: evaluationStatsBuckets ?? [],
+    lineageScopes: lineageScopes ?? [],
     strategyConfigs: strategyConfigs ?? []
   };
 };