npm - @noodleseed/one - Versions diffs - 0.52.1 → 0.54.0 - Mend

@noodleseed/one 0.52.1 → 0.54.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (79) hide show

package/node_modules/@noodle-borg/service/dist/billing/postgres-meter-admission.js CHANGED Viewed

@@ -1,7 +1,6 @@
 import { DEPLOYMENT_ID_PATTERN, validateSlug } from '../store/validate.js';
+import { BillingActiveCommercialEntitlementInconsistentError, resolveActiveBillingCommercialEntitlement, } from './active-commercial-entitlement.js';
 import { BillingAuthoritativeAdmissionUnavailableError, BillingAuthoritativeIdempotencyConflictError, } from './authoritative-admission.js';
-import { BillingCommercialEntitlementError, parseBillingCommercialFreeV1Entitlements, } from './commercial-entitlements.js';
-import { BILLING_AUTHORITATIVE_ADMISSION_CONTRACT_VERSION } from './enforcement-activation.js';
 import { billingContentChecksum } from './model.js';
 import { BillingAuthoritativeAuthorityInconsistentError, readBillingAuthoritativeAuthorityTx, } from './postgres-authoritative-authority.js';
 import { findAuthoritativeDuplicate, lockAuthoritativeDedupeIdentity, readAuthoritativeIncludedCalls, recordAuthoritativeAdmission, } from './postgres-meter-admission-ledger.js';
