@tradejs/cli 3.1.11 → 3.1.12-beta.218

package/dist/scripts/replayRunner.js

@@ -529,17 +529,21 @@ var loadDeploymentReplayStrategies = async ({
   const strategies = deployment.enabled ? runtimeStrategies.filter((strategy) => strategy.enabled).map(
     ({
       strategyName,
-      version,
+      strategyRevision,
+      deploymentCompositionId,
       strategyPackage,
       strategyPackageVersion,
+      strategyDependencyVersions,
       runtimePackageVersion,
       sourceStrategyConfig,
       selection
     }) => ({
       strategyName,
-      version,
+      strategyRevision,
+      deploymentCompositionId,
       strategyPackage,
       strategyPackageVersion,
+      strategyDependencyVersions,
       runtimePackageVersion,
       strategyConfig: sourceStrategyConfig,
       ...selection ? { selection } : {}
@@ -4589,21 +4593,38 @@ async function buildRuntimeLineage({
   projectRoot,
   strategyName,
   compositionId,
-  version,
+  strategyRevision,
+  deploymentCompositionId,
   strategyPackageVersion,
+  strategyDependencyVersions,
   runtimePackageVersion,
   config,
   runContext,
   env = process.env
 }) {
-  if (version != null) {
-    if (!Number.isSafeInteger(version) || version <= 0) {
-      throw new Error(`Invalid runtime strategy version: ${version}`);
+  if (strategyRevision != null) {
+    if (!/^sr1:[a-f0-9]{16}$/.test(strategyRevision)) {
+      throw new Error(`Invalid strategy revision: ${strategyRevision}`);
+    }
+    if (typeof deploymentCompositionId !== "string" || !/^dc1:[a-f0-9]{16}$/.test(deploymentCompositionId)) {
+      throw new Error(
+        `Invalid deployment composition id: ${String(deploymentCompositionId)}`
+      );
+    }
+    if (typeof strategyPackageVersion !== "string" || !strategyPackageVersion.trim() || typeof runtimePackageVersion !== "string" || !runtimePackageVersion.trim()) {
+      throw new Error("Invalid revision package versions");
+    }
+    if (!strategyDependencyVersions || Object.keys(strategyDependencyVersions).length === 0 || Object.entries(strategyDependencyVersions).some(
+      ([name, version]) => !name.startsWith("@tradejs/") || typeof version !== "string" || !version.trim()
+    )) {
+      throw new Error("Invalid strategy dependency versions");
     }
     return {
-      schemaVersion: 2,
-      version,
+      schemaVersion: 3,
+      strategyRevision,
+      deploymentCompositionId,
       strategyPackageVersion,
+      strategyDependencyVersions,
       runtimePackageVersion,
       maxLossValue: resolveRuntimeMaxLossValue(config)
     };
@@ -4643,11 +4664,15 @@ async function buildRuntimeLineage({
     maxLossValue: resolveRuntimeMaxLossValue(config)
   };
 }
-var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? [
-  "v2",
-  lineage.version,
-  lineage.strategyPackageVersion ?? "strategy:unknown",
-  lineage.runtimePackageVersion ?? "runtime:unknown"
+var runtimeLineageKey = (lineage) => lineage.schemaVersion === 3 ? [
+  "v3",
+  lineage.deploymentCompositionId,
+  lineage.strategyRevision,
+  lineage.strategyPackageVersion,
+  `deps:${fingerprintRuntimeValue(
+    lineage.strategyDependencyVersions
+  ).slice(0, 16)}`,
+  lineage.runtimePackageVersion
 ].join(":") : [
   lineage.schemaVersion,
   lineage.compositionId ?? "unbound-composition",
@@ -4664,6 +4689,9 @@ var runtimeLineagesComparable = (left, right) => runtimeLineagesMatch(left, righ
 var import_runtimeStrategies2 = require("@tradejs/node/runtimeStrategies");
 var isRecord = (value) => value != null && typeof value === "object" && !Array.isArray(value);
 var isNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
+var isPackageVersionMap = (value) => isRecord(value) && Object.keys(value).length > 0 && Object.entries(value).every(
+  ([name, version]) => name.startsWith("@tradejs/") && isNonEmptyString(version)
+);
 var INTERVALS = /* @__PURE__ */ new Set([
   "1",
   "3",
@@ -4682,13 +4710,13 @@ var INTERVALS = /* @__PURE__ */ new Set([
 var UNIVERSES = /* @__PURE__ */ new Set(["crypto", "tradfi"]);
 var isRuntimeStrategySelection = (value) => value === void 0 || isRecord(value) && Object.keys(value).length === 1 && Object.keys(value).every((key) => key === "tickers") && Array.isArray(value.tickers) && value.tickers.length > 0 && value.tickers.every((ticker) => isNonEmptyString(ticker));
 var parseRuntimeEvidenceDeploymentSnapshot = (value) => {
-  if (!isRecord(value) || value.schemaVersion !== 1 || !isNonEmptyString(value.id) || !isNonEmptyString(value.label) || !isNonEmptyString(value.connectorName) || !isNonEmptyString(value.provider) || !isNonEmptyString(value.accountId) || typeof value.enabled !== "boolean" || !Array.isArray(value.strategies)) {
+  if (!isRecord(value) || value.schemaVersion !== 2 || !isNonEmptyString(value.id) || !isNonEmptyString(value.deploymentCompositionId) || !/^dc1:[a-f0-9]{16}$/.test(value.deploymentCompositionId) || !isNonEmptyString(value.label) || !isNonEmptyString(value.connectorName) || !isNonEmptyString(value.provider) || !isNonEmptyString(value.accountId) || typeof value.enabled !== "boolean" || !Array.isArray(value.strategies)) {
     throw new Error(
       "Runtime evidence deployment snapshot is missing or invalid"
     );
   }
   const strategies = value.strategies.map((candidate) => {
-    if (!isRecord(candidate) || !isNonEmptyString(candidate.strategyName) || !Number.isSafeInteger(candidate.version) || Number(candidate.version) <= 0 || typeof candidate.enabled !== "boolean" || !["active", "entries_paused"].includes(String(candidate.controlState)) || !INTERVALS.has(String(candidate.interval)) || !UNIVERSES.has(String(candidate.universe)) || !isNonEmptyString(candidate.strategyPackage) || !isNonEmptyString(candidate.strategyPackageVersion) || !isNonEmptyString(candidate.runtimePackageVersion) || !isRecord(candidate.strategyConfig) || !isRuntimeStrategySelection(candidate.selection)) {
+    if (!isRecord(candidate) || !isNonEmptyString(candidate.strategyName) || !isNonEmptyString(candidate.strategyRevision) || !/^sr1:[a-f0-9]{16}$/.test(candidate.strategyRevision) || typeof candidate.enabled !== "boolean" || !["active", "entries_paused"].includes(String(candidate.controlState)) || !INTERVALS.has(String(candidate.interval)) || !UNIVERSES.has(String(candidate.universe)) || !isNonEmptyString(candidate.strategyPackage) || !isNonEmptyString(candidate.strategyPackageVersion) || !isPackageVersionMap(candidate.strategyDependencyVersions) || !isNonEmptyString(candidate.runtimePackageVersion) || !isRecord(candidate.strategyConfig) || !isRuntimeStrategySelection(candidate.selection)) {
       throw new Error(
         "Runtime evidence deployment strategy snapshot is invalid"
       );
@@ -4722,15 +4750,16 @@ var parseRuntimeEvidenceDeploymentSnapshot = (value) => {
 var activeRuntimeEvidenceStrategies = (deployment) => deployment.enabled ? deployment.strategies.filter((strategy) => strategy.enabled) : [];
 var runtimeDeploymentFromEvidence = (deployment) => ({
   id: deployment.id,
+  deploymentCompositionId: deployment.deploymentCompositionId,
   label: deployment.label,
   connectorName: deployment.connectorName,
   provider: deployment.provider,
   accountId: deployment.accountId,
   enabled: deployment.enabled,
   strategies: deployment.strategies.map(
-    ({ strategyName, version, enabled, controlState, selection }) => ({
+    ({ strategyName, strategyRevision, enabled, controlState, selection }) => ({
       strategyName,
-      version,
+      strategyRevision,
       enabled,
       controlState,
       ...selection ? { selection } : {}
@@ -4810,7 +4839,7 @@ var buildRuntimeEvidenceLineageScopes = ({
     deploymentId,
     accountId,
     runtimeConfigId,
-    runtimeVersion,
+    strategyRevision,
     timestamp,
     lineage
   }) => {
@@ -4825,7 +4854,7 @@ var buildRuntimeEvidenceLineageScopes = ({
       ...deploymentId ? { deploymentId } : {},
       ...accountId ? { accountId } : {},
       ...runtimeConfigId ? { runtimeConfigId } : {},
-      ...runtimeVersion ? { runtimeVersion } : {},
+      ...strategyRevision ? { strategyRevision } : {},
       lineage,
       firstTimestamp: existing ? Math.min(existing.firstTimestamp, timestamp) : timestamp,
       lastTimestamp: existing ? Math.max(existing.lastTimestamp, timestamp) : timestamp
@@ -4838,7 +4867,7 @@ var buildRuntimeEvidenceLineageScopes = ({
       deploymentId: signal.deploymentId,
       accountId: signal.accountId,
       runtimeConfigId: signal.runtimeConfigId,
-      runtimeVersion: signal.runtimeVersion,
+      strategyRevision: signal.strategyRevision,
       timestamp: signal.timestamp,
       lineage: signal.runtimeLineage
     });
@@ -4850,7 +4879,7 @@ var buildRuntimeEvidenceLineageScopes = ({
       deploymentId: evaluation.deploymentId,
       accountId: evaluation.accountId,
       runtimeConfigId: evaluation.runtimeConfigId,
-      runtimeVersion: evaluation.runtimeVersion,
+      strategyRevision: evaluation.strategyRevision,
       timestamp: evaluation.timestamp,
       lineage: evaluation.runtimeLineage
     });
@@ -5494,9 +5523,11 @@ var loadRuntimeStrategies = async (runtimeStrategies) => {
     runtimeStrategies.map(async (runtimeStrategy) => {
       const {
         strategyName,
-        version,
+        strategyRevision,
+        deploymentCompositionId,
         strategyPackage,
         strategyPackageVersion,
+        strategyDependencyVersions,
         runtimePackageVersion,
         strategyConfig,
         selection
@@ -5512,7 +5543,7 @@ var loadRuntimeStrategies = async (runtimeStrategies) => {
         strategyName,
         projectRoot: replayProjectRoot
       });
-      if (installed.strategyPackage !== strategyPackage || installed.strategyPackageVersion !== strategyPackageVersion || installed.runtimePackageVersion !== runtimePackageVersion) {
+      if (installed.strategyPackage !== strategyPackage || installed.strategyPackageVersion !== strategyPackageVersion || JSON.stringify(installed.strategyDependencyVersions) !== JSON.stringify(strategyDependencyVersions) || installed.runtimePackageVersion !== runtimePackageVersion) {
         throw new Error(
           `Runtime evidence package mismatch for ${strategyName}: expected=${strategyPackage}@${strategyPackageVersion}/@tradejs/node@${runtimePackageVersion}, installed=${installed.strategyPackage ?? "missing"}@${installed.strategyPackageVersion ?? "missing"}/@tradejs/node@${installed.runtimePackageVersion ?? "missing"}`
         );
@@ -5523,9 +5554,11 @@ var loadRuntimeStrategies = async (runtimeStrategies) => {
       );
       return {
         strategyName,
-        version,
+        strategyRevision,
+        deploymentCompositionId,
         strategyPackage,
         strategyPackageVersion,
+        strategyDependencyVersions,
         runtimePackageVersion,
         strategyCreator,
         strategyConfig,
@@ -5729,8 +5762,10 @@ var runHistoricalSignalsReplay = async ({
       loadedStrategies.filter((strategy) => strategyIncludesSymbol(strategy, symbol)).map(
         async ({
           strategyName,
-          version,
+          strategyRevision,
+          deploymentCompositionId,
           strategyPackageVersion,
+          strategyDependencyVersions,
           runtimePackageVersion,
           strategyCreator,
           strategyConfig,
@@ -5739,11 +5774,13 @@ var runHistoricalSignalsReplay = async ({
           const runtimeLineage = await buildRuntimeLineage({
             projectRoot: replayProjectRoot,
             strategyName,
-            version,
+            strategyRevision,
+            deploymentCompositionId,
             strategyPackageVersion,
+            strategyDependencyVersions,
             runtimePackageVersion,
             config: {
-              configId: `v${version}`,
+              configId: strategyRevision,
               strategyConfig,
               symbolResultConfig: strategyResults?.[symbol]?.config ?? null
             },
@@ -5767,7 +5804,8 @@ var runHistoricalSignalsReplay = async ({
             run: await strategyCreator({
               userName: replayUserName,
               connectorName,
-              runtimeConfigId: `v${version}`,
+              runtimeConfigId: strategyRevision,
+              strategyRevision,
               runtimeLineage,
               universe: preparedRun.universe,
               accountId: preparedRun.accountId,
@@ -8813,15 +8851,15 @@ var renderLineageRows = (runtimeComparison) => {
       contexts: /* @__PURE__ */ new Set()
     };
     existing.scopes += 1;
-    if (record.lineage.schemaVersion === 2) {
-      existing.gitShas.add("release-versioned");
+    if (record.lineage.schemaVersion === 3) {
+      existing.gitShas.add(record.lineage.deploymentCompositionId);
       existing.dirty.add("n/a");
-      existing.gates.add("release-versioned");
-      existing.configs.add(`v${record.lineage.version}`);
+      existing.gates.add("package-owned");
+      existing.configs.add(record.lineage.strategyRevision);
       existing.contexts.add(
         [
-          record.lineage.strategyPackageVersion ?? "strategy:unknown",
-          record.lineage.runtimePackageVersion ?? "runtime:unknown"
+          record.lineage.strategyPackageVersion,
+          record.lineage.runtimePackageVersion
         ].join("/")
       );
     } else {
@@ -9129,17 +9167,20 @@ var replayBacktest = async () => {
     ).map(
       ({
         strategyName,
-        version,
+        strategyRevision,
         strategyPackage,
         strategyPackageVersion,
+        strategyDependencyVersions,
         runtimePackageVersion,
         strategyConfig,
         selection
       }) => ({
         strategyName,
-        version,
+        strategyRevision,
+        deploymentCompositionId: evidenceMetadata.deployment.deploymentCompositionId,
         strategyPackage,
         strategyPackageVersion,
+        strategyDependencyVersions,
         runtimePackageVersion,
         strategyConfig,
         ...selection ? { selection } : {}

package/dist/scripts/runtimeControl.js

@@ -67,7 +67,8 @@ var verify = async () => {
         ok: true,
         strategies: strategies.map((strategy) => ({
           strategyName: strategy.strategyName,
-          version: strategy.version,
+          strategyRevision: strategy.strategyRevision,
+          deploymentCompositionId: strategy.deploymentCompositionId,
           controlState: strategy.controlState,
           interval: strategy.interval,
           universe: strategy.universe,
@@ -146,7 +147,7 @@ var updateControlState = async (nextState) => {
     userName,
     deploymentId,
     strategyName,
-    version: reference.version,
+    strategyRevision: reference.strategyRevision,
     previousState,
     nextState,
     createdBy: `cli:${userName}`

package/dist/scripts/runtimeEvidence.js

@@ -606,11 +606,27 @@ var import_promises2 = __toESM(require("fs/promises"));
 var import_node_path2 = __toESM(require("path"));
 
 // src/lib/runtimeLineage.ts
-var runtimeLineageKey = (lineage) => lineage.schemaVersion === 2 ? [
-  "v2",
-  lineage.version,
-  lineage.strategyPackageVersion ?? "strategy:unknown",
-  lineage.runtimePackageVersion ?? "runtime:unknown"
+var normalizeForStableJson = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(normalizeForStableJson);
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, entry]) => [key, normalizeForStableJson(entry)])
+    );
+  }
+  return value;
+};
+var fingerprintRuntimeValue = (value) => (0, import_node_crypto3.createHash)("sha256").update(JSON.stringify(normalizeForStableJson(value))).digest("hex").slice(0, 16);
+var runtimeLineageKey = (lineage) => lineage.schemaVersion === 3 ? [
+  "v3",
+  lineage.deploymentCompositionId,
+  lineage.strategyRevision,
+  lineage.strategyPackageVersion,
+  `deps:${fingerprintRuntimeValue(
+    lineage.strategyDependencyVersions
+  ).slice(0, 16)}`,
+  lineage.runtimePackageVersion
 ].join(":") : [
   lineage.schemaVersion,
   lineage.compositionId ?? "unbound-composition",
@@ -637,8 +653,9 @@ var resolveRuntimeEvidenceDeploymentSnapshot = async ({
     throw new Error(`Runtime deployment not found: ${deploymentId}`);
   }
   return {
-    schemaVersion: 1,
+    schemaVersion: 2,
     id: deployment.id,
+    deploymentCompositionId: deployment.deploymentCompositionId,
     label: deployment.label,
     connectorName: deployment.connectorName,
     provider: deployment.provider,
@@ -647,7 +664,7 @@ var resolveRuntimeEvidenceDeploymentSnapshot = async ({
     strategies: strategies.map(
       ({
         strategyName,
-        version,
+        strategyRevision,
         enabled,
         controlState,
         interval,
@@ -655,12 +672,13 @@ var resolveRuntimeEvidenceDeploymentSnapshot = async ({
         accountId,
         strategyPackage,
         strategyPackageVersion,
+        strategyDependencyVersions,
         runtimePackageVersion,
-        sourceStrategyConfig,
+        strategyConfig,
         selection
       }) => ({
         strategyName,
-        version,
+        strategyRevision,
         enabled,
         controlState,
         interval,
@@ -668,8 +686,9 @@ var resolveRuntimeEvidenceDeploymentSnapshot = async ({
         ...accountId ? { accountId } : {},
         strategyPackage,
         strategyPackageVersion,
+        strategyDependencyVersions,
         runtimePackageVersion,
-        strategyConfig: sourceStrategyConfig,
+        strategyConfig,
         ...selection ? { selection } : {}
       })
     ),

package/dist/scripts/runtimeScorecard.js

@@ -208,11 +208,27 @@ 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"
+var normalizeForStableJson = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(normalizeForStableJson);
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, entry]) => [key, normalizeForStableJson(entry)])
+    );
+  }
+  return value;
+};
+var fingerprintRuntimeValue = (value) => (0, import_node_crypto3.createHash)("sha256").update(JSON.stringify(normalizeForStableJson(value))).digest("hex").slice(0, 16);
+var runtimeLineageKey = (lineage) => lineage.schemaVersion === 3 ? [
+  "v3",
+  lineage.deploymentCompositionId,
+  lineage.strategyRevision,
+  lineage.strategyPackageVersion,
+  `deps:${fingerprintRuntimeValue(
+    lineage.strategyDependencyVersions
+  ).slice(0, 16)}`,
+  lineage.runtimePackageVersion
 ].join(":") : [
   lineage.schemaVersion,
   lineage.compositionId ?? "unbound-composition",
@@ -228,6 +244,19 @@ var asRecord2 = (value) => value && typeof value === "object" && !Array.isArray(
 var asArray = (value) => Array.isArray(value) ? value : [];
 var finiteNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : null;
 var finiteString = (value) => typeof value === "string" && value.trim() ? value.trim() : null;
+var packageVersionMap = (value) => {
+  const record = asRecord2(value);
+  if (!record || Object.keys(record).length === 0) return null;
+  const entries = Object.entries(record);
+  if (entries.some(
+    ([name, version]) => !name.startsWith("@tradejs/") || finiteString(version) == null
+  )) {
+    return null;
+  }
+  return Object.fromEntries(
+    entries.map(([name, version]) => [name, String(version).trim()]).sort(([left], [right]) => left.localeCompare(right))
+  );
+};
 var round = (value, decimals = 6) => Number(value.toFixed(decimals));
 var unwrapRows = (value, key) => asArray(value).map((item) => asRecord2(asRecord2(item)?.[key]) ?? asRecord2(item)).filter((item) => item != null);
 var runtimePayload = (artifact) => {
@@ -260,12 +289,18 @@ var buildRuntimeLineageSummary = (rows) => {
   const lineages = lineageRows.map((row) => asRecord2(row.runtimeLineage)).filter((lineage) => lineage != null);
   const identities = /* @__PURE__ */ new Map();
   for (const lineage of lineages) {
-    const identity2 = lineage.schemaVersion === 2 ? {
-      schemaVersion: 2,
-      version: finiteNumber(lineage.version),
+    const identity2 = lineage.schemaVersion === 3 ? {
+      schemaVersion: 3,
+      strategyRevision: finiteString(lineage.strategyRevision),
+      deploymentCompositionId: finiteString(
+        lineage.deploymentCompositionId
+      ),
       strategyPackageVersion: finiteString(
         lineage.strategyPackageVersion
       ),
+      strategyDependencyVersions: packageVersionMap(
+        lineage.strategyDependencyVersions
+      ),
       runtimePackageVersion: finiteString(lineage.runtimePackageVersion),
       maxLossValue: finiteNumber(lineage.maxLossValue)
     } : {
@@ -282,7 +317,7 @@ var buildRuntimeLineageSummary = (rows) => {
   }
   const identity = identities.size === 1 ? [...identities.values()][0] : 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 identityComplete = lineages.length > 0 && identity != null && (schemaVersion === 3 && finiteString(identity.strategyRevision) != null && finiteString(identity.deploymentCompositionId) != null && finiteString(identity.strategyPackageVersion) != null && packageVersionMap(identity.strategyDependencyVersions) != 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;
@@ -295,8 +330,12 @@ var buildRuntimeLineageSummary = (rows) => {
     rowsWithLineage: lineages.length,
     schemaVersion,
     lineageKey,
-    version: finiteNumber(identity?.version),
+    strategyRevision: finiteString(identity?.strategyRevision),
+    deploymentCompositionId: finiteString(identity?.deploymentCompositionId),
     strategyPackageVersion: finiteString(identity?.strategyPackageVersion),
+    strategyDependencyVersions: packageVersionMap(
+      identity?.strategyDependencyVersions
+    ),
     runtimePackageVersion: finiteString(identity?.runtimePackageVersion),
     compositionId: finiteString(identity?.compositionId),
     gitSha: finiteString(identity?.gitSha),