@@ -14,13 +13,11 @@ const DEFAULT_STATEMENT_TIMEOUT_MS = 2_000;
 export class PostgresBillingAuthoritativeAdmissionStore {
     #pool;
     #keyGeneration;
-    #admissionContractVersion;
     #lockTimeoutMs;
     #statementTimeoutMs;
     constructor(pool, options) {
         this.#pool = pool;
         this.#keyGeneration = validateFingerprint('billing meter key generation', options.keyGeneration);
-        this.#admissionContractVersion = validateAdmissionContractVersion(options.admissionContractVersion ?? BILLING_AUTHORITATIVE_ADMISSION_CONTRACT_VERSION);
         this.#lockTimeoutMs = boundedTimeout('billing authoritative admission lock timeout', options.lockTimeoutMs ?? DEFAULT_LOCK_TIMEOUT_MS);
         this.#statementTimeoutMs = boundedTimeout('billing authoritative admission statement timeout', options.statementTimeoutMs ?? DEFAULT_STATEMENT_TIMEOUT_MS);
     }
@@ -38,7 +35,6 @@ export class PostgresBillingAuthoritativeAdmissionStore {
             try {
                 authority = await readBillingAuthoritativeAuthorityTx(client, {
                     keyGeneration: this.#keyGeneration,
-                    admissionContractVersion: this.#admissionContractVersion,
                 });
             }
             catch (error) {
@@ -61,35 +57,37 @@ export class PostgresBillingAuthoritativeAdmissionStore {
             const initialAttribution = await readAttribution(client, input.org, false);
             if (initialAttribution === undefined)
                 throw unavailable();
-            validateAttribution(initialAttribution);
-            const initialWindow = resolveUtcMonthlyUsageWindow(toIso(initialAttribution.monthly_usage_anchor), recordedAt);
             if (initialAttribution.profile_mode === 'legacy_internal_exempt') {
+                validateLegacyAttribution(initialAttribution);
                 const lockedExemption = await readAttribution(client, input.org, true);
                 if (lockedExemption === undefined ||
-                    !validAttribution(lockedExemption) ||
+                    !validLegacyAttribution(lockedExemption) ||
                     !sameAttribution(initialAttribution, lockedExemption)) {
                     throw unavailable();
                 }
                 await client.query('COMMIT');
                 return { outcome: 'bypass', reason: 'legacy_internal_exempt' };
             }
+            const initialEntitlement = resolveEnforcedAttribution(initialAttribution, authority.admissionContractVersion, recordedAt);
+            const initialWindow = resolveUtcMonthlyUsageWindow(initialEntitlement.monthlyUsageAnchor, recordedAt);
             await lockAuthoritativeDedupeIdentity(client, authority.epochId, input);
             await client.query('SELECT pg_advisory_xact_lock(hashtextextended($1, 0))', [
                 accountWindowLockKey(authority.epochId, initialAttribution.billing_account_id, initialWindow.start),
             ]);
             const attribution = await readAttribution(client, input.org, true);
-            if (attribution === undefined ||
-                !validAttribution(attribution) ||
-                !sameAttribution(initialAttribution, attribution)) {
+            if (attribution === undefined || !sameAttribution(initialAttribution, attribution)) {
                 throw unavailable();
             }
             if (attribution.profile_mode === 'legacy_internal_exempt') {
                 await client.query('COMMIT');
                 return { outcome: 'bypass', reason: 'legacy_internal_exempt' };
             }
-            if (attribution.profile_mode !== 'enforced')
+            const resolvedEntitlement = resolveEnforcedAttribution(attribution, authority.admissionContractVersion, recordedAt);
+            if (resolvedEntitlement.snapshotId !== initialEntitlement.snapshotId ||
+                resolvedEntitlement.snapshotVersion !== initialEntitlement.snapshotVersion) {
                 throw unavailable();
-            const entitlements = parseBillingCommercialFreeV1Entitlements(attribution.entitlements);
+            }
+            const entitlements = resolvedEntitlement.entitlements;
             const duplicate = await findAuthoritativeDuplicate(client, {
                 epochId: authority.epochId,
                 input,
@@ -148,11 +146,13 @@ async function proveLegacyExemption(client, org) {
     const initial = await readAttribution(client, org, false);
     if (initial === undefined)
         return false;
-    validateAttribution(initial);
     if (initial.profile_mode !== 'legacy_internal_exempt')
         return false;
+    validateLegacyAttribution(initial);
     const locked = await readAttribution(client, org, true);
-    if (locked === undefined || !validAttribution(locked) || !sameAttribution(initial, locked)) {
+    if (locked === undefined ||
+        !validLegacyAttribution(locked) ||
+        !sameAttribution(initial, locked)) {
         throw unavailable();
     }
     return true;
@@ -160,6 +160,16 @@ async function proveLegacyExemption(client, org) {
 async function readAttribution(client, org, lock) {
     const { rows } = await client.query(`SELECT link.billing_account_id, link.version AS link_version,
             account.state AS account_state, account.created_at AS account_created_at,
+            snapshot.id, snapshot.version, snapshot.plan_version_id,
+            plan.plan_code, plan.version AS plan_version,
+            plan.effective_from AS plan_effective_from,
+            plan.entitlements AS plan_entitlements,
+            plan.content_checksum AS plan_content_checksum,
+            plan.created_at AS plan_created_at,
+            snapshot.schema_version, snapshot.source_kind, snapshot.generation_reason,
+            snapshot.verification_status, snapshot.effective_from, snapshot.effective_until,
+            snapshot.source_subscription_id, snapshot.source_subscription_version,
+            snapshot.verified_at, snapshot.created_at, snapshot.content_checksum,
             snapshot.id AS snapshot_id, snapshot.version AS snapshot_version,
             snapshot.plan_version_id AS snapshot_plan_version_id,
             snapshot.verification_status AS snapshot_verification_status,
@@ -178,6 +188,7 @@ async function readAttribution(client, org, lock) {
      JOIN billing_entitlement_snapshots AS snapshot
        ON snapshot.billing_account_id = active_snapshot.billing_account_id
       AND snapshot.id = active_snapshot.snapshot_id
+     JOIN billing_plan_versions AS plan ON plan.id = snapshot.plan_version_id
      JOIN billing_account_active_enforcement_profiles AS active_profile
        ON active_profile.billing_account_id = link.billing_account_id
      JOIN billing_account_enforcement_profiles AS profile
@@ -185,7 +196,9 @@ async function readAttribution(client, org, lock) {
       AND profile.version = active_profile.profile_version
      JOIN billing_enforcement_cohort_seals AS seal ON seal.singleton = true
      WHERE link.org_slug = $1 AND link.active
-     ${lock ? 'FOR SHARE OF link, account, active_snapshot, snapshot, active_profile, profile, seal' : ''}`, [org]);
+     ${lock
+        ? 'FOR SHARE OF link, account, active_snapshot, snapshot, plan, active_profile, profile, seal'
+        : ''}`, [org]);
     return rows[0];
 }
 function sameAttribution(initial, locked) {
@@ -200,6 +213,19 @@ function sameAttribution(initial, locked) {
         toIso(initial.snapshot_effective_from) === toIso(locked.snapshot_effective_from) &&
         initial.snapshot_content_checksum === locked.snapshot_content_checksum &&
         toIso(initial.monthly_usage_anchor) === toIso(locked.monthly_usage_anchor) &&
+        initial.schema_version === locked.schema_version &&
+        initial.source_kind === locked.source_kind &&
+        initial.generation_reason === locked.generation_reason &&
+        toOptionalIso(initial.effective_until) === toOptionalIso(locked.effective_until) &&
+        initial.source_subscription_id === locked.source_subscription_id &&
+        initial.source_subscription_version === locked.source_subscription_version &&
+        toIso(initial.verified_at) === toIso(locked.verified_at) &&
+        toIso(initial.created_at) === toIso(locked.created_at) &&
+        initial.plan_code === locked.plan_code &&
+        initial.plan_version === locked.plan_version &&
+        toIso(initial.plan_effective_from) === toIso(locked.plan_effective_from) &&
+        initial.plan_content_checksum === locked.plan_content_checksum &&
+        toIso(initial.plan_created_at) === toIso(locked.plan_created_at) &&
         initial.profile_version === locked.profile_version &&
         initial.profile_mode === locked.profile_mode &&
         initial.profile_source === locked.profile_source &&
@@ -208,7 +234,7 @@ function sameAttribution(initial, locked) {
         initial.cohort_seal_id === locked.cohort_seal_id &&
         toIso(initial.cohort_sealed_at) === toIso(locked.cohort_sealed_at));
 }
-function validateAttribution(row) {
+function validateAttributionProfile(row) {
     const profileEffectiveFrom = toIso(row.profile_effective_from);
     const cohortSealedAt = toIso(row.cohort_sealed_at);
     const validLegacyProfile = row.profile_mode === 'legacy_internal_exempt' &&
@@ -219,7 +245,13 @@ function validateAttribution(row) {
         profileEffectiveFrom >= cohortSealedAt;
     if (row.account_state !== 'active' ||
         row.profile_cohort_seal_id !== row.cohort_seal_id ||
-        (!validLegacyProfile && !validEnforcedProfile) ||
+        (!validLegacyProfile && !validEnforcedProfile)) {
+        throw unavailable();
+    }
+}
+function validateLegacyAttribution(row) {
+    validateAttributionProfile(row);
+    if (row.profile_mode !== 'legacy_internal_exempt' ||
         row.snapshot_verification_status !== 'verified' ||
         !Number.isSafeInteger(row.snapshot_version) ||
         row.snapshot_version < 1) {
@@ -238,9 +270,9 @@ function validateAttribution(row) {
     if (row.snapshot_content_checksum !== expectedChecksum)
         throw unavailable();
 }
-function validAttribution(row) {
+function validLegacyAttribution(row) {
     try {
-        validateAttribution(row);
+        validateLegacyAttribution(row);
         return true;
     }
     catch (error) {
@@ -249,6 +281,22 @@ function validAttribution(row) {
         throw error;
     }
 }
+function resolveEnforcedAttribution(row, admissionContractVersion, databaseTime) {
+    validateAttributionProfile(row);
+    if (row.profile_mode !== 'enforced')
+        throw unavailable();
+    try {
+        return resolveActiveBillingCommercialEntitlement(row, {
+            admissionContractVersion,
+            databaseTime,
+        });
+    }
+    catch (error) {
+        if (error instanceof BillingActiveCommercialEntitlementInconsistentError)
+            throw unavailable();
+        throw error;
+    }
+}
 function normalizeInput(input) {
     const deploymentId = input.deploymentId.trim();
     if (deploymentId.length === 0 ||
@@ -280,12 +328,6 @@ function validateFingerprint(label, value) {
         throw new Error(`${label} must be a SHA-256 digest`);
     return value;
 }
-function validateAdmissionContractVersion(value) {
-    if (value !== BILLING_AUTHORITATIVE_ADMISSION_CONTRACT_VERSION) {
-        throw new Error('billing authoritative admission contract version is unsupported');
-    }
-    return value;
-}
 function boundedTimeout(label, value) {
     if (!Number.isSafeInteger(value) || value < 1 || value > 5_000) {
         throw new Error(`${label} must be between 1 and 5000 milliseconds`);
@@ -295,7 +337,7 @@ function boundedTimeout(label, value) {
 function translateAdmissionError(error) {
     if (error instanceof BillingAuthoritativeAuthorityInconsistentError)
         return unavailable();
-    if (error instanceof BillingCommercialEntitlementError)
+    if (error instanceof BillingActiveCommercialEntitlementInconsistentError)
         return unavailable();
     if (error instanceof BillingAuthoritativeAdmissionUnavailableError ||
         error instanceof BillingAuthoritativeIdempotencyConflictError) {
@@ -312,6 +354,9 @@ function toIso(value) {
         throw unavailable();
     return date.toISOString();
 }
+function toOptionalIso(value) {
+    return value === null ? null : toIso(value);
+}
 function unavailable() {
     return new BillingAuthoritativeAdmissionUnavailableError();
 }

package/node_modules/@noodle-borg/service/dist/billing/postgres-meter-admission.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres-meter-admission.js","sourceRoot":"","sources":["../../src/billing/postgres-meter-admission.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"postgres-meter-admission.js","sourceRoot":"","sources":["../../src/billing/postgres-meter-admission.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-production-app-admission.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres-production-app-admission.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-production-app-admission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,IAAI,CAAC;~~AAIrD~~;;;GAGG;AACH,eAAO,MAAM,sCAAsC,gDAAgD,CAAC;~~AAIpG~~,MAAM,MAAM,sCAAsC,GAC9C,+BAA+B,GAC/B,iCAAiC,CAAC;AAEtC,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,QAAQ,CAAC,IAAI,EAAE,sCAAsC,CAAC;gBAE1C,IAAI,EAAE,sCAAsC;CASzD;AAED,MAAM,MAAM,oCAAoC,GAC5C;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC3B;IACE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AA8CN,kGAAkG;AAClG,wBAAsB,uCAAuC,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/F;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACpD,OAAO,CAAC,oCAAoC,CAAC,~~CAgB~~/C;~~AAiED~~,+FAA+F;AAC/F,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,IAAI,CAAC,CA6Bf"}
1	+ {"version":3,"file":"postgres-production-app-admission.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-production-app-admission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,IAAI,CAAC;AASrD;;;GAGG;AACH,eAAO,MAAM,sCAAsC,gDAAgD,CAAC;AAEpG,MAAM,MAAM,sCAAsC,GAC9C,+BAA+B,GAC/B,iCAAiC,CAAC;AAEtC,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,QAAQ,CAAC,IAAI,EAAE,sCAAsC,CAAC;gBAE1C,IAAI,EAAE,sCAAsC;CASzD;AAED,MAAM,MAAM,oCAAoC,GAC5C;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC3B;IACE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AA8CN,kGAAkG;AAClG,wBAAsB,uCAAuC,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/F;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACpD,OAAO,CAAC,oCAAoC,CAAC,CAkB/C;AA4FD,+FAA+F;AAC/F,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,IAAI,CAAC,CA6Bf"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-production-app-admission.js CHANGED Viewed

@@ -1,11 +1,11 @@
-import { parseBillingCommercialFreeV1Entitlements } from './commercial-entitlements.js';
+import { BillingActiveCommercialEntitlementInconsistentError, resolveActiveBillingCommercialEntitlement, } from './active-commercial-entitlement.js';
 import { billingContentChecksum } from './model.js';
+import { readBillingMeterTransactionTime } from './postgres-meter-clock.js';
 /**
  * This exact deployed lock identity is shared with validation-epoch lifecycle operations. Keeping the
  * value stable makes old and new service revisions serialize during a rolling enforcement cutover.
  */
 export const BILLING_ENFORCEMENT_LIFECYCLE_LOCK_KEY = 'billing-meter-validation-epoch-lifecycle:v1';
-const PRODUCTION_APP_ADMISSION_CONTRACT_VERSION = 1;
 export class BillingProductionAppAdmissionError extends Error {
     code;
     constructor(code) {
@@ -42,11 +42,11 @@ export async function prepareProductionAppAdmissionTx(client, input) {
         }
         throw error;
     }
-    if (authorityMode === 'bypass')
+    if (authorityMode.mode === 'bypass')
         return { kind: 'bypass' };
-    return resolveProductionAppAdmissionTx(client, input);
+    return resolveProductionAppAdmissionTx(client, input, authorityMode.admissionContractVersion);
 }
-async function resolveProductionAppAdmissionTx(client, input) {
+async function resolveProductionAppAdmissionTx(client, input, admissionContractVersion) {
     const initialLink = await client.query(`SELECT billing_account_id
      FROM org_billing_links
      WHERE org_slug = $1 AND active`, [input.org]);
@@ -62,6 +62,17 @@ async function resolveProductionAppAdmissionTx(client, input) {
             profile.cohort_seal_id AS profile_cohort_seal_id,
             profile.effective_from AS profile_effective_from,
             seal.id AS cohort_seal_id, seal.sealed_at AS cohort_sealed_at,
+            snapshot.id, snapshot.version, snapshot.plan_version_id,
+            plan.plan_code, plan.version AS plan_version,
+            plan.effective_from AS plan_effective_from,
+            plan.entitlements AS plan_entitlements,
+            plan.content_checksum AS plan_content_checksum,
+            plan.created_at AS plan_created_at,
+            snapshot.schema_version, snapshot.source_kind, snapshot.generation_reason,
+            snapshot.verification_status, snapshot.effective_from, snapshot.effective_until,
+            snapshot.monthly_usage_anchor, snapshot.entitlements, snapshot.content_checksum,
+            snapshot.source_subscription_id, snapshot.source_subscription_version,
+            snapshot.verified_at, snapshot.created_at,
             snapshot.id AS snapshot_id, snapshot.version AS snapshot_version,
             snapshot.plan_version_id AS snapshot_plan_version_id,
             snapshot.verification_status AS snapshot_verification_status,
@@ -76,6 +87,7 @@ async function resolveProductionAppAdmissionTx(client, input) {
      JOIN billing_entitlement_snapshots AS snapshot
        ON snapshot.billing_account_id = active_snapshot.billing_account_id
       AND snapshot.id = active_snapshot.snapshot_id
+     JOIN billing_plan_versions AS plan ON plan.id = snapshot.plan_version_id
      JOIN billing_account_active_enforcement_profiles AS active_profile
        ON active_profile.billing_account_id = link.billing_account_id
      JOIN billing_account_enforcement_profiles AS profile
@@ -84,14 +96,30 @@ async function resolveProductionAppAdmissionTx(client, input) {
      JOIN billing_enforcement_cohort_seals AS seal ON seal.singleton = true
      WHERE link.org_slug = $1
        AND link.active
-     FOR SHARE OF link, account, active_snapshot, snapshot, active_profile, profile, seal`, [input.org]);
+     FOR SHARE OF link, account, active_snapshot, snapshot, plan, active_profile, profile, seal`, [input.org]);
     const row = resolution.rows[0];
     if (row === undefined || row.billing_account_id !== initialAccountId)
         throw unavailable();
-    validateBillingResolution(row);
-    if (row.mode === 'legacy_internal_exempt')
+    validateBillingResolutionProfile(row);
+    if (row.mode === 'legacy_internal_exempt') {
+        validateLegacyBillingResolution(row);
         return { kind: 'bypass' };
-    const entitlements = parseBillingCommercialFreeV1Entitlements(row.entitlements);
+    }
+    if (admissionContractVersion === undefined)
+        throw unavailable();
+    const databaseTime = await readBillingMeterTransactionTime(client);
+    let entitlements;
+    try {
+        entitlements = resolveActiveBillingCommercialEntitlement(row, {
+            admissionContractVersion,
+            databaseTime,
+        }).entitlements;
+    }
+    catch (error) {
+        if (error instanceof BillingActiveCommercialEntitlementInconsistentError)
+            throw unavailable();
+        throw error;
+    }
     return {
         kind: 'enforced',
         billingAccountId: row.billing_account_id,
@@ -173,40 +201,45 @@ function validateAuthority(row) {
             authoritativeActiveCount !== 0) {
             throw unavailable();
         }
-        return 'bypass';
+        return { mode: 'bypass' };
     }
     if (row.activation_state === 'rolled_back') {
+        const admissionContractVersion = persistedAdmissionContractVersion(row.activation_contract_version);
         if (row.activation_generation < 1 ||
             row.active_epoch_id !== null ||
             row.last_epoch_id === null ||
-            row.activation_contract_version !== PRODUCTION_APP_ADMISSION_CONTRACT_VERSION ||
             row.last_epoch_purpose !== 'authoritative' ||
             row.last_epoch_state !== 'retired' ||
-            row.last_epoch_contract_version !== PRODUCTION_APP_ADMISSION_CONTRACT_VERSION ||
+            row.last_epoch_contract_version !== admissionContractVersion ||
             row.last_epoch_release_sha !== row.activation_release_sha ||
             !sameInstant(row.last_epoch_activated_at, row.activation_activated_at) ||
             authoritativeActiveCount !== 0) {
             throw unavailable();
         }
-        return 'bypass';
+        return { mode: 'bypass' };
     }
+    const admissionContractVersion = persistedAdmissionContractVersion(row.activation_contract_version);
     if (row.activation_state !== 'active' ||
         row.activation_generation < 1 ||
         row.active_epoch_id === null ||
         row.active_epoch_id !== row.last_epoch_id ||
-        row.activation_contract_version !== PRODUCTION_APP_ADMISSION_CONTRACT_VERSION ||
         row.active_epoch_purpose !== 'authoritative' ||
         row.active_epoch_state !== 'active' ||
-        row.active_epoch_contract_version !== PRODUCTION_APP_ADMISSION_CONTRACT_VERSION ||
+        row.active_epoch_contract_version !== admissionContractVersion ||
         row.active_epoch_release_sha !== row.activation_release_sha ||
         !sameInstant(row.active_epoch_activated_at, row.activation_activated_at) ||
         row.active_epoch_reconciliation_failed_at !== null ||
         authoritativeActiveCount !== 1) {
         throw unavailable();
     }
-    return 'enforce';
+    return { mode: 'enforce', admissionContractVersion };
 }
-function validateBillingResolution(row) {
+function persistedAdmissionContractVersion(value) {
+    if (value !== 1 && value !== 2)
+        throw unavailable();
+    return value;
+}
+function validateBillingResolutionProfile(row) {
     const profileEffectiveFrom = persistedInstant(row.profile_effective_from);
     const cohortSealedAt = persistedInstant(row.cohort_sealed_at);
     const validLegacyProfile = row.mode === 'legacy_internal_exempt' &&
@@ -217,7 +250,12 @@ function validateBillingResolution(row) {
         profileEffectiveFrom >= cohortSealedAt;
     if (row.account_state !== 'active' ||
         row.profile_cohort_seal_id !== row.cohort_seal_id ||
-        (!validLegacyProfile && !validEnforcedProfile) ||
+        (!validLegacyProfile && !validEnforcedProfile)) {
+        throw unavailable();
+    }
+}
+function validateLegacyBillingResolution(row) {
+    if (row.mode !== 'legacy_internal_exempt' ||
         row.snapshot_verification_status !== 'verified' ||
         !Number.isSafeInteger(row.snapshot_version) ||
         row.snapshot_version < 1) {
@@ -235,14 +273,6 @@ function validateBillingResolution(row) {
     });
     if (row.snapshot_content_checksum !== expectedChecksum)
         throw unavailable();
-    if (row.mode === 'enforced') {
-        try {
-            parseBillingCommercialFreeV1Entitlements(row.entitlements);
-        }
-        catch {
-            throw unavailable();
-        }
-    }
 }
 function sameInstant(left, right) {
     if (left === null || right === null)

package/node_modules/@noodle-borg/service/dist/billing/postgres-production-app-admission.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres-production-app-admission.js","sourceRoot":"","sources":["../../src/billing/postgres-production-app-admission.ts"],"names":[],"mappings":"AACA,OAAO,~~EAAE~~,~~wCAAwC~~,~~EAAE~~,MAAM,~~8BAA8B~~,CAAC;~~AACxF~~,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;~~AAEpD~~;;;GAGG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,6CAA6C,CAAC;~~AAEpG~~,MAAM,~~yCAAyC,GAAG,CAAC,CAAC;AAMpD,MAAM,~~OAAO,kCAAmC,SAAQ,KAAK;IAClD,IAAI,CAAyC;IAEtD,YAAY,IAA4C;QACtD,KAAK,CACH,IAAI,KAAK,+BAA+B;YACtC,CAAC,CAAC,kDAAkD;YACpD,CAAC,CAAC,gDAAgD,CACrD,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,oCAAoC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAwDD,kGAAkG;AAClG,MAAM,CAAC,KAAK,UAAU,uCAAuC,CAAC,MAAkB;IAC9E,MAAM,MAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE;QACjF,sCAAsC;KACvC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,MAAkB,EAClB,KAAqD;IAErD,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;IAC9C,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACvD,IAAI,~~aAAmC~~,CAAC;~~IACxC~~,IAAI,CAAC;QACH,aAAa,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,kCAAkC,EAAE,CAAC;YACxD,MAAM,OAAO,GAAG,MAAM,+BAA+B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACrE,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,OAAO,CAAC;QAChD,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,aAAa,KAAK,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;~~IAE1D~~,OAAO,+BAA+B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;~~AACxD~~,CAAC;AAED,KAAK,UAAU,+BAA+B,CAC5C,MAAkB,EAClB,KAAqD;~~IAErD~~,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,KAAK,CACpC;;oCAEgC,EAChC,CAAC,KAAK,CAAC,GAAG,CAAC,CACZ,CAAC;IACF,MAAM,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC;IACjE,IAAI,gBAAgB,KAAK,SAAS;QAAE,MAAM,WAAW,EAAE,CAAC;IAExD,MAAM,MAAM,CAAC,KAAK,CAAC,uDAAuD,EAAE;QAC1E,mCAAmC,gBAAgB,EAAE;KACtD,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,KAAK,CACnC~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;0FA4BsF~~,~~EACtF~~,CAAC,KAAK,CAAC,GAAG,CAAC,CACZ,CAAC;IACF,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,kBAAkB,KAAK,gBAAgB;QAAE,MAAM,WAAW,EAAE,CAAC;IAC1F,~~yBAAyB~~,CAAC,GAAG,CAAC,CAAC;~~IAC/B~~,IAAI,GAAG,CAAC,IAAI,KAAK,wBAAwB;~~QAAE~~,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;~~IACrE~~,MAAM,YAAY,GAAG,~~wCAAwC~~,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;~~IAEhF~~,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,gBAAgB,EAAE,GAAG,CAAC,kBAAkB;QACxC,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,KAAK,EAAE,YAAY,CAAC,kBAAkB;KACvC,CAAC;AACJ,CAAC;AAED,+FAA+F;AAC/F,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,MAAkB,EAClB,OAA6C;IAE7C,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO;IACtC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,KAAK,CAChC;;;;iBAIa,EACb,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAC3B,CAAC;IACF,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI;QAAE,OAAO;IAE7C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,KAAK,CAClC;;;;;;;;;sBASkB,EAClB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAC3B,CAAC;IACF,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACzD,IAAI,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,kCAAkC,CAAC,+BAA+B,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,MAAkB;IAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BjD,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC;AAED,SAAS,iBAAiB,~~CAAC~~,GAAiB;~~IAC1C~~,IACE,GAAG,CAAC,gBAAgB,KAAK,IAAI;QAC7B,GAAG,CAAC,yBAAyB,KAAK,GAAG,CAAC,OAAO;QAC7C,GAAG,CAAC,qBAAqB,KAAK,IAAI,EAClC,CAAC;QACD,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC;IACD,MAAM,wBAAwB,GAAG,cAAc,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAChF,IAAI,GAAG,CAAC,gBAAgB,KAAK,eAAe,EAAE,CAAC;QAC7C,IACE,GAAG,CAAC,qBAAqB,KAAK,CAAC;YAC/B,GAAG,CAAC,eAAe,KAAK,IAAI;YAC5B,GAAG,CAAC,aAAa,KAAK,IAAI;YAC1B,wBAAwB,KAAK,CAAC,EAC9B,CAAC;YACD,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QACD,OAAO,QAAQ,CAAC;~~IAClB~~,CAAC;IACD,IAAI,GAAG,CAAC,gBAAgB,KAAK,aAAa,EAAE,CAAC;QAC3C,IACE,GAAG,CAAC,qBAAqB,GAAG,CAAC;YAC7B,GAAG,CAAC,eAAe,KAAK,IAAI;YAC5B,GAAG,CAAC,aAAa,KAAK,IAAI;YAC1B,GAAG,CAAC,~~2BAA2B,KAAK,yCAAyC;YAC7E,GAAG,CAAC,~~kBAAkB,KAAK,eAAe;YAC1C,GAAG,CAAC,gBAAgB,KAAK,SAAS;YAClC,GAAG,CAAC,2BAA2B,KAAK,~~yCAAyC~~;~~YAC7E~~,GAAG,CAAC,sBAAsB,KAAK,GAAG,CAAC,sBAAsB;YACzD,CAAC,WAAW,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,CAAC;YACtE,wBAAwB,KAAK,CAAC,EAC9B,CAAC;YACD,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QACD,OAAO,QAAQ,CAAC;~~IAClB~~,CAAC;IACD,IACE,GAAG,CAAC,gBAAgB,KAAK,QAAQ;QACjC,GAAG,CAAC,qBAAqB,GAAG,CAAC;QAC7B,GAAG,CAAC,eAAe,KAAK,IAAI;QAC5B,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,aAAa;QACzC,GAAG,CAAC,~~2BAA2B,KAAK,yCAAyC;QAC7E,GAAG,CAAC,~~oBAAoB,KAAK,eAAe;QAC5C,GAAG,CAAC,kBAAkB,KAAK,QAAQ;QACnC,GAAG,CAAC,6BAA6B,KAAK,~~yCAAyC~~;~~QAC/E~~,GAAG,CAAC,wBAAwB,KAAK,GAAG,CAAC,sBAAsB;QAC3D,CAAC,WAAW,CAAC,GAAG,CAAC,yBAAyB,EAAE,GAAG,CAAC,uBAAuB,CAAC;QACxE,GAAG,CAAC,qCAAqC,KAAK,IAAI;QAClD,wBAAwB,KAAK,CAAC,EAC9B,CAAC;QACD,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC;IACD,OAAO,SAAS,CAAC;~~AACnB~~,CAAC;AAED,SAAS,~~yBAAyB~~,CAAC,GAAyB;~~IAC1D~~,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,kBAAkB,GACtB,GAAG,CAAC,IAAI,KAAK,wBAAwB;QACrC,GAAG,CAAC,cAAc,KAAK,oBAAoB;QAC3C,oBAAoB,KAAK,cAAc,CAAC;IAC1C,MAAM,oBAAoB,GACxB,GAAG,CAAC,IAAI,KAAK,UAAU;QACvB,GAAG,CAAC,cAAc,KAAK,mBAAmB;QAC1C,oBAAoB,IAAI,cAAc,CAAC;IACzC,IACE,GAAG,CAAC,aAAa,KAAK,QAAQ;QAC9B,GAAG,CAAC,sBAAsB,KAAK,GAAG,CAAC,cAAc;QACjD,CAAC,CAAC,kBAAkB,IAAI,CAAC,oBAAoB,CAAC;~~QAC9C~~,GAAG,CAAC,4BAA4B,KAAK,UAAU;QAC/C,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAC3C,GAAG,CAAC,gBAAgB,GAAG,CAAC,EACxB,CAAC;QACD,MAAM,WAAW,EAAE,CAAC;IACtB,CAAC;IACD,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACpE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC/E,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;QAC9C,gBAAgB,EAAE,GAAG,CAAC,kBAAkB;QACxC,OAAO,EAAE,GAAG,CAAC,gBAAgB;QAC7B,aAAa,EAAE,GAAG,CAAC,wBAAwB;QAC3C,aAAa;QACb,kBAAkB;QAClB,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,yBAAyB,KAAK,gBAAgB;QAAE,MAAM,WAAW,EAAE,CAAC;~~IAC5E~~,~~IAAI,GAAG,~~CAAC~~,IAAI,KAAK,UAAU,EAAE,CAAC~~;~~QAC5B,IAAI,CAAC;YACH,wCAAwC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC7D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC;~~AAED,SAAS,WAAW,CAAC,IAA0B,EAAE,KAA2B;IAC1E,IAAI,IAAI,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAClD,IAAI,CAAC;QACH,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAoB;IAC5C,MAAM,IAAI,GAAG,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAAE,MAAM,WAAW,EAAE,CAAC;IAC1D,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,KAAyB;IAC/C,MAAM,MAAM,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC;QAAE,MAAM,WAAW,EAAE,CAAC;IACrE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,IAAI,kCAAkC,CAAC,iCAAiC,CAAC,CAAC;AACnF,CAAC"}
1	+ {"version":3,"file":"postgres-production-app-admission.js","sourceRoot":"","sources":["../../src/billing/postgres-production-app-admission.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-records.d.ts CHANGED Viewed

@@ -39,13 +39,17 @@ export interface EntitlementSnapshotRow {
     readonly plan_entitlements: unknown;
     readonly plan_content_checksum: string;
     readonly plan_created_at: Date | string;
+    readonly schema_version: number;
     readonly source_kind: string;
     readonly generation_reason: string;
     readonly verification_status: string;
     readonly effective_from: Date | string;
+    readonly effective_until: Date | string | null;
     readonly monthly_usage_anchor: Date | string;
     readonly entitlements: unknown;
     readonly content_checksum: string;
+    readonly source_subscription_id: string | null;
+    readonly source_subscription_version: number | null;
     readonly verified_at: Date | string;
     readonly created_at: Date | string;
 }

package/node_modules/@noodle-borg/service/dist/billing/postgres-records.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres-records.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-records.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,EAGzB,KAAK,yBAAyB,EAG9B,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EAEvB,MAAM,YAAY,CAAC;~~AAEpB~~,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,GAAG,oBAAoB,CAUxE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,0BAA0B,CAc5E;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,iBAAiB,CAuB7E;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,sBAAsB,GAC1B,yBAAyB,~~CAiD3B~~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"}
1	+ {"version":3,"file":"postgres-records.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-records.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-records.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { validateSlug } from '../store/validate.js';
 import { billingContentChecksum, normalizeBillingEmail, normalizeBillingIdentity, validateBillingAccountId, } from './model.js';
+import { parsePaidEntitlementSnapshot } from './subscription-model.js';
 export function accountRowToRecord(row) {
     if (row.state !== 'active' && row.state !== 'draft' && row.state !== 'inactive') {
         throw new Error('persisted billing account has an invalid state');
@@ -51,11 +52,6 @@ export function planVersionRowToRecord(row) {
     return record;
 }
 export function entitlementSnapshotRowToRecord(row) {
-    if (row.source_kind !== 'system-free' ||
-        row.generation_reason !== 'default-account-created' ||
-        row.verification_status !== 'verified') {
-        throw new Error('persisted entitlement snapshot has an unsupported provenance');
-    }
     const effectiveFrom = toIsoString(row.effective_from);
     const monthlyUsageAnchor = toIsoString(row.monthly_usage_anchor);
     const entitlements = parseEntitlements(row.entitlements);
@@ -68,16 +64,13 @@ export function entitlementSnapshotRowToRecord(row) {
         content_checksum: row.plan_content_checksum,
         created_at: row.plan_created_at,
     });
-    const record = {
+    const common = {
         id: validateScalarId('entitlement snapshot id', row.id),
         billingAccountId: validateBillingAccountId(row.billing_account_id),
         version: validatePositiveInteger('entitlement snapshot version', row.version),
         planVersionId: validateScalarId('plan version id', row.plan_version_id),
         planCode: plan.planCode,
         planVersion: plan.version,
-        sourceKind: row.source_kind,
-        generationReason: row.generation_reason,
-        verificationStatus: row.verification_status,
         effectiveFrom,
         monthlyUsageAnchor,
         entitlements,
@@ -85,6 +78,42 @@ export function entitlementSnapshotRowToRecord(row) {
         verifiedAt: toIsoString(row.verified_at),
         createdAt: toIsoString(row.created_at),
     };
+    if (row.schema_version === 2) {
+        if (row.source_kind !== 'subscription' ||
+            row.generation_reason !== 'subscription-reconciled' ||
+            row.verification_status !== 'verified' ||
+            row.effective_until === null ||
+            row.source_subscription_id === null ||
+            row.source_subscription_version === null) {
+            throw new Error('persisted entitlement snapshot has an unsupported provenance');
+        }
+        return parsePaidEntitlementSnapshot({
+            ...common,
+            schemaVersion: 2,
+            sourceKind: row.source_kind,
+            generationReason: row.generation_reason,
+            verificationStatus: row.verification_status,
+            effectiveUntil: toIsoString(row.effective_until),
+            sourceSubscriptionId: row.source_subscription_id,
+            sourceSubscriptionVersion: row.source_subscription_version,
+        });
+    }
+    if (row.schema_version !== 1 ||
+        row.source_kind !== 'system-free' ||
+        row.generation_reason !== 'default-account-created' ||
+        row.verification_status !== 'verified' ||
+        row.effective_until !== null ||
+        row.source_subscription_id !== null ||
+        row.source_subscription_version !== null) {
+        throw new Error('persisted entitlement snapshot has an unsupported provenance');
+    }
+    const record = {
+        ...common,
+        schemaVersion: 1,
+        sourceKind: row.source_kind,
+        generationReason: row.generation_reason,
+        verificationStatus: row.verification_status,
+    };
     const checksum = billingContentChecksum({
         billingAccountId: record.billingAccountId,
         version: record.version,