@saasicat/nest 1.0.0-rc.2 → 1.0.0-rc.21

package/dist/{chunk-WOVQPXV4.js → chunk-CQ2ZZMTD.js}

@@ -1,16 +1,20 @@
 import {
-  AUDIT_CONTEXT_RESOLVER_TOKEN,
-  USER_EMAIL_RESOLVER_TOKEN,
-  USER_ID_RESOLVER_TOKEN,
   classifyBundleVersionDiff,
   classifyPlanDiff
-} from "./chunk-N3L3AICU.js";
+} from "./chunk-GZTL64QK.js";
+import {
+  EnforceMfa
+} from "./chunk-34XVPR6P.js";
 import {
   AdminAuditService
-} from "./chunk-O2J2HDXA.js";
+} from "./chunk-OOTEXP47.js";
 import {
-  SaaSiCatPublicRoute
-} from "./chunk-YSC46BGM.js";
+  cyclesSoldFor,
+  resolveBundlePriceNet
+} from "./chunk-KPEMTBOP.js";
+import {
+  DiscoveryScanner
+} from "./chunk-JVAEKTJ4.js";
 import {
   SUBSCRIPTION_REPOSITORY_TOKEN
 } from "./chunk-OUDSQ3PU.js";
@@ -21,32 +25,129 @@ import {
   CATALOG_SERVICE_CONFIG_TOKEN,
   MARKETING_PROJECTION_REPOSITORY_TOKEN,
   MARKETING_SETTINGS_REPOSITORY_TOKEN,
+  NEW_PAYMENT_METHODS_SOURCE_TOKEN,
   PLAN_REPOSITORY_TOKEN,
   PROMOTION_REPOSITORY_TOKEN
-} from "./chunk-AOQJEYOL.js";
-import {
-  asProvider
-} from "./chunk-SABTXESR.js";
-import {
-  DiscoveryScanner
-} from "./chunk-WXYJHZCN.js";
+} from "./chunk-3QVGA6JX.js";
 import {
   DISCOVERY_SNAPSHOT_TOKEN
 } from "./chunk-QUZU2M33.js";
+import {
+  AUDIT_CONTEXT_RESOLVER_TOKEN,
+  USER_EMAIL_RESOLVER_TOKEN,
+  USER_ID_RESOLVER_TOKEN
+} from "./chunk-GPQWGA6B.js";
+import {
+  SaaSiCatPublicRoute
+} from "./chunk-YSC46BGM.js";
+import {
+  asProvider
+} from "./chunk-J7NJRK3K.js";
 import {
   __name
 } from "./chunk-SHUYVCID.js";
 
+// src/catalog/validity-window.ts
+import { UnprocessableEntityException } from "@nestjs/common";
+import { CATALOG_ERROR_CODES } from "@saasicat/core";
+var DAY_MS = 24 * 60 * 60 * 1e3;
+var PLAN_VERSION_WINDOW_CODES = {
+  validFromRequired: CATALOG_ERROR_CODES.PLAN_VERSION_VALID_FROM_REQUIRED,
+  validFromInvalid: CATALOG_ERROR_CODES.PLAN_VERSION_VALID_FROM_INVALID,
+  validFromNotAfterPrevious: CATALOG_ERROR_CODES.PLAN_VERSION_VALID_FROM_NOT_AFTER_PREVIOUS,
+  validFromNotGapless: CATALOG_ERROR_CODES.PLAN_VERSION_VALID_FROM_NOT_GAPLESS,
+  validUntilInvalid: CATALOG_ERROR_CODES.PLAN_VERSION_VALID_UNTIL_INVALID,
+  validUntilBeforeFrom: CATALOG_ERROR_CODES.PLAN_VERSION_VALID_UNTIL_BEFORE_FROM
+};
+var BUNDLE_VERSION_WINDOW_CODES = {
+  validFromRequired: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_REQUIRED,
+  validFromInvalid: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_INVALID,
+  validFromNotAfterPrevious: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_AFTER_PREVIOUS,
+  validFromNotGapless: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_GAPLESS,
+  validUntilInvalid: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_UNTIL_INVALID,
+  validUntilBeforeFrom: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_UNTIL_BEFORE_FROM
+};
+function resolveValidityWindow(publishMeta, draft, previous, codes) {
+  const validFromInput = publishMeta.validFrom ?? draft.validFrom;
+  if (!validFromInput) {
+    throw new UnprocessableEntityException({
+      code: codes.validFromRequired,
+      message: "validFrom must be set when publishing (on the draft or the publish call).."
+    });
+  }
+  const validFrom = new Date(validFromInput);
+  if (Number.isNaN(validFrom.getTime())) {
+    throw new UnprocessableEntityException({
+      code: codes.validFromInvalid,
+      message: `validFrom '${validFromInput}' is not a valid date`,
+      params: {
+        validFrom: validFromInput
+      }
+    });
+  }
+  if (previous?.validFrom) {
+    const previousFrom = new Date(previous.validFrom);
+    if (validFrom <= previousFrom) {
+      throw new UnprocessableEntityException({
+        code: codes.validFromNotAfterPrevious,
+        message: `validFrom (${validFrom.toISOString()}) must be strictly after the validFrom of the previous version (${previous.validFrom}).`,
+        params: {
+          validFrom: validFrom.toISOString(),
+          previousValidFrom: previous.validFrom
+        }
+      });
+    }
+    if (previous.validUntil) {
+      const requiredStart = new Date(new Date(previous.validUntil).getTime() + DAY_MS);
+      if (validFrom.getTime() !== requiredStart.getTime()) {
+        throw new UnprocessableEntityException({
+          code: codes.validFromNotGapless,
+          message: `The predecessor has validUntil=${previous.validUntil.slice(0, 10)} \u2014 the successor must start seamlessly on the next day (${requiredStart.toISOString().slice(0, 10)}). Received: ${validFrom.toISOString().slice(0, 10)}.`,
+          params: {
+            received: validFrom.toISOString().slice(0, 10)
+          },
+          requiredValidFrom: requiredStart.toISOString().slice(0, 10),
+          previousValidUntil: previous.validUntil
+        });
+      }
+    }
+  }
+  const validUntilInput = publishMeta.validUntil !== void 0 ? publishMeta.validUntil : draft.validUntil;
+  const validUntil = validUntilInput ? new Date(validUntilInput) : null;
+  if (validUntil && Number.isNaN(validUntil.getTime())) {
+    throw new UnprocessableEntityException({
+      code: codes.validUntilInvalid,
+      message: `validUntil '${validUntilInput}' is not a valid date`,
+      params: {
+        validUntil: validUntilInput
+      }
+    });
+  }
+  if (validUntil && validUntil <= validFrom) {
+    throw new UnprocessableEntityException({
+      code: codes.validUntilBeforeFrom,
+      message: `validUntil (${validUntil.toISOString()}) must be strictly after validFrom (${validFrom.toISOString()}).`,
+      params: {
+        validUntil: validUntil.toISOString(),
+        validFrom: validFrom.toISOString()
+      }
+    });
+  }
+  return {
+    validFrom,
+    validUntil
+  };
+}
+__name(resolveValidityWindow, "resolveValidityWindow");
+
 // src/catalog/approved-keys.ts
-async function loadApprovedCatalogKeys(repo, projectKey) {
+async function loadApprovedCatalogKeys(repo) {
   if (!repo) return null;
   const [features, quotas] = await Promise.all([
     repo.listFeatures({
-      projectKey,
       discoveryStatus: "approved"
     }),
     repo.listQuotas({
-      projectKey,
       discoveryStatus: "approved"
     })
   ]);
@@ -191,8 +292,8 @@ function validatePlanDraft(draft, snapshot, marketedOnlyFeatures = /* @__PURE__
 __name(validatePlanDraft, "validatePlanDraft");
 
 // src/catalog/bundles.service.ts
-import { Inject, Injectable, Logger, NotFoundException, Optional, UnprocessableEntityException } from "@nestjs/common";
-import { CATALOG_ERROR_CODES, isVersionEditable } from "@saasicat/core";
+import { Inject, Injectable, Logger, NotFoundException, Optional, UnprocessableEntityException as UnprocessableEntityException2 } from "@nestjs/common";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES2, isVersionEditable } from "@saasicat/core";
 
 // src/core/discovery-snapshot-source.ts
 function resolveDiscoverySnapshot(injected, scanner) {
@@ -254,9 +355,8 @@ var BundlesService = class _BundlesService {
   // =========================================================================
   // Master operations
   // =========================================================================
-  listBundles(projectKey) {
+  listBundles() {
     return this.repo.list({
-      projectKey,
       excludeDeleted: true
     });
   }
@@ -264,7 +364,7 @@ var BundlesService = class _BundlesService {
     const bundle = await this.repo.findById(bundleId);
     if (!bundle) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_NOT_FOUND,
         message: `Bundle '${bundleId}' not found`,
         params: {
           bundleId
@@ -278,14 +378,13 @@ var BundlesService = class _BundlesService {
     };
   }
   async createBundle(data) {
-    const existing = await this.repo.findByKey(data.projectKey, data.bundleKey);
+    const existing = await this.repo.findByKey(data.bundleKey);
     if (existing) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_ALREADY_EXISTS,
-        message: `Bundle '${data.bundleKey}' already exists in project '${data.projectKey}'`,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_ALREADY_EXISTS,
+        message: `Bundle '${data.bundleKey}' already exists`,
         params: {
-          bundleKey: data.bundleKey,
-          projectKey: data.projectKey
+          bundleKey: data.bundleKey
         }
       });
     }
@@ -295,7 +394,7 @@ var BundlesService = class _BundlesService {
     const existing = await this.repo.findById(bundleId);
     if (!existing) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_NOT_FOUND,
         message: `Bundle '${bundleId}' not found`,
         params: {
           bundleId
@@ -308,7 +407,7 @@ var BundlesService = class _BundlesService {
     const existing = await this.repo.findById(bundleId);
     if (!existing) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_NOT_FOUND,
         message: `Bundle '${bundleId}' not found`,
         params: {
           bundleId
@@ -327,7 +426,7 @@ var BundlesService = class _BundlesService {
     const existing = await this.repo.findVersionById(versionId);
     if (!existing) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NOT_FOUND,
         message: `BundleVersion '${versionId}' not found`,
         params: {
           bundleVersionId: versionId
@@ -335,8 +434,8 @@ var BundlesService = class _BundlesService {
       });
     }
     if (existing.publishedAt !== null) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_ALREADY_PUBLISHED,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_ALREADY_PUBLISHED,
         message: `BundleVersion '${versionId}' is already published and cannot be discarded.`,
         params: {
           versionId
@@ -344,8 +443,8 @@ var BundlesService = class _BundlesService {
       });
     }
     if (typeof this.repo.deleteDraft !== "function") {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_DISCARD_NOT_IMPLEMENTED,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_DISCARD_NOT_IMPLEMENTED,
         message: "Discard is not implemented in the current repository. Implement BundleRepository.deleteDraft."
       });
     }
@@ -361,7 +460,7 @@ var BundlesService = class _BundlesService {
     const version = await this.repo.findVersionById(versionId);
     if (!version) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NOT_FOUND,
         message: `BundleVersion '${versionId}' not found`,
         params: {
           bundleVersionId: versionId
@@ -409,7 +508,7 @@ var BundlesService = class _BundlesService {
     const bundle = await this.repo.findById(data.bundleId);
     if (!bundle) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_NOT_FOUND,
         message: `Bundle '${data.bundleId}' not found`,
         params: {
           bundleId: data.bundleId
@@ -418,8 +517,8 @@ var BundlesService = class _BundlesService {
     }
     const existingDraft = await this.repo.findCurrentDraft(data.bundleId);
     if (existingDraft) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_DRAFT_ALREADY_EXISTS,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_DRAFT_ALREADY_EXISTS,
         message: `Bundle '${bundle.bundleKey}' already has a draft version v${existingDraft.version}; publish or discard it first`,
         params: {
           bundleKey: bundle.bundleKey,
@@ -438,7 +537,7 @@ var BundlesService = class _BundlesService {
       features: data.features,
       quotas: data.quotas ?? {},
       compatibility: data.compatibility
-    }, bundle.projectKey);
+    });
     this.gateOrPass(warnings);
     const bundleVersion = await this.repo.createDraft(data);
     return {
@@ -458,7 +557,7 @@ var BundlesService = class _BundlesService {
     const existing = await this.repo.findVersionById(versionId);
     if (!existing) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NOT_FOUND,
         message: `BundleVersion '${versionId}' not found`,
         params: {
           bundleVersionId: versionId
@@ -470,8 +569,8 @@ var BundlesService = class _BundlesService {
     ]);
     const { editable } = isVersionEditable(annotated);
     if (!editable) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_NOT_EDITABLE,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NOT_EDITABLE,
         message: `BundleVersion '${versionId}' is not editable. Only drafts and published versions are editable that are latest-in-chain, bind no subscription yet, and whose validFrom lies in the future.`,
         params: {
           versionId
@@ -483,8 +582,7 @@ var BundlesService = class _BundlesService {
       quotas: data.quotas ?? existing.quotas,
       compatibility: data.compatibility ?? existing.compatibility
     };
-    const bundle = await this.repo.findById(existing.bundleId);
-    const warnings = await this.runStrictCheck(merged, bundle?.projectKey ?? null);
+    const warnings = await this.runStrictCheck(merged);
     this.gateOrPass(warnings);
     await this.assertBundleVersionWindowUpdate(existing, data);
     const bundleVersion = await this.repo.updateDraft(versionId, data);
@@ -507,7 +605,7 @@ var BundlesService = class _BundlesService {
     const draft = await this.repo.findVersionById(versionId);
     if (!draft) {
       throw new NotFoundException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NOT_FOUND,
         message: `BundleVersion '${versionId}' not found`,
         params: {
           bundleVersionId: versionId
@@ -515,100 +613,44 @@ var BundlesService = class _BundlesService {
       });
     }
     if (draft.publishedAt !== null) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_ALREADY_PUBLISHED,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_ALREADY_PUBLISHED,
         message: `BundleVersion '${versionId}' is already published`,
         params: {
           versionId
         }
       });
     }
-    const bundle = await this.repo.findById(draft.bundleId);
     const warnings = await this.runStrictCheck({
       features: draft.features,
       quotas: draft.quotas,
       compatibility: draft.compatibility
-    }, bundle?.projectKey ?? null);
+    });
     this.gateOrPass(warnings);
+    const hasAnyPrice = draft.monthlyNet != null || draft.yearlyNet != null || (draft.pricingOverrides ?? []).some((o) => o.monthlyNet != null || o.yearlyNet != null);
+    if (!hasAnyPrice) {
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NO_PRICE,
+        message: "A bundle version cannot be published without a price: neither a base price nor any plan override resolves one, so a tenant booking it would be charged nothing for what they receive.",
+        params: {
+          versionId
+        }
+      });
+    }
     if (!publishMeta.allowZeroPrice) {
       const explicitZero = /* @__PURE__ */ __name((v) => v !== null && v !== void 0 && Number.parseFloat(String(v)) <= 0, "explicitZero");
       if (explicitZero(draft.monthlyNet) || explicitZero(draft.yearlyNet)) {
-        throw new UnprocessableEntityException({
-          code: CATALOG_ERROR_CODES.BUNDLE_VERSION_ZERO_PRICE,
+        throw new UnprocessableEntityException2({
+          code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_ZERO_PRICE,
           message: "A bundle version cannot be published with an explicit price of 0.00 (guard against seed placeholders). For free bundles leave it null, or set allowZeroPrice.",
           monthlyNet: draft.monthlyNet,
           yearlyNet: draft.yearlyNet
         });
       }
     }
+    await this.refuseUnsellableToACompatiblePlan(draft, versionId);
     const previous = await this.repo.findLatestLive(draft.bundleId);
-    const validFromInput = publishMeta.validFrom ?? draft.validFrom;
-    if (!validFromInput) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_REQUIRED,
-        message: "validFrom must be set when publishing (on the draft or the publish call).."
-      });
-    }
-    const validFrom = new Date(validFromInput);
-    if (Number.isNaN(validFrom.getTime())) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_INVALID,
-        message: `validFrom '${validFromInput}' is not a valid date`,
-        params: {
-          validFrom: validFromInput
-        }
-      });
-    }
-    if (previous?.validFrom) {
-      const prevFrom = new Date(previous.validFrom);
-      if (validFrom <= prevFrom) {
-        throw new UnprocessableEntityException({
-          code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_AFTER_PREVIOUS,
-          message: `validFrom (${validFrom.toISOString()}) must be strictly after the validFrom of the previous version (${previous.validFrom}).`,
-          params: {
-            validFrom: validFrom.toISOString(),
-            previousValidFrom: previous.validFrom
-          }
-        });
-      }
-      if (previous.validUntil) {
-        const prevUntil = new Date(previous.validUntil);
-        const dayMs = 24 * 60 * 60 * 1e3;
-        const requiredStart = new Date(prevUntil.getTime() + dayMs);
-        if (validFrom.getTime() !== requiredStart.getTime()) {
-          throw new UnprocessableEntityException({
-            code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_GAPLESS,
-            message: `The predecessor has validUntil=${previous.validUntil.slice(0, 10)} \u2014 the successor must start seamlessly on the next day (${requiredStart.toISOString().slice(0, 10)}). Received: ${validFrom.toISOString().slice(0, 10)}.`,
-            params: {
-              received: validFrom.toISOString().slice(0, 10)
-            },
-            requiredValidFrom: requiredStart.toISOString().slice(0, 10),
-            previousValidUntil: previous.validUntil
-          });
-        }
-      }
-    }
-    const validUntilInput = publishMeta.validUntil !== void 0 ? publishMeta.validUntil : draft.validUntil;
-    const validUntil = validUntilInput ? new Date(validUntilInput) : null;
-    if (validUntil && Number.isNaN(validUntil.getTime())) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_UNTIL_INVALID,
-        message: `validUntil '${validUntilInput}' is not a valid date`,
-        params: {
-          validUntil: validUntilInput
-        }
-      });
-    }
-    if (validUntil && validUntil <= validFrom) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_UNTIL_BEFORE_FROM,
-        message: `validUntil (${validUntil.toISOString()}) must be strictly after validFrom (${validFrom.toISOString()}).`,
-        params: {
-          validUntil: validUntil.toISOString(),
-          validFrom: validFrom.toISOString()
-        }
-      });
-    }
+    const { validFrom, validUntil } = resolveValidityWindow(publishMeta, draft, previous, BUNDLE_VERSION_WINDOW_CODES);
     const diff = previous ? classifyBundleVersionDiff({
       features: previous.features,
       quotas: previous.quotas,
@@ -624,8 +666,8 @@ var BundlesService = class _BundlesService {
       nonRegressive: true
     };
     if (!diff.nonRegressive && !publishMeta.forceRegressive) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_REGRESSION,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_REGRESSION,
         message: "This bundle version is regressive (feature removed / quota lowered / price raised). Publishing requires an explicit `forceRegressive: true` (UI confirmation dialog with MFA).",
         changes: diff.changes
       });
@@ -645,27 +687,71 @@ var BundlesService = class _BundlesService {
   // =========================================================================
   // Helper
   // =========================================================================
-  async runStrictCheck(draft, projectKey) {
+  async runStrictCheck(draft) {
     const snapshot = resolveDiscoverySnapshot(this.snapshot, this.scanner);
     if (!snapshot) return [];
     const planIds = draft.compatibility?.planIds ?? [];
     let knownPlanKeys = null;
-    if (planIds.length > 0 && this.planRepo && projectKey) {
-      const all = await this.planRepo.list({
-        projectKey
-      });
+    if (planIds.length > 0 && this.planRepo) {
+      const all = await this.planRepo.list({});
       knownPlanKeys = new Set(all.map((p) => p.planKey));
     }
-    const approved = await loadApprovedCatalogKeys(this.catalogEntries, snapshot.app.key);
+    const approved = await loadApprovedCatalogKeys(this.catalogEntries);
     return validateBundleDraft(draft, snapshot, knownPlanKeys, this.marketedOnly, approved);
   }
+  /**
+   * Refuses a version that a plan it is offered to could not actually buy.
+   *
+   * "Some price resolves" is not the same as "this plan, in the rhythm it is
+   * sold in, resolves one". A bundle priced monthly only, offered to a plan
+   * that is sold yearly, passes the first test and fails the second — and the
+   * failure surfaces at a tenant's checkout rather than at the operator's
+   * desk, which is the wrong end of the mistake.
+   *
+   * The expectation comes from the catalog, not from a list: the plans are
+   * whichever the compatibility declares (empty = every plan), and the cycles
+   * are whichever each plan version carries a price for. Add a third cycle to
+   * the catalog one day and this asks about it without being told.
+   *
+   * Skipped where no plan repository is bound — a consumer without one has no
+   * catalog to derive from, and guessing would refuse valid bundles.
+   */
+  async refuseUnsellableToACompatiblePlan(draft, versionId) {
+    if (!this.planRepo?.listVersions) return;
+    const declared = draft.compatibility?.planIds ?? [];
+    const plans = await this.planRepo.list({
+      onlyPublished: true
+    });
+    const offeredTo = plans.filter((plan) => declared.length === 0 || declared.includes(plan.planKey));
+    for (const plan of offeredTo) {
+      const live = await this.liveVersionOf(plan.planKey);
+      if (!live) continue;
+      for (const cycle of cyclesSoldFor(live)) {
+        if (resolveBundlePriceNet(draft, plan.planKey, cycle) !== null) continue;
+        throw new UnprocessableEntityException2({
+          code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_NOT_PRICED_FOR_PLAN,
+          message: `This bundle is offered to plan '${plan.planKey}', which is sold ${cycle.toLowerCase()}, and no ${cycle.toLowerCase()} price resolves for it \u2014 neither a base price nor a plan override. Price it, or take that plan out of its compatibility.`,
+          params: {
+            versionId,
+            planKey: plan.planKey,
+            billingCycle: cycle
+          }
+        });
+      }
+    }
+  }
+  /** The live version of a plan, or null where the port cannot answer. */
+  async liveVersionOf(planKey) {
+    const versions = await this.planRepo?.listVersions?.(planKey) ?? [];
+    return versions.find((version) => version.publishedAt && !version.supersededAt) ?? null;
+  }
   gateOrPass(warnings) {
     const blocking = blockingStrictModeWarnings(warnings);
     if (blocking.length === 0) return;
     const hasHardBlockingWarning = blocking.some((w) => w.code === "BUNDLE_PLAN_KEY_UNKNOWN");
     if (this.mode === "blocking" || hasHardBlockingWarning) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.STRICT_MODE_VIOLATIONS,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.STRICT_MODE_VIOLATIONS,
         message: "The strict-mode check found drift against the discovery snapshot.",
         warnings
       });
@@ -678,8 +764,8 @@ var BundlesService = class _BundlesService {
     const validUntil = this.parseOptionalBundleDate(validUntilInput, "validUntil", "BUNDLE_VERSION_VALID_UNTIL_INVALID");
     if (!validFromInput) {
       if (existing.publishedAt !== null) {
-        throw new UnprocessableEntityException({
-          code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_REQUIRED,
+        throw new UnprocessableEntityException2({
+          code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_VALID_FROM_REQUIRED,
           message: "Published bundle versions must keep a validFrom. Set a new future date, or edit the draft before publishing."
         });
       }
@@ -687,8 +773,8 @@ var BundlesService = class _BundlesService {
     }
     const validFrom = this.parseRequiredBundleDate(validFromInput, "validFrom", "BUNDLE_VERSION_VALID_FROM_INVALID");
     if (existing.publishedAt !== null && validFrom.getTime() <= Date.now()) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_FUTURE,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_VALID_FROM_NOT_FUTURE,
         message: `validFrom (${validFrom.toISOString()}) must, for a published-but-future bundle version, still lie in the future.`,
         params: {
           validFrom: validFrom.toISOString()
@@ -696,8 +782,8 @@ var BundlesService = class _BundlesService {
       });
     }
     if (validUntil && validUntil <= validFrom) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_UNTIL_BEFORE_FROM,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_VALID_UNTIL_BEFORE_FROM,
         message: `validUntil (${validUntil.toISOString()}) must be strictly after validFrom (${validFrom.toISOString()}).`,
         params: {
           validUntil: validUntil.toISOString(),
@@ -710,8 +796,8 @@ var BundlesService = class _BundlesService {
     const previousValidFrom = new Date(previous.validFrom);
     if (Number.isNaN(previousValidFrom.getTime())) return;
     if (validFrom <= previousValidFrom) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_AFTER_PREVIOUS,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_VALID_FROM_NOT_AFTER_PREVIOUS,
         message: `validFrom (${validFrom.toISOString()}) must be strictly after the validFrom of the previous version (${previous.validFrom}).`,
         params: {
           validFrom: validFrom.toISOString(),
@@ -725,8 +811,8 @@ var BundlesService = class _BundlesService {
     const dayMs = 24 * 60 * 60 * 1e3;
     const requiredStart = new Date(previousValidUntil.getTime() + dayMs);
     if (validFrom.getTime() !== requiredStart.getTime()) {
-      throw new UnprocessableEntityException({
-        code: CATALOG_ERROR_CODES.BUNDLE_VERSION_VALID_FROM_NOT_GAPLESS,
+      throw new UnprocessableEntityException2({
+        code: CATALOG_ERROR_CODES2.BUNDLE_VERSION_VALID_FROM_NOT_GAPLESS,
         message: `The predecessor has validUntil=${previous.validUntil.slice(0, 10)} \u2014 the successor must start seamlessly on the next day (${requiredStart.toISOString().slice(0, 10)}). Received: ${validFrom.toISOString().slice(0, 10)}.`,
         params: {
           received: validFrom.toISOString().slice(0, 10)
@@ -747,7 +833,7 @@ var BundlesService = class _BundlesService {
   parseRequiredBundleDate(input, field, code) {
     const date = new Date(input);
     if (Number.isNaN(date.getTime())) {
-      throw new UnprocessableEntityException({
+      throw new UnprocessableEntityException2({
         code,
         message: `${field} '${input}' is not a valid date`,
         // Keyed by the field name so these params match the publish
@@ -789,7 +875,7 @@ BundlesService = _ts_decorate([
 
 // src/catalog/marketing-projections.service.ts
 import { ConflictException, Inject as Inject2, Injectable as Injectable2, NotFoundException as NotFoundException2 } from "@nestjs/common";
-import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES2 } from "@saasicat/core";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES3 } from "@saasicat/core";
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -822,7 +908,7 @@ var MarketingProjectionsService = class {
     const row = await this.repo.findById(id);
     if (!row) {
       throw new NotFoundException2({
-        code: CATALOG_ERROR_CODES2.MARKETING_PROJECTION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES3.MARKETING_PROJECTION_NOT_FOUND,
         message: `MarketingProjection '${id}' not found`,
         params: {
           projectionId: id
@@ -836,7 +922,7 @@ var MarketingProjectionsService = class {
     const existing = await this.repo.findByTarget(data.targetType, data.targetVersionId, locale);
     if (existing) {
       throw new ConflictException({
-        code: CATALOG_ERROR_CODES2.MARKETING_PROJECTION_ALREADY_EXISTS,
+        code: CATALOG_ERROR_CODES3.MARKETING_PROJECTION_ALREADY_EXISTS,
         message: `Marketing projection for ${data.targetType}/${data.targetVersionId}/${locale} already exists \u2014 use PATCH to edit it`,
         params: {
           targetType: data.targetType,
@@ -854,7 +940,7 @@ var MarketingProjectionsService = class {
     const existing = await this.repo.findById(id);
     if (!existing) {
       throw new NotFoundException2({
-        code: CATALOG_ERROR_CODES2.MARKETING_PROJECTION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES3.MARKETING_PROJECTION_NOT_FOUND,
         message: `MarketingProjection '${id}' not found`,
         params: {
           projectionId: id
@@ -867,7 +953,7 @@ var MarketingProjectionsService = class {
     const existing = await this.repo.findById(id);
     if (!existing) {
       throw new NotFoundException2({
-        code: CATALOG_ERROR_CODES2.MARKETING_PROJECTION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES3.MARKETING_PROJECTION_NOT_FOUND,
         message: `MarketingProjection '${id}' not found`,
         params: {
           projectionId: id
@@ -909,8 +995,8 @@ function keyListSegment(name, keys) {
 __name(keyListSegment, "keyListSegment");
 
 // src/catalog/catalog-entries.service.ts
-import { Inject as Inject3, Injectable as Injectable3, Logger as Logger2, NotFoundException as NotFoundException3, Optional as Optional2, UnprocessableEntityException as UnprocessableEntityException2 } from "@nestjs/common";
-import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES3 } from "@saasicat/core";
+import { Inject as Inject3, Injectable as Injectable3, Logger as Logger2, NotFoundException as NotFoundException3, Optional as Optional2, UnprocessableEntityException as UnprocessableEntityException3 } from "@nestjs/common";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES4 } from "@saasicat/core";
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1009,21 +1095,18 @@ var CatalogEntriesService = class _CatalogEntriesService {
       this.logger.error(`Discovery auto-sync on boot failed (${snapshot.app.key}) \u2014 the catalog may be stale; re-sync manually via POST /admin/catalog/discovery/sync`, err instanceof Error ? err.stack : String(err));
     }
   }
-  listCapabilities(projectKey, codeStatus) {
+  listCapabilities(codeStatus) {
     return this.repo.listCapabilities({
-      projectKey,
       codeStatus
     });
   }
-  listFeatures(projectKey, discoveryStatus) {
+  listFeatures(discoveryStatus) {
     return this.repo.listFeatures({
-      projectKey,
       discoveryStatus
     });
   }
-  listQuotas(projectKey, discoveryStatus) {
+  listQuotas(discoveryStatus) {
     return this.repo.listQuotas({
-      projectKey,
       discoveryStatus
     });
   }
@@ -1033,38 +1116,36 @@ var CatalogEntriesService = class _CatalogEntriesService {
    * snapshot, `pending` (revoke/reactivate) deletes it, `outdated`/
    * `obsolete` keep the last approval as history.
    */
-  async reviewFeature(projectKey, featureKey, data, reviewedBy) {
-    const existing = await this.repo.findFeature(projectKey, featureKey);
+  async reviewFeature(featureKey, data, reviewedBy) {
+    const existing = await this.repo.findFeature(featureKey);
     if (!existing) {
       throw new NotFoundException3({
-        code: CATALOG_ERROR_CODES3.FEATURE_NOT_FOUND,
-        message: `Feature '${featureKey}' not found in project '${projectKey}'`,
+        code: CATALOG_ERROR_CODES4.FEATURE_NOT_FOUND,
+        message: `Feature '${featureKey}' not found`,
         params: {
-          featureKey,
-          projectKey
+          featureKey
         }
       });
     }
-    return this.repo.setFeatureReview(projectKey, featureKey, this.resolveReviewUpdate(existing, data.discoveryStatus, reviewedBy, (snapshot) => featureApprovalSignature(featureKey, snapshot)));
+    return this.repo.setFeatureReview(featureKey, this.resolveReviewUpdate(existing, data.discoveryStatus, reviewedBy, (snapshot) => featureApprovalSignature(featureKey, snapshot)));
   }
   /** Approval transition of a quota — same state machine as features (#20). */
-  async reviewQuota(projectKey, quotaKey, data, reviewedBy) {
-    const existing = await this.repo.findQuota(projectKey, quotaKey);
+  async reviewQuota(quotaKey, data, reviewedBy) {
+    const existing = await this.repo.findQuota(quotaKey);
     if (!existing) {
       throw new NotFoundException3({
-        code: CATALOG_ERROR_CODES3.QUOTA_NOT_FOUND,
-        message: `Quota '${quotaKey}' not found in project '${projectKey}'`,
+        code: CATALOG_ERROR_CODES4.QUOTA_NOT_FOUND,
+        message: `Quota '${quotaKey}' not found`,
         params: {
-          quotaKey,
-          projectKey
+          quotaKey
         }
       });
     }
-    return this.repo.setQuotaReview(projectKey, quotaKey, this.resolveReviewUpdate(existing, data.discoveryStatus, reviewedBy, (snapshot) => {
+    return this.repo.setQuotaReview(quotaKey, this.resolveReviewUpdate(existing, data.discoveryStatus, reviewedBy, (snapshot) => {
       const discovered = snapshot.quotas.find((q) => q.quotaKey === quotaKey);
       if (!discovered) {
-        throw new UnprocessableEntityException2({
-          code: CATALOG_ERROR_CODES3.QUOTA_NOT_IN_DISCOVERY_SNAPSHOT,
+        throw new UnprocessableEntityException3({
+          code: CATALOG_ERROR_CODES4.QUOTA_NOT_IN_DISCOVERY_SNAPSHOT,
           message: `Quota '${quotaKey}' is not in the discovery snapshot \u2014 a quota that is not declared in code cannot be approved`,
           params: {
             quotaKey
@@ -1076,8 +1157,8 @@ var CatalogEntriesService = class _CatalogEntriesService {
   }
   resolveReviewUpdate(existing, target, reviewedBy, signatureOf) {
     if (!REVIEW_TRANSITIONS[existing.discoveryStatus].includes(target)) {
-      throw new UnprocessableEntityException2({
-        code: CATALOG_ERROR_CODES3.DISCOVERY_STATUS_TRANSITION_INVALID,
+      throw new UnprocessableEntityException3({
+        code: CATALOG_ERROR_CODES4.DISCOVERY_STATUS_TRANSITION_INVALID,
         message: `Transition '${existing.discoveryStatus}' \u2192 '${target}' is not allowed`,
         params: {
           from: existing.discoveryStatus,
@@ -1088,8 +1169,8 @@ var CatalogEntriesService = class _CatalogEntriesService {
     if (target === "approved") {
       const snapshot = resolveDiscoverySnapshot(this.snapshot, this.scanner);
       if (!snapshot) {
-        throw new UnprocessableEntityException2({
-          code: CATALOG_ERROR_CODES3.DISCOVERY_NOT_INITIALIZED,
+        throw new UnprocessableEntityException3({
+          code: CATALOG_ERROR_CODES4.DISCOVERY_NOT_INITIALIZED,
           message: "Approval requires a discovery snapshot \u2014 discovery is not initialised (#25)"
         });
       }
@@ -1108,30 +1189,27 @@ var CatalogEntriesService = class _CatalogEntriesService {
       approvedSignature: keepApproval ? existing.approvedSignature : null
     };
   }
-  setFeatureI18n(projectKey, featureKey, i18n) {
-    return this.repo.setFeatureI18n(projectKey, featureKey, i18n);
+  setFeatureI18n(featureKey, i18n) {
+    return this.repo.setFeatureI18n(featureKey, i18n);
   }
-  setQuotaI18n(projectKey, quotaKey, i18n) {
-    return this.repo.setQuotaI18n(projectKey, quotaKey, i18n);
+  setQuotaI18n(quotaKey, i18n) {
+    return this.repo.setQuotaI18n(quotaKey, i18n);
   }
   /** Sets the editable default-locale label/description of a feature. */
-  setFeatureBase(projectKey, featureKey, data) {
-    return this.repo.setFeatureBase(projectKey, featureKey, data);
+  setFeatureBase(featureKey, data) {
+    return this.repo.setFeatureBase(featureKey, data);
   }
   /** Sets the editable default-locale label/description of a quota. */
-  setQuotaBase(projectKey, quotaKey, data) {
-    return this.repo.setQuotaBase(projectKey, quotaKey, data);
+  setQuotaBase(quotaKey, data) {
+    return this.repo.setQuotaBase(quotaKey, data);
   }
   /**
    * Synchronizes the catalog entries from a discovery snapshot.
    * Idempotent — can run against the same snapshot any number of times.
    */
   async syncFromSnapshot(snapshot) {
-    const projectKey = snapshot.app.key;
     const nowIso = (/* @__PURE__ */ new Date()).toISOString();
-    const existingCaps = await this.repo.listCapabilities({
-      projectKey
-    });
+    const existingCaps = await this.repo.listCapabilities({});
     const capByKey = new Map(existingCaps.map((c) => [
       c.capabilityKey,
       c
@@ -1144,7 +1222,6 @@ var CatalogEntriesService = class _CatalogEntriesService {
       const existing = capByKey.get(cap.capabilityKey);
       if (!existing || existing.codeStatus === "retired") capDiscovered++;
       await this.repo.upsertCapability({
-        projectKey,
         capabilityKey: cap.capabilityKey,
         label: cap.label ?? cap.capabilityKey,
         description: existing?.description ?? null,
@@ -1159,10 +1236,8 @@ var CatalogEntriesService = class _CatalogEntriesService {
         reason: cap.reason ?? existing?.reason ?? null
       });
     }
-    const capRetired = await this.repo.retireMissing(projectKey, "capability", presentCaps);
-    const existingFeatures = await this.repo.listFeatures({
-      projectKey
-    });
+    const capRetired = await this.repo.retireMissing("capability", presentCaps);
+    const existingFeatures = await this.repo.listFeatures({});
     const featureByKey = new Map(existingFeatures.map((f) => [
       f.featureKey,
       f
@@ -1181,7 +1256,6 @@ var CatalogEntriesService = class _CatalogEntriesService {
       const meta = this.featureUiRegistry?.[feature.featureKey];
       const hasCuratedLabel = existing != null && existing.label !== feature.featureKey;
       await this.repo.upsertFeature({
-        projectKey,
         featureKey: feature.featureKey,
         label: hasCuratedLabel ? existing.label : meta?.label ?? feature.featureKey,
         description: existing?.description ?? meta?.description ?? null,
@@ -1191,22 +1265,20 @@ var CatalogEntriesService = class _CatalogEntriesService {
         core: meta?.core ?? false
       });
       if (meta?.icon && !existing?.icon) {
-        await this.repo.setFeatureBase(projectKey, feature.featureKey, {
+        await this.repo.setFeatureBase(feature.featureKey, {
           icon: meta.icon
         });
       }
     }
-    const featureRetired = await this.repo.retireMissing(projectKey, "feature", presentFeatures);
-    const featureReplaced = await this.applySuccessorPointers("feature", projectKey, existingFeatures.map((f) => ({
+    const featureRetired = await this.repo.retireMissing("feature", presentFeatures);
+    const featureReplaced = await this.applySuccessorPointers("feature", existingFeatures.map((f) => ({
       key: f.featureKey,
       successorKey: f.successorKey
     })), new Set(presentFeatures), buildSuccessorIndex(snapshot.features.map((f) => ({
       key: f.featureKey,
       replaces: f.replaces
     }))));
-    const existingQuotas = await this.repo.listQuotas({
-      projectKey
-    });
+    const existingQuotas = await this.repo.listQuotas({});
     const quotaByKey = new Map(existingQuotas.map((q) => [
       q.quotaKey,
       q
@@ -1223,7 +1295,6 @@ var CatalogEntriesService = class _CatalogEntriesService {
         quotaOutdated++;
       }
       await this.repo.upsertQuota({
-        projectKey,
         quotaKey: quota.quotaKey,
         label: quota.label,
         description: existing?.description ?? null,
@@ -1235,8 +1306,8 @@ var CatalogEntriesService = class _CatalogEntriesService {
         replaces: quota.replaces ?? []
       });
     }
-    const quotaRetired = await this.repo.retireMissing(projectKey, "quota", presentQuotas);
-    const quotaReplaced = await this.applySuccessorPointers("quota", projectKey, existingQuotas.map((q) => ({
+    const quotaRetired = await this.repo.retireMissing("quota", presentQuotas);
+    const quotaReplaced = await this.applySuccessorPointers("quota", existingQuotas.map((q) => ({
       key: q.quotaKey,
       successorKey: q.successorKey
     })), new Set(presentQuotas), buildSuccessorIndex(snapshot.quotas.map((q) => ({
@@ -1273,7 +1344,7 @@ var CatalogEntriesService = class _CatalogEntriesService {
    * the code, an existing pointer is deleted. A missing key
    * without a claimant remains untouched (deleted without replacement).
    */
-  async applySuccessorPointers(type, projectKey, existing, presentKeys, claimantsByOldKey) {
+  async applySuccessorPointers(type, existing, presentKeys, claimantsByOldKey) {
     const changes = [];
     for (const entry of existing) {
       const current = entry.successorKey ?? null;
@@ -1302,7 +1373,7 @@ var CatalogEntriesService = class _CatalogEntriesService {
     }
     let replaced = 0;
     for (const change of changes) {
-      await setSuccessor(projectKey, change.key, change.successorKey);
+      await setSuccessor(change.key, change.successorKey);
       if (change.successorKey !== null) replaced++;
     }
     return replaced;
@@ -1330,7 +1401,7 @@ CatalogEntriesService = _ts_decorate3([
 ], CatalogEntriesService);
 
 // src/catalog/dto/catalog-entries.dto.ts
-import { IsIn, IsObject, IsOptional, IsString, Matches, MaxLength } from "class-validator";
+import { IsIn, IsObject, IsOptional, IsString, MaxLength } from "class-validator";
 function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1342,7 +1413,6 @@ function _ts_metadata4(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata4, "_ts_metadata");
-var PROJECT_KEY_PATTERN = /^[a-z][a-z0-9-]*$/;
 var REVIEW_STATUSES = [
   "pending",
   "approved",
@@ -1359,19 +1429,11 @@ var ListCatalogEntriesQueryDto = class {
   static {
     __name(this, "ListCatalogEntriesQueryDto");
   }
-  projectKey;
   /** Filter for features/quotas (approval lifecycle). */
   discoveryStatus;
   /** Filter for capabilities (read-only code facts). */
   codeStatus;
 };
-_ts_decorate4([
-  IsString(),
-  Matches(PROJECT_KEY_PATTERN, {
-    message: "projectKey must be kebab-case"
-  }),
-  _ts_metadata4("design:type", String)
-], ListCatalogEntriesQueryDto.prototype, "projectKey", void 0);
 _ts_decorate4([
   IsOptional(),
   IsString(),
@@ -1476,6 +1538,21 @@ function _ts_param4(paramIndex, decorator) {
 }
 __name(_ts_param4, "_ts_param");
 var DEFAULT_CONTEXT = "admin";
+function defaultActorFromRequest(req) {
+  const request = req;
+  const sid = request.headers?.["x-session-id"];
+  return {
+    userId: request.user?.sub ?? request.user?.id ?? "unknown",
+    email: request.user?.email ?? "unknown",
+    source: "web",
+    context: (Array.isArray(sid) ? sid[0] : sid) ?? DEFAULT_CONTEXT
+  };
+}
+__name(defaultActorFromRequest, "defaultActorFromRequest");
+function actorTagOf(actor) {
+  return `${actor.source}:${actor.email}:${actor.context}`;
+}
+__name(actorTagOf, "actorTagOf");
 var WebAuditLogger = class {
   static {
     __name(this, "WebAuditLogger");
@@ -1512,6 +1589,15 @@ var WebAuditLogger = class {
       context
     };
   }
+  /**
+   * The actor behind a request as the audit log writes it —
+   * `web:<email>:<context>` — for a column that records who did something.
+   * The same derivation as the log line, so the two never disagree about who
+   * it was.
+   */
+  actorTagFromRequest(req) {
+    return actorTagOf(this.buildActor(req));
+  }
   /**
    * Best-effort audit log from a web request. Writes nothing and never
    * throws when no AdminAuditService is injected; write errors are
@@ -1580,45 +1666,45 @@ function buildCatalogEntriesController(guards) {
       this.audit = audit;
     }
     listCapabilities(query) {
-      return this.service.listCapabilities(query.projectKey, query.codeStatus);
+      return this.service.listCapabilities(query.codeStatus);
     }
     listFeatures(query) {
-      return this.service.listFeatures(query.projectKey, query.discoveryStatus);
+      return this.service.listFeatures(query.discoveryStatus);
     }
     listQuotas(query) {
-      return this.service.listQuotas(query.projectKey, query.discoveryStatus);
+      return this.service.listQuotas(query.discoveryStatus);
     }
-    async reviewFeature(req, featureKey, projectKey, dto) {
-      const row = await this.service.reviewFeature(projectKey, featureKey, dto, this.audit?.resolveUserId(req) ?? null);
-      await this.audit?.logFromRequest(req, "CatalogFeatureEntry", `${projectKey}:${featureKey}`, "REVIEW_FEATURE", {
+    async reviewFeature(req, featureKey, dto) {
+      const row = await this.service.reviewFeature(featureKey, dto, this.audit?.resolveUserId(req) ?? null);
+      await this.audit?.logFromRequest(req, "CatalogFeatureEntry", featureKey, "REVIEW_FEATURE", {
         discoveryStatus: dto.discoveryStatus
       });
       return row;
     }
-    async reviewQuota(req, quotaKey, projectKey, dto) {
-      const row = await this.service.reviewQuota(projectKey, quotaKey, dto, this.audit?.resolveUserId(req) ?? null);
-      await this.audit?.logFromRequest(req, "CatalogQuotaEntry", `${projectKey}:${quotaKey}`, "REVIEW_QUOTA", {
+    async reviewQuota(req, quotaKey, dto) {
+      const row = await this.service.reviewQuota(quotaKey, dto, this.audit?.resolveUserId(req) ?? null);
+      await this.audit?.logFromRequest(req, "CatalogQuotaEntry", quotaKey, "REVIEW_QUOTA", {
         discoveryStatus: dto.discoveryStatus
       });
       return row;
     }
-    async setFeatureI18n(req, featureKey, projectKey, dto) {
-      const row = await this.service.setFeatureI18n(projectKey, featureKey, dto.i18n);
-      await this.audit?.logFromRequest(req, "CatalogFeatureEntry", `${projectKey}:${featureKey}`, "SET_FEATURE_I18N", {
+    async setFeatureI18n(req, featureKey, dto) {
+      const row = await this.service.setFeatureI18n(featureKey, dto.i18n);
+      await this.audit?.logFromRequest(req, "CatalogFeatureEntry", featureKey, "SET_FEATURE_I18N", {
         locales: Object.keys(dto.i18n ?? {})
       });
       return row;
     }
-    async setQuotaI18n(req, quotaKey, projectKey, dto) {
-      const row = await this.service.setQuotaI18n(projectKey, quotaKey, dto.i18n);
-      await this.audit?.logFromRequest(req, "CatalogQuotaEntry", `${projectKey}:${quotaKey}`, "SET_QUOTA_I18N", {
+    async setQuotaI18n(req, quotaKey, dto) {
+      const row = await this.service.setQuotaI18n(quotaKey, dto.i18n);
+      await this.audit?.logFromRequest(req, "CatalogQuotaEntry", quotaKey, "SET_QUOTA_I18N", {
         locales: Object.keys(dto.i18n ?? {})
       });
       return row;
     }
-    async setFeatureBase(req, featureKey, projectKey, dto) {
-      const row = await this.service.setFeatureBase(projectKey, featureKey, dto);
-      await this.audit?.logFromRequest(req, "CatalogFeatureEntry", `${projectKey}:${featureKey}`, "SET_FEATURE_BASE", {
+    async setFeatureBase(req, featureKey, dto) {
+      const row = await this.service.setFeatureBase(featureKey, dto);
+      await this.audit?.logFromRequest(req, "CatalogFeatureEntry", featureKey, "SET_FEATURE_BASE", {
         label: dto.label,
         description: dto.description,
         icon: dto.icon,
@@ -1626,9 +1712,9 @@ function buildCatalogEntriesController(guards) {
       });
       return row;
     }
-    async setQuotaBase(req, quotaKey, projectKey, dto) {
-      const row = await this.service.setQuotaBase(projectKey, quotaKey, dto);
-      await this.audit?.logFromRequest(req, "CatalogQuotaEntry", `${projectKey}:${quotaKey}`, "SET_QUOTA_BASE", {
+    async setQuotaBase(req, quotaKey, dto) {
+      const row = await this.service.setQuotaBase(quotaKey, dto);
+      await this.audit?.logFromRequest(req, "CatalogQuotaEntry", quotaKey, "SET_QUOTA_BASE", {
         label: dto.label,
         description: dto.description
       });
@@ -1676,13 +1762,11 @@ function buildCatalogEntriesController(guards) {
     Patch("features/:key/review"),
     _ts_param5(0, Req()),
     _ts_param5(1, Param("key")),
-    _ts_param5(2, Query("projectKey")),
-    _ts_param5(3, Body()),
+    _ts_param5(2, Body()),
     _ts_metadata6("design:type", Function),
     _ts_metadata6("design:paramtypes", [
       Object,
       String,
-      String,
       typeof ReviewCatalogEntryDto === "undefined" ? Object : ReviewCatalogEntryDto
     ]),
     _ts_metadata6("design:returntype", Promise)
@@ -1691,13 +1775,11 @@ function buildCatalogEntriesController(guards) {
     Patch("quotas/:key/review"),
     _ts_param5(0, Req()),
     _ts_param5(1, Param("key")),
-    _ts_param5(2, Query("projectKey")),
-    _ts_param5(3, Body()),
+    _ts_param5(2, Body()),
     _ts_metadata6("design:type", Function),
     _ts_metadata6("design:paramtypes", [
       Object,
       String,
-      String,
       typeof ReviewCatalogEntryDto === "undefined" ? Object : ReviewCatalogEntryDto
     ]),
     _ts_metadata6("design:returntype", Promise)
@@ -1706,13 +1788,11 @@ function buildCatalogEntriesController(guards) {
     Patch("features/:key/i18n"),
     _ts_param5(0, Req()),
     _ts_param5(1, Param("key")),
-    _ts_param5(2, Query("projectKey")),
-    _ts_param5(3, Body()),
+    _ts_param5(2, Body()),
     _ts_metadata6("design:type", Function),
     _ts_metadata6("design:paramtypes", [
       Object,
       String,
-      String,
       typeof UpdateCatalogEntryI18nDto === "undefined" ? Object : UpdateCatalogEntryI18nDto
     ]),
     _ts_metadata6("design:returntype", Promise)
@@ -1721,13 +1801,11 @@ function buildCatalogEntriesController(guards) {
     Patch("quotas/:key/i18n"),
     _ts_param5(0, Req()),
     _ts_param5(1, Param("key")),
-    _ts_param5(2, Query("projectKey")),
-    _ts_param5(3, Body()),
+    _ts_param5(2, Body()),
     _ts_metadata6("design:type", Function),
     _ts_metadata6("design:paramtypes", [
       Object,
       String,
-      String,
       typeof UpdateCatalogEntryI18nDto === "undefined" ? Object : UpdateCatalogEntryI18nDto
     ]),
     _ts_metadata6("design:returntype", Promise)
@@ -1736,13 +1814,11 @@ function buildCatalogEntriesController(guards) {
     Patch("features/:key"),
     _ts_param5(0, Req()),
     _ts_param5(1, Param("key")),
-    _ts_param5(2, Query("projectKey")),
-    _ts_param5(3, Body()),
+    _ts_param5(2, Body()),
     _ts_metadata6("design:type", Function),
     _ts_metadata6("design:paramtypes", [
       Object,
       String,
-      String,
       typeof UpdateCatalogEntryBaseDto === "undefined" ? Object : UpdateCatalogEntryBaseDto
     ]),
     _ts_metadata6("design:returntype", Promise)
@@ -1751,13 +1827,11 @@ function buildCatalogEntriesController(guards) {
     Patch("quotas/:key"),
     _ts_param5(0, Req()),
     _ts_param5(1, Param("key")),
-    _ts_param5(2, Query("projectKey")),
-    _ts_param5(3, Body()),
+    _ts_param5(2, Body()),
     _ts_metadata6("design:type", Function),
     _ts_metadata6("design:paramtypes", [
       Object,
       String,
-      String,
       typeof UpdateCatalogEntryBaseDto === "undefined" ? Object : UpdateCatalogEntryBaseDto
     ]),
     _ts_metadata6("design:returntype", Promise)
@@ -1791,7 +1865,47 @@ __name(buildCatalogEntriesController, "buildCatalogEntriesController");
 
 // src/catalog/promotions.service.ts
 import { Inject as Inject6, Injectable as Injectable5, NotFoundException as NotFoundException4 } from "@nestjs/common";
-import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES4 } from "@saasicat/core";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES6 } from "@saasicat/core";
+
+// src/catalog/promotion-value.ts
+import { UnprocessableEntityException as UnprocessableEntityException4 } from "@nestjs/common";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES5 } from "@saasicat/core";
+function assertPromotionValue(type, value) {
+  if (takesValue(type, value)) return;
+  throw new UnprocessableEntityException4({
+    code: CATALOG_ERROR_CODES5.PROMOTION_VALUE_INVALID,
+    message: `The value of a '${type}' promotion is not one its type takes: a percentage above 0 and at most 100, an amount above 0, an intro price of at least 0 for a whole number of months, or a whole number of free months.`,
+    params: {
+      type
+    }
+  });
+}
+__name(assertPromotionValue, "assertPromotionValue");
+function takesValue(type, value) {
+  switch (type) {
+    case "percent":
+      return isAmount(value) && value > 0 && value <= 100;
+    case "amount":
+      return isAmount(value) && value > 0;
+    case "intro":
+      return typeof value === "object" && value !== null && isAmount(value.price) && value.price >= 0 && isMonths(value.months);
+    case "freeMonths":
+      return isMonths(value);
+    default:
+      return false;
+  }
+}
+__name(takesValue, "takesValue");
+function isAmount(value) {
+  return typeof value === "number" && Number.isFinite(value);
+}
+__name(isAmount, "isAmount");
+function isMonths(value) {
+  return Number.isInteger(value) && value >= 1;
+}
+__name(isMonths, "isMonths");
+
+// src/catalog/promotions.service.ts
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1817,16 +1931,14 @@ var PromotionsService = class {
   constructor(repo) {
     this.repo = repo;
   }
-  list(projectKey) {
-    return this.repo.list({
-      projectKey
-    });
+  list() {
+    return this.repo.list();
   }
   async getById(id) {
     const row = await this.repo.findById(id);
     if (!row) {
       throw new NotFoundException4({
-        code: CATALOG_ERROR_CODES4.PROMOTION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES6.PROMOTION_NOT_FOUND,
         message: `Promotion '${id}' not found`,
         params: {
           promotionId: id
@@ -1835,27 +1947,29 @@ var PromotionsService = class {
     }
     return row;
   }
-  create(data) {
+  async create(data) {
+    assertPromotionValue(data.type, data.value);
     return this.repo.create(data);
   }
   async update(id, data) {
     const existing = await this.repo.findById(id);
     if (!existing) {
       throw new NotFoundException4({
-        code: CATALOG_ERROR_CODES4.PROMOTION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES6.PROMOTION_NOT_FOUND,
         message: `Promotion '${id}' not found`,
         params: {
           promotionId: id
         }
       });
     }
+    assertPromotionValue(data.type === void 0 ? existing.type : data.type, data.value === void 0 ? existing.value : data.value);
     return this.repo.update(id, data);
   }
   async delete(id) {
     const existing = await this.repo.findById(id);
     if (!existing) {
       throw new NotFoundException4({
-        code: CATALOG_ERROR_CODES4.PROMOTION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES6.PROMOTION_NOT_FOUND,
         message: `Promotion '${id}' not found`,
         params: {
           promotionId: id
@@ -1875,7 +1989,7 @@ PromotionsService = _ts_decorate7([
 ], PromotionsService);
 
 // src/catalog/dto/promotions.dto.ts
-import { IsArray, IsBoolean, IsDefined, IsIn as IsIn2, IsInt, IsObject as IsObject2, IsOptional as IsOptional2, IsString as IsString2, Matches as Matches2, MaxLength as MaxLength2 } from "class-validator";
+import { IsArray, IsBoolean, IsDefined, IsIn as IsIn2, IsInt, IsObject as IsObject2, IsOptional as IsOptional2, IsString as IsString2, Matches, MaxLength as MaxLength2 } from "class-validator";
 function _ts_decorate8(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1887,7 +2001,6 @@ function _ts_metadata8(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata8, "_ts_metadata");
-var PROJECT_KEY_PATTERN2 = /^[a-z][a-z0-9-]*$/;
 var ISO_DATE_PATTERN = /^\d{4}-\d{2}-\d{2}/;
 var TYPES = [
   "percent",
@@ -1905,24 +2018,10 @@ var TARGET_TYPES = [
   "BUNDLE",
   "OFFER"
 ];
-var ListPromotionsQueryDto = class {
-  static {
-    __name(this, "ListPromotionsQueryDto");
-  }
-  projectKey;
-};
-_ts_decorate8([
-  IsString2(),
-  Matches2(PROJECT_KEY_PATTERN2, {
-    message: "projectKey must be kebab-case"
-  }),
-  _ts_metadata8("design:type", String)
-], ListPromotionsQueryDto.prototype, "projectKey", void 0);
 var CreatePromotionDto = class {
   static {
     __name(this, "CreatePromotionDto");
   }
-  projectKey;
   internalLabel;
   type;
   /** Type-dependent: number | { price, months }. */
@@ -1939,12 +2038,6 @@ var CreatePromotionDto = class {
   color;
   i18n;
 };
-_ts_decorate8([
-  IsString2(),
-  Matches2(PROJECT_KEY_PATTERN2),
-  MaxLength2(64),
-  _ts_metadata8("design:type", String)
-], CreatePromotionDto.prototype, "projectKey", void 0);
 _ts_decorate8([
   IsString2(),
   MaxLength2(120),
@@ -1981,14 +2074,14 @@ _ts_decorate8([
 ], CreatePromotionDto.prototype, "billingCycle", void 0);
 _ts_decorate8([
   IsString2(),
-  Matches2(ISO_DATE_PATTERN, {
+  Matches(ISO_DATE_PATTERN, {
     message: "validFrom must be an ISO date"
   }),
   _ts_metadata8("design:type", String)
 ], CreatePromotionDto.prototype, "validFrom", void 0);
 _ts_decorate8([
   IsString2(),
-  Matches2(ISO_DATE_PATTERN, {
+  Matches(ISO_DATE_PATTERN, {
     message: "validTo must be an ISO date"
   }),
   _ts_metadata8("design:type", String)
@@ -2088,13 +2181,13 @@ _ts_decorate8([
 _ts_decorate8([
   IsOptional2(),
   IsString2(),
-  Matches2(ISO_DATE_PATTERN),
+  Matches(ISO_DATE_PATTERN),
   _ts_metadata8("design:type", String)
 ], UpdatePromotionDto.prototype, "validFrom", void 0);
 _ts_decorate8([
   IsOptional2(),
   IsString2(),
-  Matches2(ISO_DATE_PATTERN),
+  Matches(ISO_DATE_PATTERN),
   _ts_metadata8("design:type", String)
 ], UpdatePromotionDto.prototype, "validTo", void 0);
 _ts_decorate8([
@@ -2136,7 +2229,7 @@ _ts_decorate8([
 ], UpdatePromotionDto.prototype, "i18n", void 0);
 
 // src/catalog/promotions.controller.ts
-import { Body as Body2, Controller as Controller2, Delete, Get as Get2, HttpCode, HttpStatus, Inject as Inject7, Param as Param2, ParseUUIDPipe, Patch as Patch2, Post as Post2, Query as Query2, UseGuards as UseGuards2 } from "@nestjs/common";
+import { Body as Body2, Controller as Controller2, Delete, Get as Get2, HttpCode, HttpStatus, Inject as Inject7, Param as Param2, ParseUUIDPipe, Patch as Patch2, Post as Post2, UseGuards as UseGuards2 } from "@nestjs/common";
 function _ts_decorate9(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2163,8 +2256,8 @@ function buildPromotionsController(guards) {
     constructor(service) {
       this.service = service;
     }
-    list(query) {
-      return this.service.list(query.projectKey);
+    list() {
+      return this.service.list();
     }
     getById(id) {
       return this.service.getById(id);
@@ -2181,11 +2274,8 @@ function buildPromotionsController(guards) {
   };
   _ts_decorate9([
     Get2(),
-    _ts_param7(0, Query2()),
     _ts_metadata9("design:type", Function),
-    _ts_metadata9("design:paramtypes", [
-      typeof ListPromotionsQueryDto === "undefined" ? Object : ListPromotionsQueryDto
-    ]),
+    _ts_metadata9("design:paramtypes", []),
     _ts_metadata9("design:returntype", void 0)
   ], GeneratedPromotionsController.prototype, "list", null);
   _ts_decorate9([
@@ -2268,11 +2358,11 @@ var MarketingSettingsService = class {
     this.repo = repo;
   }
   /** Returns the stored config or `null` (in which case the full pool applies). */
-  get(projectKey) {
-    return this.repo.get(projectKey);
+  get() {
+    return this.repo.get();
   }
-  upsert(projectKey, data) {
-    return this.repo.upsert(projectKey, data);
+  upsert(data) {
+    return this.repo.upsert(data);
   }
 };
 MarketingSettingsService = _ts_decorate10([
@@ -2285,7 +2375,7 @@ MarketingSettingsService = _ts_decorate10([
 ], MarketingSettingsService);
 
 // src/catalog/dto/marketing-settings.dto.ts
-import { ArrayUnique, IsArray as IsArray2, IsString as IsString3, Matches as Matches3 } from "class-validator";
+import { ArrayUnique, IsArray as IsArray2, IsString as IsString3, Matches as Matches2 } from "class-validator";
 function _ts_decorate11(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2297,42 +2387,20 @@ function _ts_metadata11(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata11, "_ts_metadata");
-var PROJECT_KEY_PATTERN3 = /^[a-z][a-z0-9-]*$/;
 var LOCALE_PATTERN = /^[a-z]{2}(-[A-Z]{2})?$/;
-var ListMarketingSettingsQueryDto = class {
-  static {
-    __name(this, "ListMarketingSettingsQueryDto");
-  }
-  projectKey;
-};
-_ts_decorate11([
-  IsString3(),
-  Matches3(PROJECT_KEY_PATTERN3, {
-    message: "projectKey must be kebab-case"
-  }),
-  _ts_metadata11("design:type", String)
-], ListMarketingSettingsQueryDto.prototype, "projectKey", void 0);
 var UpdateMarketingSettingsDto = class {
   static {
     __name(this, "UpdateMarketingSettingsDto");
   }
-  projectKey;
   activeLocales;
 };
-_ts_decorate11([
-  IsString3(),
-  Matches3(PROJECT_KEY_PATTERN3, {
-    message: "projectKey must be kebab-case"
-  }),
-  _ts_metadata11("design:type", String)
-], UpdateMarketingSettingsDto.prototype, "projectKey", void 0);
 _ts_decorate11([
   IsArray2(),
   ArrayUnique(),
   IsString3({
     each: true
   }),
-  Matches3(LOCALE_PATTERN, {
+  Matches2(LOCALE_PATTERN, {
     each: true,
     message: "Locale must be ISO-639-1"
   }),
@@ -2340,7 +2408,7 @@ _ts_decorate11([
 ], UpdateMarketingSettingsDto.prototype, "activeLocales", void 0);
 
 // src/catalog/marketing-settings.controller.ts
-import { Body as Body3, Controller as Controller3, Get as Get3, Inject as Inject9, Put, Query as Query3, UseGuards as UseGuards3 } from "@nestjs/common";
+import { Body as Body3, Controller as Controller3, Get as Get3, Inject as Inject9, Put, UseGuards as UseGuards3 } from "@nestjs/common";
 function _ts_decorate12(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2368,22 +2436,19 @@ function buildMarketingSettingsController(guards) {
       this.service = service;
     }
     /** Returns the stored config or `null` (full pool active). */
-    get(query) {
-      return this.service.get(query.projectKey);
+    get() {
+      return this.service.get();
     }
     update(dto) {
-      return this.service.upsert(dto.projectKey, {
+      return this.service.upsert({
         activeLocales: dto.activeLocales
       });
     }
   };
   _ts_decorate12([
     Get3(),
-    _ts_param9(0, Query3()),
     _ts_metadata12("design:type", Function),
-    _ts_metadata12("design:paramtypes", [
-      typeof ListMarketingSettingsQueryDto === "undefined" ? Object : ListMarketingSettingsQueryDto
-    ]),
+    _ts_metadata12("design:paramtypes", []),
     _ts_metadata12("design:returntype", void 0)
   ], GeneratedMarketingSettingsController.prototype, "get", null);
   _ts_decorate12([
@@ -2410,7 +2475,7 @@ __name(buildMarketingSettingsController, "buildMarketingSettingsController");
 
 // src/catalog/public-marketing-catalog.service.ts
 import { Inject as Inject10, Injectable as Injectable7, Optional as Optional5 } from "@nestjs/common";
-import { applyPromo, buildFeatureRequiresIndex, collectUnsatisfiedRequires, pickActivePromo } from "@saasicat/core";
+import { buildFeatureRequiresIndex, collectUnsatisfiedRequires, promotionOnPrice, keepOneRecommended } from "@saasicat/core";
 function _ts_decorate13(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2444,14 +2509,30 @@ var PublicMarketingCatalogService = class {
   promotionRepo;
   catalogEntryRepo;
   bundleRepo;
-  constructor(planRepo, marketingRepo, promotionRepo, catalogEntryRepo = null, bundleRepo = null) {
+  newPaymentMethodsSource;
+  constructor(planRepo, marketingRepo, promotionRepo, catalogEntryRepo = null, bundleRepo = null, newPaymentMethodsSource) {
     this.planRepo = planRepo;
     this.marketingRepo = marketingRepo;
     this.promotionRepo = promotionRepo;
     this.catalogEntryRepo = catalogEntryRepo;
     this.bundleRepo = bundleRepo;
+    this.newPaymentMethodsSource = newPaymentMethodsSource;
   }
-  async getCatalog(projectKey, locale, currency, vatRate, asOf = /* @__PURE__ */ new Date()) {
+  /** What a new payment method is taken with here, for the page that offers the plans. */
+  newPaymentMethods() {
+    const account = this.newPaymentMethodsSource?.forNewPaymentMethods() ?? null;
+    if (!account) return {
+      taken: false,
+      methods: []
+    };
+    return {
+      taken: true,
+      methods: [
+        ...account.methods
+      ]
+    };
+  }
+  async getCatalog(locale, currency, vatRate, asOf = /* @__PURE__ */ new Date()) {
     const empty = {
       features: [],
       quotas: []
@@ -2460,10 +2541,10 @@ var PublicMarketingCatalogService = class {
     const findLatest = this.planRepo.findLatestLivePlanVersion?.bind(this.planRepo);
     if (!findActive && !findLatest) {
       return {
-        projectKey,
         locale,
         currency,
         vatRate,
+        newPaymentMethods: this.newPaymentMethods(),
         plans: [],
         bundles: [],
         comparison: empty
@@ -2471,21 +2552,20 @@ var PublicMarketingCatalogService = class {
     }
     const resolveVersion = findActive ? (planKey) => findActive(planKey, asOf) : (planKey) => findLatest(planKey);
     const [plans, promotions, labelMeta, marketedBundles] = await Promise.all([
-      this.planRepo.list({
-        projectKey
-      }),
-      this.promotionRepo.list({
-        projectKey
-      }),
-      this.loadLabelMeta(projectKey, locale),
-      this.loadMarketedBundles(projectKey)
+      this.planRepo.list({}),
+      this.promotionRepo.list(),
+      this.loadLabelMeta(locale),
+      this.loadMarketedBundles()
     ]);
     const out = [];
+    const inRequestedLocale = /* @__PURE__ */ new Set();
     for (const plan of plans) {
       const live = await resolveVersion(plan.planKey);
       if (!live) continue;
-      const marketing = await this.marketingRepo.findByTarget("PLAN", live.id, locale) ?? (locale === DEFAULT_LOCALE ? null : await this.marketingRepo.findByTarget("PLAN", live.id, DEFAULT_LOCALE));
+      const own = await this.marketingRepo.findByTarget("PLAN", live.id, locale);
+      const marketing = own ?? (locale === DEFAULT_LOCALE ? null : await this.marketingRepo.findByTarget("PLAN", live.id, DEFAULT_LOCALE));
       if (!marketing || marketing.visible === false) continue;
+      if (own) inRequestedLocale.add(plan.planKey);
       const monthlyNet = toNumber(live.monthlyNet);
       const yearlyNet = toNumber(live.yearlyNet);
       out.push({
@@ -2513,6 +2593,7 @@ var PublicMarketingCatalogService = class {
       });
     }
     out.sort((a, b) => b.priority - a.priority);
+    keepOneRecommended(out, inRequestedLocale);
     const requiresIndex = buildFeatureRequiresIndex([
       ...labelMeta.features
     ].map(([featureKey, meta]) => ({
@@ -2521,25 +2602,24 @@ var PublicMarketingCatalogService = class {
     })));
     const publicBundles = (await Promise.all(marketedBundles.map((bv) => this.toPublicBundle(bv, promotions, locale, asOf, requiresIndex, labelMeta)))).filter((bundle) => bundle !== null);
     return {
-      projectKey,
       locale,
       currency,
       vatRate,
+      newPaymentMethods: this.newPaymentMethods(),
       plans: out,
       bundles: publicBundles,
       comparison: this.buildComparison(out, labelMeta)
     };
   }
   /**
-   * Loads all published-and-live bundle versions for a project and
-   * filters on `marketed === true`. Without a registered
-   * `BundleRepository` (apps without the SuperAdmin bundle editor) the
-   * list is empty — the public catalog stays plan-only.
+   * Loads all published-and-live bundle versions and filters on
+   * `marketed === true`. Without a registered `BundleRepository` (apps
+   * without the SuperAdmin bundle editor) the list is empty — the public
+   * catalog stays plan-only.
    */
-  async loadMarketedBundles(projectKey) {
+  async loadMarketedBundles() {
     if (!this.bundleRepo) return [];
     const bundles = await this.bundleRepo.list({
-      projectKey,
       excludeDeleted: true
     });
     const out = [];
@@ -2607,7 +2687,7 @@ var PublicMarketingCatalogService = class {
     return labels;
   }
   /** Loads the translated feature/quota labels (+ sortOrder) for a locale. */
-  async loadLabelMeta(projectKey, locale) {
+  async loadLabelMeta(locale) {
     const features = /* @__PURE__ */ new Map();
     const quotas = /* @__PURE__ */ new Map();
     if (!this.catalogEntryRepo) return {
@@ -2615,12 +2695,8 @@ var PublicMarketingCatalogService = class {
       quotas
     };
     const [featureRows, quotaRows] = await Promise.all([
-      this.catalogEntryRepo.listFeatures({
-        projectKey
-      }),
-      this.catalogEntryRepo.listQuotas({
-        projectKey
-      })
+      this.catalogEntryRepo.listFeatures({}),
+      this.catalogEntryRepo.listQuotas({})
     ]);
     for (const f of featureRows) {
       features.set(f.featureKey, {
@@ -2711,20 +2787,18 @@ var PublicMarketingCatalogService = class {
     };
   }
   resolvePromo(promotions, targetKey, targetType, locale, monthlyNet, yearlyNet, asOf) {
-    const monthlyPromo = pickActivePromo(promotions, targetKey, locale, "monthly", asOf, targetType);
-    const yearlyPromo = pickActivePromo(promotions, targetKey, locale, "yearly", asOf, targetType);
-    const promo = monthlyPromo ?? yearlyPromo;
+    const monthly = promotionOnPrice(promotions, targetKey, locale, "monthly", monthlyNet, asOf, targetType);
+    const yearly = promotionOnPrice(promotions, targetKey, locale, "yearly", yearlyNet, asOf, targetType);
+    const promo = (monthly ?? yearly)?.promotion;
     if (!promo) return null;
-    const monthlyResult = applyPromo(monthlyPromo, monthlyNet);
-    const yearlyResult = applyPromo(yearlyPromo, yearlyNet);
     const i18n = promo.i18n?.[locale] ?? promo.i18n?.[DEFAULT_LOCALE] ?? {};
     return {
       type: promo.type,
       badge: i18n.badge ?? "",
       fineprint: i18n.fineprint ?? "",
       color: promo.color,
-      discountedMonthlyNet: monthlyResult ? monthlyResult.discounted : null,
-      discountedYearlyNet: yearlyResult ? yearlyResult.discounted : null
+      discountedMonthlyNet: monthly ? monthly.result.discounted : null,
+      discountedYearlyNet: yearly ? yearly.result.discounted : null
     };
   }
 };
@@ -2737,18 +2811,20 @@ PublicMarketingCatalogService = _ts_decorate13([
   _ts_param10(3, Inject10(CATALOG_ENTRY_REPOSITORY_TOKEN)),
   _ts_param10(4, Optional5()),
   _ts_param10(4, Inject10(BUNDLE_REPOSITORY_TOKEN)),
+  _ts_param10(5, Inject10(NEW_PAYMENT_METHODS_SOURCE_TOKEN)),
   _ts_metadata13("design:type", Function),
   _ts_metadata13("design:paramtypes", [
     typeof PlanRepository === "undefined" ? Object : PlanRepository,
     typeof MarketingProjectionRepository === "undefined" ? Object : MarketingProjectionRepository,
     typeof PromotionRepository === "undefined" ? Object : PromotionRepository,
     Object,
+    Object,
     Object
   ])
 ], PublicMarketingCatalogService);
 
 // src/catalog/public-marketing-catalog.controller.ts
-import { Controller as Controller4, Get as Get4, Inject as Inject11, Query as Query4, UseGuards as UseGuards4 } from "@nestjs/common";
+import { Controller as Controller4, Get as Get4, Inject as Inject11, Query as Query2, UseGuards as UseGuards4 } from "@nestjs/common";
 function _ts_decorate14(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2766,7 +2842,7 @@ function _ts_param11(paramIndex, decorator) {
   };
 }
 __name(_ts_param11, "_ts_param");
-function buildPublicMarketingCatalogController(guards, projectKey, currency, vatRate) {
+function buildPublicMarketingCatalogController(guards, currency, vatRate) {
   let GeneratedPublicMarketingCatalogController = class GeneratedPublicMarketingCatalogController {
     static {
       __name(this, "GeneratedPublicMarketingCatalogController");
@@ -2785,14 +2861,14 @@ function buildPublicMarketingCatalogController(guards, projectKey, currency, vat
     getCatalog(lang, localeParam, asOfParam) {
       const locale = lang || localeParam || "de";
       const asOf = parseAsOf(asOfParam);
-      return this.service.getCatalog(projectKey, locale, currency, vatRate, asOf);
+      return this.service.getCatalog(locale, currency, vatRate, asOf);
     }
   };
   _ts_decorate14([
     Get4(),
-    _ts_param11(0, Query4("lang")),
-    _ts_param11(1, Query4("locale")),
-    _ts_param11(2, Query4("asOf")),
+    _ts_param11(0, Query2("lang")),
+    _ts_param11(1, Query2("locale")),
+    _ts_param11(2, Query2("asOf")),
     _ts_metadata14("design:type", Function),
     _ts_metadata14("design:paramtypes", [
       String,
@@ -2822,8 +2898,8 @@ function parseAsOf(raw) {
 __name(parseAsOf, "parseAsOf");
 
 // src/catalog/plans.service.ts
-import { Inject as Inject12, Injectable as Injectable8, NotFoundException as NotFoundException5, Optional as Optional6, UnprocessableEntityException as UnprocessableEntityException3 } from "@nestjs/common";
-import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES5 } from "@saasicat/core";
+import { Inject as Inject12, Injectable as Injectable8, NotFoundException as NotFoundException5, Optional as Optional6, UnprocessableEntityException as UnprocessableEntityException5 } from "@nestjs/common";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES7 } from "@saasicat/core";
 function _ts_decorate15(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2858,12 +2934,11 @@ var PlansService = class {
    * `SubscriptionRepository` is registered or it does not implement
    * `countActiveByPlanKey`.
    */
-  async getTenantCounts(projectKey) {
-    return await this.subscriptions?.countActiveByPlanKey?.(projectKey) ?? {};
+  async getTenantCounts() {
+    return await this.subscriptions?.countActiveByPlanKey?.() ?? {};
   }
-  listPlans(projectKey, opts = {}) {
+  listPlans(opts = {}) {
     return this.repo.list({
-      projectKey,
       excludeDeleted: true,
       onlyPublished: opts.onlyPublished ?? false
     });
@@ -2872,7 +2947,7 @@ var PlansService = class {
     const plan = await this.repo.findById(planId);
     if (!plan) {
       throw new NotFoundException5({
-        code: CATALOG_ERROR_CODES5.PLAN_NOT_FOUND,
+        code: CATALOG_ERROR_CODES7.PLAN_NOT_FOUND,
         message: `Plan '${planId}' not found`,
         params: {
           planId
@@ -2882,14 +2957,13 @@ var PlansService = class {
     return plan;
   }
   async createPlan(data) {
-    const existing = await this.repo.findByKey(data.projectKey, data.planKey);
+    const existing = await this.repo.findByKey(data.planKey);
     if (existing) {
-      throw new UnprocessableEntityException3({
-        code: CATALOG_ERROR_CODES5.PLAN_ALREADY_EXISTS,
-        message: `Plan '${data.planKey}' already exists in project '${data.projectKey}'`,
+      throw new UnprocessableEntityException5({
+        code: CATALOG_ERROR_CODES7.PLAN_ALREADY_EXISTS,
+        message: `Plan '${data.planKey}' already exists`,
         params: {
-          planKey: data.planKey,
-          projectKey: data.projectKey
+          planKey: data.planKey
         }
       });
     }
@@ -2899,7 +2973,7 @@ var PlansService = class {
     const existing = await this.repo.findById(planId);
     if (!existing) {
       throw new NotFoundException5({
-        code: CATALOG_ERROR_CODES5.PLAN_NOT_FOUND,
+        code: CATALOG_ERROR_CODES7.PLAN_NOT_FOUND,
         message: `Plan '${planId}' not found`,
         params: {
           planId
@@ -2912,7 +2986,7 @@ var PlansService = class {
     const existing = await this.repo.findById(planId);
     if (!existing) {
       throw new NotFoundException5({
-        code: CATALOG_ERROR_CODES5.PLAN_NOT_FOUND,
+        code: CATALOG_ERROR_CODES7.PLAN_NOT_FOUND,
         message: `Plan '${planId}' not found`,
         params: {
           planId
@@ -2937,7 +3011,7 @@ var PlansService = class {
     const existing = await this.repo.findById(planId);
     if (!existing) {
       throw new NotFoundException5({
-        code: CATALOG_ERROR_CODES5.PLAN_NOT_FOUND,
+        code: CATALOG_ERROR_CODES7.PLAN_NOT_FOUND,
         message: `Plan '${planId}' not found`,
         params: {
           planId
@@ -2947,8 +3021,8 @@ var PlansService = class {
     await this.assertNoPublishedVersions(existing.planKey, "hard-delete");
     await this.assertNoDrafts(existing.planKey);
     if (typeof this.repo.hardDelete !== "function") {
-      throw new UnprocessableEntityException3({
-        code: CATALOG_ERROR_CODES5.PLAN_HARD_DELETE_NOT_IMPLEMENTED,
+      throw new UnprocessableEntityException5({
+        code: CATALOG_ERROR_CODES7.PLAN_HARD_DELETE_NOT_IMPLEMENTED,
         message: "Hard delete is not implemented in the current repository. Implement PlanRepository.hardDelete."
       });
     }
@@ -2968,8 +3042,8 @@ var PlansService = class {
     if (published.length === 0) return;
     const live = published.filter((v) => v.supersededAt === null).length;
     const superseded = published.length - live;
-    throw new UnprocessableEntityException3({
-      code: CATALOG_ERROR_CODES5.PLAN_HAS_PUBLISHED_VERSIONS,
+    throw new UnprocessableEntityException5({
+      code: CATALOG_ERROR_CODES7.PLAN_HAS_PUBLISHED_VERSIONS,
       message: `Plan '${planKey}' cannot be ${op === "hard-delete" ? "deleted" : "archived"} \u2014 it has ${published.length} published version(s) (${live} live, ${superseded} superseded). Existing subscriptions reference those versions (contract protection P1), so the plan record must be preserved.`,
       params: {
         planKey,
@@ -2985,8 +3059,8 @@ var PlansService = class {
     const versions = await this.repo.listVersions(planKey);
     const drafts = versions.filter((v) => v.publishedAt === null);
     if (drafts.length === 0) return;
-    throw new UnprocessableEntityException3({
-      code: CATALOG_ERROR_CODES5.PLAN_HAS_DRAFTS,
+    throw new UnprocessableEntityException5({
+      code: CATALOG_ERROR_CODES7.PLAN_HAS_DRAFTS,
       message: `Plan '${planKey}' still has ${drafts.length} open draft version(s). Discard them first (DELETE /admin/catalog/plan-versions/:id) or publish them.`,
       params: {
         planKey
@@ -3008,8 +3082,8 @@ PlansService = _ts_decorate15([
 ], PlansService);
 
 // src/catalog/plan-versions.service.ts
-import { Inject as Inject13, Injectable as Injectable9, Logger as Logger3, NotFoundException as NotFoundException6, Optional as Optional7, UnprocessableEntityException as UnprocessableEntityException4 } from "@nestjs/common";
-import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES6, isVersionEditable as isVersionEditable2 } from "@saasicat/core";
+import { Inject as Inject13, Injectable as Injectable9, Logger as Logger3, NotFoundException as NotFoundException6, Optional as Optional7, UnprocessableEntityException as UnprocessableEntityException6 } from "@nestjs/common";
+import { CATALOG_ERROR_CODES as CATALOG_ERROR_CODES8, isVersionEditable as isVersionEditable2 } from "@saasicat/core";
 function _ts_decorate16(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -3079,7 +3153,7 @@ var PlanVersionsService = class _PlanVersionsService {
     const existing = await this.repo.findVersionById(versionId);
     if (!existing) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_FOUND,
         message: `PlanVersion '${versionId}' not found`,
         params: {
           versionId
@@ -3087,8 +3161,8 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (existing.publishedAt !== null) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_ALREADY_PUBLISHED,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_ALREADY_PUBLISHED,
         message: `PlanVersion '${versionId}' is already published and cannot be discarded.`,
         params: {
           versionId
@@ -3096,8 +3170,8 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (typeof this.repo.deletePlanVersionDraft !== "function") {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_DISCARD_NOT_IMPLEMENTED,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_DISCARD_NOT_IMPLEMENTED,
         message: "Discard is not implemented in the current repository. Implement PlanRepository.deletePlanVersionDraft."
       });
     }
@@ -3112,7 +3186,7 @@ var PlanVersionsService = class _PlanVersionsService {
     const plan = await this.repo.findById(planUuid);
     if (!plan) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_NOT_FOUND,
         message: `Plan '${planUuid}' not found`,
         params: {
           planId: planUuid
@@ -3126,7 +3200,7 @@ var PlanVersionsService = class _PlanVersionsService {
     const version = await this.repo.findVersionById(versionId);
     if (!version) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_FOUND,
         message: `PlanVersion '${versionId}' not found`,
         params: {
           versionId
@@ -3168,9 +3242,9 @@ var PlanVersionsService = class _PlanVersionsService {
    */
   async createPlanDraft(data) {
     const plan = await this.repo.findById(data.planId);
-    if (!plan) {
+    if (!plan || plan.deletedAt !== null) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_NOT_FOUND,
         message: `Plan '${data.planId}' not found`,
         params: {
           planId: data.planId
@@ -3180,8 +3254,8 @@ var PlanVersionsService = class _PlanVersionsService {
     const planKey = plan.planKey;
     const existingDraft = await this.repo.findCurrentDraft(planKey);
     if (existingDraft) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_DRAFT_ALREADY_EXISTS,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_DRAFT_ALREADY_EXISTS,
         message: `Plan '${planKey}' already has a draft version v${existingDraft.version}; publish or discard it first`,
         params: {
           planKey,
@@ -3213,7 +3287,7 @@ var PlanVersionsService = class _PlanVersionsService {
     const existing = await this.repo.findVersionById(versionId);
     if (!existing) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_FOUND,
         message: `PlanVersion '${versionId}' not found`,
         params: {
           versionId
@@ -3225,8 +3299,8 @@ var PlanVersionsService = class _PlanVersionsService {
     ]);
     const { editable } = isVersionEditable2(annotated);
     if (!editable) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_EDITABLE,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_EDITABLE,
         message: `PlanVersion '${versionId}' is not editable. Only drafts and published versions are editable that are latest-in-chain, bind no subscription yet, and whose validFrom lies in the future.`,
         params: {
           versionId
@@ -3249,7 +3323,7 @@ var PlanVersionsService = class _PlanVersionsService {
     const draft = await this.repo.findVersionById(versionId);
     if (!draft) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_FOUND,
         message: `PlanVersion '${versionId}' not found`,
         params: {
           versionId
@@ -3257,14 +3331,24 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (draft.publishedAt !== null) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_ALREADY_PUBLISHED,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_ALREADY_PUBLISHED,
         message: `PlanVersion '${versionId}' is already published`,
         params: {
           versionId
         }
       });
     }
+    const plan = await this.repo.findByKey(draft.planId);
+    if (!plan || plan.deletedAt !== null) {
+      throw new NotFoundException6({
+        code: CATALOG_ERROR_CODES8.PLAN_NOT_FOUND,
+        message: `Plan '${draft.planId}' not found`,
+        params: {
+          planId: draft.planId
+        }
+      });
+    }
     const warnings = await this.runStrictCheck({
       features: draft.features,
       quotas: draft.quotas ?? {}
@@ -3274,8 +3358,8 @@ var PlanVersionsService = class _PlanVersionsService {
       const monthly = Number.parseFloat(String(draft.monthlyNet ?? "0"));
       const yearly = Number.parseFloat(String(draft.yearlyNet ?? "0"));
       if (monthly <= 0 || yearly <= 0) {
-        throw new UnprocessableEntityException4({
-          code: CATALOG_ERROR_CODES6.PLAN_VERSION_ZERO_PRICE,
+        throw new UnprocessableEntityException6({
+          code: CATALOG_ERROR_CODES8.PLAN_VERSION_ZERO_PRICE,
           message: "A plan version cannot be published with a price of 0.00 (guard against seed placeholder). For deliberately free special contracts, set allowZeroPrice.",
           monthlyNet: String(draft.monthlyNet),
           yearlyNet: String(draft.yearlyNet)
@@ -3283,78 +3367,10 @@ var PlanVersionsService = class _PlanVersionsService {
       }
     }
     const previous = await this.repo.findLatestLivePlanVersion(draft.planId);
-    const validFromInput = publishMeta.validFrom ?? draft.validFrom;
-    if (!validFromInput) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_VALID_FROM_REQUIRED,
-        message: "validFrom must be set when publishing (on the draft or the publish call).."
-      });
-    }
-    const validFrom = new Date(validFromInput);
-    if (Number.isNaN(validFrom.getTime())) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_VALID_FROM_INVALID,
-        message: `validFrom '${validFromInput}' is not a valid date`,
-        params: {
-          validFrom: validFromInput
-        }
-      });
-    }
-    if (previous?.validFrom) {
-      const prevFrom = new Date(previous.validFrom);
-      if (validFrom <= prevFrom) {
-        throw new UnprocessableEntityException4({
-          code: CATALOG_ERROR_CODES6.PLAN_VERSION_VALID_FROM_NOT_AFTER_PREVIOUS,
-          message: `validFrom (${validFrom.toISOString()}) must be strictly after the validFrom of the previous version (${previous.validFrom}).`,
-          params: {
-            validFrom: validFrom.toISOString(),
-            previousValidFrom: previous.validFrom
-          }
-        });
-      }
-      if (previous.validUntil) {
-        const prevUntil = new Date(previous.validUntil);
-        const dayMs = 24 * 60 * 60 * 1e3;
-        const requiredStart = new Date(prevUntil.getTime() + dayMs);
-        if (validFrom.getTime() !== requiredStart.getTime()) {
-          throw new UnprocessableEntityException4({
-            code: CATALOG_ERROR_CODES6.PLAN_VERSION_VALID_FROM_NOT_GAPLESS,
-            message: `The predecessor has validUntil=${previous.validUntil.slice(0, 10)} \u2014 the successor must start seamlessly on the next day (${requiredStart.toISOString().slice(0, 10)}). Received: ${validFrom.toISOString().slice(0, 10)}.`,
-            params: {
-              received: validFrom.toISOString().slice(0, 10)
-            },
-            requiredValidFrom: requiredStart.toISOString().slice(0, 10),
-            previousValidUntil: previous.validUntil
-          });
-        }
-      }
-    }
-    const validUntilInput = publishMeta.validUntil !== void 0 ? publishMeta.validUntil : draft.validUntil;
-    const validUntil = validUntilInput ? new Date(validUntilInput) : null;
-    if (validUntil && Number.isNaN(validUntil.getTime())) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_VALID_UNTIL_INVALID,
-        message: `validUntil '${validUntilInput}' is not a valid date`,
-        params: {
-          validUntil: validUntilInput
-        }
-      });
-    }
-    if (validUntil && validUntil <= validFrom) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_VALID_UNTIL_BEFORE_FROM,
-        message: `validUntil (${validUntil.toISOString()}) must be strictly after validFrom (${validFrom.toISOString()}).`,
-        params: {
-          validUntil: validUntil.toISOString(),
-          validFrom: validFrom.toISOString()
-        }
-      });
-    }
+    const { validFrom, validUntil } = resolveValidityWindow(publishMeta, draft, previous, PLAN_VERSION_WINDOW_CODES);
     const fieldsFor = /* @__PURE__ */ __name((v) => ({
       features: v.features,
-      maxUsers: v.quotas?.["users"] ?? 0,
-      maxVehicles: v.quotas?.["vehicles"] ?? 0,
-      maxStorageGb: v.quotas?.["storageGb"] ?? 0,
+      quotas: v.quotas ?? {},
       monthlyNet: v.monthlyNet,
       yearlyNet: v.yearlyNet
     }), "fieldsFor");
@@ -3363,8 +3379,8 @@ var PlanVersionsService = class _PlanVersionsService {
       nonRegressive: true
     };
     if (!diff.nonRegressive && !publishMeta.forceRegressive) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_REGRESSION,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_REGRESSION,
         message: "This plan version is regressive (feature removed / quota lowered / price raised). Publishing requires an explicit `forceRegressive: true` (UI confirmation dialog with MFA).",
         changes: diff.changes
       });
@@ -3401,7 +3417,7 @@ var PlanVersionsService = class _PlanVersionsService {
     const existing = await this.repo.findVersionById(versionId);
     if (!existing) {
       throw new NotFoundException6({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_FOUND,
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_FOUND,
         message: `PlanVersion '${versionId}' not found`,
         params: {
           versionId
@@ -3409,8 +3425,8 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (existing.publishedAt === null) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_NOT_PUBLISHED,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_NOT_PUBLISHED,
         message: `PlanVersion '${versionId}' is not published and cannot be terminated.`,
         params: {
           versionId
@@ -3418,8 +3434,8 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (existing.supersededAt !== null) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_VERSION_SUPERSEDED,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_VERSION_SUPERSEDED,
         message: `PlanVersion '${versionId}' has already been superseded by a newer version (supersededAt) and cannot be terminated.`,
         params: {
           versionId
@@ -3427,14 +3443,14 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (Number.isNaN(endsAt.getTime())) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_TERMINATE_INVALID_DATE,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_TERMINATE_INVALID_DATE,
         message: "endsAt is not a valid date."
       });
     }
     if (endsAt.getTime() <= Date.now()) {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_TERMINATE_DATE_NOT_FUTURE,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_TERMINATE_DATE_NOT_FUTURE,
         message: `endsAt (${endsAt.toISOString()}) must lie strictly in the future.`,
         params: {
           endsAt: endsAt.toISOString()
@@ -3442,8 +3458,8 @@ var PlanVersionsService = class _PlanVersionsService {
       });
     }
     if (typeof this.repo.terminate !== "function") {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.PLAN_TERMINATE_NOT_IMPLEMENTED,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.PLAN_TERMINATE_NOT_IMPLEMENTED,
         message: "Terminate is not implemented in the current repository. Implement PlanRepository.terminate."
       });
     }
@@ -3455,14 +3471,14 @@ var PlanVersionsService = class _PlanVersionsService {
   async runStrictCheck(draft) {
     const snapshot = resolveDiscoverySnapshot(this.snapshot, this.scanner);
     if (!snapshot) return [];
-    const approved = await loadApprovedCatalogKeys(this.catalogEntries, snapshot.app.key);
+    const approved = await loadApprovedCatalogKeys(this.catalogEntries);
     return validatePlanDraft(draft, snapshot, this.marketedOnly, approved);
   }
   gateOrPass(warnings) {
     if (blockingStrictModeWarnings(warnings).length === 0) return;
     if (this.mode === "blocking") {
-      throw new UnprocessableEntityException4({
-        code: CATALOG_ERROR_CODES6.STRICT_MODE_VIOLATIONS,
+      throw new UnprocessableEntityException6({
+        code: CATALOG_ERROR_CODES8.STRICT_MODE_VIOLATIONS,
         message: "The strict-mode check found drift against the discovery snapshot.",
         warnings
       });
@@ -3494,7 +3510,49 @@ PlanVersionsService = _ts_decorate16([
 ], PlanVersionsService);
 
 // src/catalog/dto/bundles.dto.ts
-import { IsArray as IsArray3, IsBoolean as IsBoolean2, IsInt as IsInt2, IsNumberString, IsObject as IsObject3, IsOptional as IsOptional3, IsString as IsString4, IsUUID, Matches as Matches4, Max, MaxLength as MaxLength3, Min, MinLength, ValidateIf } from "class-validator";
+import { Type } from "class-transformer";
+import { IsArray as IsArray3, IsBoolean as IsBoolean2, IsInt as IsInt2, IsNumberString, IsObject as IsObject3, IsOptional as IsOptional3, IsString as IsString4, IsUUID, Matches as Matches3, Max, MaxLength as MaxLength3, Min, MinLength, ValidateIf, ValidateNested } from "class-validator";
+
+// src/catalog/dto/quota-record.validator.ts
+import { registerDecorator } from "class-validator";
+function isQuotaValue(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= -1;
+}
+__name(isQuotaValue, "isQuotaValue");
+function offendingQuotaKeys(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return [];
+  return Object.entries(value).filter(([, quota]) => !isQuotaValue(quota)).map(([key]) => key).sort();
+}
+__name(offendingQuotaKeys, "offendingQuotaKeys");
+function IsQuotaRecord(options) {
+  return /* @__PURE__ */ __name(function register(target, propertyName) {
+    registerDecorator({
+      name: "isQuotaRecord",
+      target: target.constructor,
+      propertyName,
+      options,
+      validator: {
+        validate(value) {
+          if (typeof value !== "object" || value === null || Array.isArray(value)) {
+            return false;
+          }
+          return offendingQuotaKeys(value).length === 0;
+        },
+        defaultMessage(args) {
+          const bad = offendingQuotaKeys(args.value);
+          if (bad.length === 0) {
+            return `${args.property} must be an object of quota keys to integers`;
+          }
+          return `${args.property} must map every key to an integer of at least -1 (-1 = unlimited); not a number: ${bad.join(", ")}`;
+        }
+      }
+    });
+  }, "register");
+}
+__name(IsQuotaRecord, "IsQuotaRecord");
+
+// src/catalog/dto/bundles.dto.ts
+import { applyDecorators } from "@nestjs/common";
 function _ts_decorate17(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -3506,16 +3564,30 @@ function _ts_metadata17(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata17, "_ts_metadata");
+var IsBoundedText = /* @__PURE__ */ __name((max) => applyDecorators(IsString4(), MaxLength3(max)), "IsBoundedText");
+var IsFeatureKeyList = /* @__PURE__ */ __name(() => applyDecorators(IsArray3(), IsString4({
+  each: true
+}), Matches3(FEATURE_KEY_PATTERN, {
+  each: true,
+  message: "features entries must be SCREAMING_SNAKE_CASE"
+})), "IsFeatureKeyList");
+var IsDecimalAmountOrNull = /* @__PURE__ */ __name((field) => applyDecorators(ValidateIf((_o, value) => value !== null), IsNumberString({
+  no_symbols: false
+}), Matches3(DECIMAL_PATTERN, {
+  message: `${field} must be a decimal with at most 2 fraction digits (e.g. "9.90")`
+})), "IsDecimalAmountOrNull");
+var IsIsoDateOrNull = /* @__PURE__ */ __name((field) => applyDecorators(ValidateIf((_o, value) => value !== null), Matches3(ISO_DATE_PATTERN2, {
+  message: `${field} must be an ISO date (YYYY-MM-DD)`
+})), "IsIsoDateOrNull");
+var IsSortOrder = /* @__PURE__ */ __name(() => applyDecorators(IsInt2(), Min(0), Max(1e4)), "IsSortOrder");
 var KEY_PATTERN = /^[A-Z][A-Z0-9_]*$/;
 var FEATURE_KEY_PATTERN = /^[A-Z][A-Z0-9_]*$/;
-var PROJECT_KEY_PATTERN4 = /^[a-z][a-z0-9-]*$/;
 var DECIMAL_PATTERN = /^\d+(\.\d{1,2})?$/;
 var ISO_DATE_PATTERN2 = /^\d{4}-\d{2}-\d{2}(T.*)?$/;
 var CreateBundleDto = class {
   static {
     __name(this, "CreateBundleDto");
   }
-  projectKey;
   bundleKey;
   label;
   description;
@@ -3526,15 +3598,7 @@ var CreateBundleDto = class {
 };
 _ts_decorate17([
   IsString4(),
-  Matches4(PROJECT_KEY_PATTERN4, {
-    message: 'projectKey must be kebab-case (e.g. "my-app")'
-  }),
-  MaxLength3(64),
-  _ts_metadata17("design:type", String)
-], CreateBundleDto.prototype, "projectKey", void 0);
-_ts_decorate17([
-  IsString4(),
-  Matches4(KEY_PATTERN, {
+  Matches3(KEY_PATTERN, {
     message: 'bundleKey must be SCREAMING_SNAKE_CASE (e.g. "BANKING")'
   }),
   MaxLength3(64),
@@ -3548,21 +3612,17 @@ _ts_decorate17([
 ], CreateBundleDto.prototype, "label", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsString4(),
-  MaxLength3(2e3),
+  IsBoundedText(2e3),
   _ts_metadata17("design:type", String)
 ], CreateBundleDto.prototype, "description", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsString4(),
-  MaxLength3(64),
+  IsBoundedText(64),
   _ts_metadata17("design:type", String)
 ], CreateBundleDto.prototype, "icon", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsInt2(),
-  Min(0),
-  Max(1e4),
+  IsSortOrder(),
   _ts_metadata17("design:type", Number)
 ], CreateBundleDto.prototype, "sortOrder", void 0);
 _ts_decorate17([
@@ -3590,21 +3650,17 @@ _ts_decorate17([
 ], UpdateBundleDto.prototype, "label", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsString4(),
-  MaxLength3(2e3),
+  IsBoundedText(2e3),
   _ts_metadata17("design:type", Object)
 ], UpdateBundleDto.prototype, "description", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsString4(),
-  MaxLength3(64),
+  IsBoundedText(64),
   _ts_metadata17("design:type", Object)
 ], UpdateBundleDto.prototype, "icon", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsInt2(),
-  Min(0),
-  Max(1e4),
+  IsSortOrder(),
   _ts_metadata17("design:type", Number)
 ], UpdateBundleDto.prototype, "sortOrder", void 0);
 _ts_decorate17([
@@ -3612,107 +3668,33 @@ _ts_decorate17([
   IsObject3(),
   _ts_metadata17("design:type", typeof Record === "undefined" ? Object : Record)
 ], UpdateBundleDto.prototype, "i18n", void 0);
-var CreateBundleVersionDraftDto = class {
+var BundlePricingOverrideDto = class {
   static {
-    __name(this, "CreateBundleVersionDraftDto");
+    __name(this, "BundlePricingOverrideDto");
   }
-  features;
-  quotas;
-  compatibility;
-  pricingOverrides;
+  planId;
   monthlyNet;
   yearlyNet;
-  marketed;
-  changeNote;
-  baseVersionId;
-  validFrom;
-  validUntil;
 };
-_ts_decorate17([
-  IsArray3(),
-  IsString4({
-    each: true
-  }),
-  Matches4(FEATURE_KEY_PATTERN, {
-    each: true,
-    message: "features entries must be SCREAMING_SNAKE_CASE"
-  }),
-  _ts_metadata17("design:type", Array)
-], CreateBundleVersionDraftDto.prototype, "features", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  IsObject3(),
-  _ts_metadata17("design:type", typeof Record === "undefined" ? Object : Record)
-], CreateBundleVersionDraftDto.prototype, "quotas", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  IsObject3(),
-  _ts_metadata17("design:type", Object)
-], CreateBundleVersionDraftDto.prototype, "compatibility", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  IsArray3(),
-  _ts_metadata17("design:type", typeof Array === "undefined" ? Object : Array)
-], CreateBundleVersionDraftDto.prototype, "pricingOverrides", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  IsNumberString({
-    no_symbols: false
-  }),
-  Matches4(DECIMAL_PATTERN, {
-    message: 'monthlyNet must be a decimal with at most 2 fraction digits (e.g. "9.90")'
-  }),
-  _ts_metadata17("design:type", Object)
-], CreateBundleVersionDraftDto.prototype, "monthlyNet", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  IsNumberString({
-    no_symbols: false
-  }),
-  Matches4(DECIMAL_PATTERN, {
-    message: "yearlyNet must be a decimal with at most 2 fraction digits"
-  }),
-  _ts_metadata17("design:type", Object)
-], CreateBundleVersionDraftDto.prototype, "yearlyNet", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  IsBoolean2(),
-  _ts_metadata17("design:type", Boolean)
-], CreateBundleVersionDraftDto.prototype, "marketed", void 0);
 _ts_decorate17([
   IsOptional3(),
   IsString4(),
-  MaxLength3(2e3),
   _ts_metadata17("design:type", String)
-], CreateBundleVersionDraftDto.prototype, "changeNote", void 0);
-_ts_decorate17([
-  IsOptional3(),
-  IsUUID(),
-  _ts_metadata17("design:type", Object)
-], CreateBundleVersionDraftDto.prototype, "baseVersionId", void 0);
+], BundlePricingOverrideDto.prototype, "planId", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(ISO_DATE_PATTERN2, {
-    message: "validFrom must be an ISO date (YYYY-MM-DD)"
-  }),
+  IsDecimalAmountOrNull("pricingOverrides.monthlyNet"),
   _ts_metadata17("design:type", Object)
-], CreateBundleVersionDraftDto.prototype, "validFrom", void 0);
+], BundlePricingOverrideDto.prototype, "monthlyNet", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(ISO_DATE_PATTERN2, {
-    message: "validUntil must be an ISO date (YYYY-MM-DD)"
-  }),
+  IsDecimalAmountOrNull("pricingOverrides.yearlyNet"),
   _ts_metadata17("design:type", Object)
-], CreateBundleVersionDraftDto.prototype, "validUntil", void 0);
-var UpdateBundleVersionDraftDto = class {
+], BundlePricingOverrideDto.prototype, "yearlyNet", void 0);
+var BundleVersionDraftFieldsDto = class {
   static {
-    __name(this, "UpdateBundleVersionDraftDto");
+    __name(this, "BundleVersionDraftFieldsDto");
   }
-  features;
   quotas;
   compatibility;
   pricingOverrides;
@@ -3720,74 +3702,86 @@ var UpdateBundleVersionDraftDto = class {
   yearlyNet;
   marketed;
   changeNote;
+  baseVersionId;
   validFrom;
   validUntil;
 };
-_ts_decorate17([
-  IsOptional3(),
-  IsArray3(),
-  IsString4({
-    each: true
-  }),
-  Matches4(FEATURE_KEY_PATTERN, {
-    each: true
-  }),
-  _ts_metadata17("design:type", Array)
-], UpdateBundleVersionDraftDto.prototype, "features", void 0);
 _ts_decorate17([
   IsOptional3(),
   IsObject3(),
+  IsQuotaRecord(),
   _ts_metadata17("design:type", typeof Record === "undefined" ? Object : Record)
-], UpdateBundleVersionDraftDto.prototype, "quotas", void 0);
+], BundleVersionDraftFieldsDto.prototype, "quotas", void 0);
 _ts_decorate17([
   IsOptional3(),
   IsObject3(),
   _ts_metadata17("design:type", Object)
-], UpdateBundleVersionDraftDto.prototype, "compatibility", void 0);
+], BundleVersionDraftFieldsDto.prototype, "compatibility", void 0);
 _ts_decorate17([
   IsOptional3(),
   IsArray3(),
-  _ts_metadata17("design:type", typeof Array === "undefined" ? Object : Array)
-], UpdateBundleVersionDraftDto.prototype, "pricingOverrides", void 0);
+  ValidateNested({
+    each: true
+  }),
+  Type(() => BundlePricingOverrideDto),
+  _ts_metadata17("design:type", Array)
+], BundleVersionDraftFieldsDto.prototype, "pricingOverrides", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(DECIMAL_PATTERN),
+  IsDecimalAmountOrNull("monthlyNet"),
   _ts_metadata17("design:type", Object)
-], UpdateBundleVersionDraftDto.prototype, "monthlyNet", void 0);
+], BundleVersionDraftFieldsDto.prototype, "monthlyNet", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(DECIMAL_PATTERN),
+  IsDecimalAmountOrNull("yearlyNet"),
   _ts_metadata17("design:type", Object)
-], UpdateBundleVersionDraftDto.prototype, "yearlyNet", void 0);
+], BundleVersionDraftFieldsDto.prototype, "yearlyNet", void 0);
 _ts_decorate17([
   IsOptional3(),
   IsBoolean2(),
   _ts_metadata17("design:type", Boolean)
-], UpdateBundleVersionDraftDto.prototype, "marketed", void 0);
+], BundleVersionDraftFieldsDto.prototype, "marketed", void 0);
 _ts_decorate17([
   IsOptional3(),
-  IsString4(),
-  MaxLength3(2e3),
+  IsBoundedText(2e3),
   _ts_metadata17("design:type", String)
-], UpdateBundleVersionDraftDto.prototype, "changeNote", void 0);
+], BundleVersionDraftFieldsDto.prototype, "changeNote", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(ISO_DATE_PATTERN2, {
-    message: "validFrom must be an ISO date (YYYY-MM-DD)"
-  }),
+  IsUUID(),
   _ts_metadata17("design:type", Object)
-], UpdateBundleVersionDraftDto.prototype, "validFrom", void 0);
+], BundleVersionDraftFieldsDto.prototype, "baseVersionId", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(ISO_DATE_PATTERN2, {
-    message: "validUntil must be an ISO date (YYYY-MM-DD)"
-  }),
+  IsIsoDateOrNull("validFrom"),
+  _ts_metadata17("design:type", Object)
+], BundleVersionDraftFieldsDto.prototype, "validFrom", void 0);
+_ts_decorate17([
+  IsOptional3(),
+  IsIsoDateOrNull("validUntil"),
   _ts_metadata17("design:type", Object)
-], UpdateBundleVersionDraftDto.prototype, "validUntil", void 0);
+], BundleVersionDraftFieldsDto.prototype, "validUntil", void 0);
+var CreateBundleVersionDraftDto = class extends BundleVersionDraftFieldsDto {
+  static {
+    __name(this, "CreateBundleVersionDraftDto");
+  }
+  features;
+};
+_ts_decorate17([
+  IsFeatureKeyList(),
+  _ts_metadata17("design:type", Array)
+], CreateBundleVersionDraftDto.prototype, "features", void 0);
+var UpdateBundleVersionDraftDto = class extends BundleVersionDraftFieldsDto {
+  static {
+    __name(this, "UpdateBundleVersionDraftDto");
+  }
+  features;
+};
+_ts_decorate17([
+  IsOptional3(),
+  IsFeatureKeyList(),
+  _ts_metadata17("design:type", Array)
+], UpdateBundleVersionDraftDto.prototype, "features", void 0);
 var PublishBundleVersionDto = class {
   static {
     __name(this, "PublishBundleVersionDto");
@@ -3819,23 +3813,17 @@ _ts_decorate17([
 ], PublishBundleVersionDto.prototype, "allowZeroPrice", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(ISO_DATE_PATTERN2, {
-    message: "validFrom must be an ISO date (YYYY-MM-DD)"
-  }),
+  IsIsoDateOrNull("validFrom"),
   _ts_metadata17("design:type", Object)
 ], PublishBundleVersionDto.prototype, "validFrom", void 0);
 _ts_decorate17([
   IsOptional3(),
-  ValidateIf((_o, value) => value !== null),
-  Matches4(ISO_DATE_PATTERN2, {
-    message: "validUntil must be an ISO date (YYYY-MM-DD)"
-  }),
+  IsIsoDateOrNull("validUntil"),
   _ts_metadata17("design:type", Object)
 ], PublishBundleVersionDto.prototype, "validUntil", void 0);
 
 // src/catalog/bundles.controller.ts
-import { Body as Body4, Controller as Controller5, Delete as Delete2, Get as Get5, HttpCode as HttpCode2, HttpStatus as HttpStatus2, Inject as Inject14, Param as Param3, ParseUUIDPipe as ParseUUIDPipe2, Patch as Patch3, Post as Post3, Query as Query5, UseGuards as UseGuards5 } from "@nestjs/common";
+import { Body as Body4, Controller as Controller5, Delete as Delete2, Get as Get5, HttpCode as HttpCode2, HttpStatus as HttpStatus2, Inject as Inject14, Param as Param3, ParseUUIDPipe as ParseUUIDPipe2, Patch as Patch3, Post as Post3, UseGuards as UseGuards5 } from "@nestjs/common";
 function _ts_decorate18(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -3863,8 +3851,8 @@ function buildBundlesController(guards) {
       this.service = service;
     }
     // ─── Root operations ───
-    listBundles(projectKey) {
-      return this.service.listBundles(projectKey);
+    listBundles() {
+      return this.service.listBundles();
     }
     getBundle(bundleId) {
       return this.service.getBundle(bundleId);
@@ -3901,11 +3889,8 @@ function buildBundlesController(guards) {
   };
   _ts_decorate18([
     Get5(),
-    _ts_param14(0, Query5("projectKey")),
     _ts_metadata18("design:type", Function),
-    _ts_metadata18("design:paramtypes", [
-      String
-    ]),
+    _ts_metadata18("design:paramtypes", []),
     _ts_metadata18("design:returntype", void 0)
   ], GeneratedBundlesController.prototype, "listBundles", null);
   _ts_decorate18([
@@ -4039,6 +4024,7 @@ function buildBundleVersionsController(guards) {
   ], GeneratedBundleVersionsController.prototype, "discardDraft", null);
   _ts_decorate18([
     Post3(":id/publish"),
+    EnforceMfa(),
     _ts_param14(0, Param3("id", new ParseUUIDPipe2())),
     _ts_param14(1, Body4()),
     _ts_metadata18("design:type", Function),
@@ -4062,8 +4048,9 @@ function buildBundleVersionsController(guards) {
 __name(buildBundleVersionsController, "buildBundleVersionsController");
 
 // src/catalog/dto/marketing-projections.dto.ts
-import { IsArray as IsArray4, IsBoolean as IsBoolean3, IsIn as IsIn3, IsInt as IsInt3, IsOptional as IsOptional4, IsString as IsString5, IsUUID as IsUUID2, Matches as Matches5, Max as Max2, MaxLength as MaxLength4, Min as Min2, MinLength as MinLength2, ValidateNested } from "class-validator";
-import { Type } from "class-transformer";
+import { IsArray as IsArray4, IsBoolean as IsBoolean3, IsIn as IsIn3, IsInt as IsInt3, IsOptional as IsOptional4, IsString as IsString5, IsUUID as IsUUID2, Matches as Matches4, Max as Max2, MaxLength as MaxLength4, Min as Min2, MinLength as MinLength2, ValidateNested as ValidateNested2 } from "class-validator";
+import { Type as Type2 } from "class-transformer";
+import { MARKETING_PRIORITY_MAX, MARKETING_PRIORITY_MIN } from "@saasicat/core";
 function _ts_decorate19(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -4075,7 +4062,6 @@ function _ts_metadata19(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata19, "_ts_metadata");
-var PROJECT_KEY_PATTERN5 = /^[a-z][a-z0-9-]*$/;
 var LOCALE_PATTERN2 = /^[a-z]{2}(-[A-Z]{2})?$/;
 var TARGET_TYPES2 = [
   "PLAN",
@@ -4112,7 +4098,6 @@ var CreateMarketingProjectionDto = class {
   static {
     __name(this, "CreateMarketingProjectionDto");
   }
-  projectKey;
   targetType;
   targetVersionId;
   locale;
@@ -4128,14 +4113,6 @@ var CreateMarketingProjectionDto = class {
   priority;
   highlight;
 };
-_ts_decorate19([
-  IsString5(),
-  Matches5(PROJECT_KEY_PATTERN5, {
-    message: "projectKey must be kebab-case"
-  }),
-  MaxLength4(64),
-  _ts_metadata19("design:type", String)
-], CreateMarketingProjectionDto.prototype, "projectKey", void 0);
 _ts_decorate19([
   IsString5(),
   IsIn3(TARGET_TYPES2),
@@ -4148,7 +4125,7 @@ _ts_decorate19([
 _ts_decorate19([
   IsOptional4(),
   IsString5(),
-  Matches5(LOCALE_PATTERN2, {
+  Matches4(LOCALE_PATTERN2, {
     message: 'locale must be ISO-639-1 (e.g. "de", "en", "de-AT")'
   }),
   _ts_metadata19("design:type", String)
@@ -4179,10 +4156,10 @@ _ts_decorate19([
 _ts_decorate19([
   IsOptional4(),
   IsArray4(),
-  ValidateNested({
+  ValidateNested2({
     each: true
   }),
-  Type(() => MarketingTopFeatureDto),
+  Type2(() => MarketingTopFeatureDto),
   _ts_metadata19("design:type", Array)
 ], CreateMarketingProjectionDto.prototype, "topFeatures", void 0);
 _ts_decorate19([
@@ -4212,8 +4189,8 @@ _ts_decorate19([
 _ts_decorate19([
   IsOptional4(),
   IsInt3(),
-  Min2(0),
-  Max2(1e4),
+  Min2(MARKETING_PRIORITY_MIN),
+  Max2(MARKETING_PRIORITY_MAX),
   _ts_metadata19("design:type", Number)
 ], CreateMarketingProjectionDto.prototype, "priority", void 0);
 _ts_decorate19([
@@ -4265,10 +4242,10 @@ _ts_decorate19([
 _ts_decorate19([
   IsOptional4(),
   IsArray4(),
-  ValidateNested({
+  ValidateNested2({
     each: true
   }),
-  Type(() => MarketingTopFeatureDto),
+  Type2(() => MarketingTopFeatureDto),
   _ts_metadata19("design:type", Array)
 ], UpdateMarketingProjectionDto.prototype, "topFeatures", void 0);
 _ts_decorate19([
@@ -4298,8 +4275,8 @@ _ts_decorate19([
 _ts_decorate19([
   IsOptional4(),
   IsInt3(),
-  Min2(0),
-  Max2(1e4),
+  Min2(MARKETING_PRIORITY_MIN),
+  Max2(MARKETING_PRIORITY_MAX),
   _ts_metadata19("design:type", Number)
 ], UpdateMarketingProjectionDto.prototype, "priority", void 0);
 _ts_decorate19([
@@ -4311,16 +4288,10 @@ var ListMarketingProjectionsQueryDto = class {
   static {
     __name(this, "ListMarketingProjectionsQueryDto");
   }
-  projectKey;
   targetType;
   targetVersionId;
   locale;
 };
-_ts_decorate19([
-  IsString5(),
-  Matches5(PROJECT_KEY_PATTERN5),
-  _ts_metadata19("design:type", String)
-], ListMarketingProjectionsQueryDto.prototype, "projectKey", void 0);
 _ts_decorate19([
   IsOptional4(),
   IsString5(),
@@ -4335,12 +4306,12 @@ _ts_decorate19([
 _ts_decorate19([
   IsOptional4(),
   IsString5(),
-  Matches5(LOCALE_PATTERN2),
+  Matches4(LOCALE_PATTERN2),
   _ts_metadata19("design:type", String)
 ], ListMarketingProjectionsQueryDto.prototype, "locale", void 0);
 
 // src/catalog/marketing-projections.controller.ts
-import { Body as Body5, Controller as Controller6, Delete as Delete3, Get as Get6, HttpCode as HttpCode3, HttpStatus as HttpStatus3, Inject as Inject15, Param as Param4, ParseUUIDPipe as ParseUUIDPipe3, Patch as Patch4, Post as Post4, Query as Query6, UseGuards as UseGuards6 } from "@nestjs/common";
+import { Body as Body5, Controller as Controller6, Delete as Delete3, Get as Get6, HttpCode as HttpCode3, HttpStatus as HttpStatus3, Inject as Inject15, Param as Param4, ParseUUIDPipe as ParseUUIDPipe3, Patch as Patch4, Post as Post4, Query as Query3, UseGuards as UseGuards6 } from "@nestjs/common";
 function _ts_decorate20(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -4369,7 +4340,6 @@ function buildMarketingProjectionsController(guards) {
     }
     list(query) {
       return this.service.list({
-        projectKey: query.projectKey,
         targetType: query.targetType,
         targetVersionId: query.targetVersionId,
         locale: query.locale
@@ -4390,7 +4360,7 @@ function buildMarketingProjectionsController(guards) {
   };
   _ts_decorate20([
     Get6(),
-    _ts_param15(0, Query6()),
+    _ts_param15(0, Query3()),
     _ts_metadata20("design:type", Function),
     _ts_metadata20("design:paramtypes", [
       typeof ListMarketingProjectionsQueryDto === "undefined" ? Object : ListMarketingProjectionsQueryDto
@@ -4450,7 +4420,7 @@ function buildMarketingProjectionsController(guards) {
 __name(buildMarketingProjectionsController, "buildMarketingProjectionsController");
 
 // src/catalog/dto/plans.dto.ts
-import { IsInt as IsInt4, IsOptional as IsOptional5, IsString as IsString6, Matches as Matches6, Max as Max3, MaxLength as MaxLength5, Min as Min3, MinLength as MinLength3 } from "class-validator";
+import { IsInt as IsInt4, IsOptional as IsOptional5, IsString as IsString6, Matches as Matches5, Max as Max3, MaxLength as MaxLength5, Min as Min3, MinLength as MinLength3 } from "class-validator";
 function _ts_decorate21(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -4463,12 +4433,10 @@ function _ts_metadata21(k, v) {
 }
 __name(_ts_metadata21, "_ts_metadata");
 var KEY_PATTERN2 = /^[A-Z][A-Z0-9_]*$/;
-var PROJECT_KEY_PATTERN6 = /^[a-z][a-z0-9-]*$/;
 var CreatePlanDto = class {
   static {
     __name(this, "CreatePlanDto");
   }
-  projectKey;
   planKey;
   label;
   description;
@@ -4477,15 +4445,7 @@ var CreatePlanDto = class {
 };
 _ts_decorate21([
   IsString6(),
-  Matches6(PROJECT_KEY_PATTERN6, {
-    message: 'projectKey must be kebab-case (e.g. "my-app")'
-  }),
-  MaxLength5(64),
-  _ts_metadata21("design:type", String)
-], CreatePlanDto.prototype, "projectKey", void 0);
-_ts_decorate21([
-  IsString6(),
-  Matches6(KEY_PATTERN2, {
+  Matches5(KEY_PATTERN2, {
     message: 'planKey must be SCREAMING_SNAKE_CASE (e.g. "STARTER")'
   }),
   MaxLength5(64),
@@ -4553,7 +4513,7 @@ _ts_decorate21([
 ], UpdatePlanDto.prototype, "sortOrder", void 0);
 
 // src/catalog/dto/plan-versions.dto.ts
-import { IsArray as IsArray5, IsBoolean as IsBoolean4, IsISO8601, IsObject as IsObject4, IsOptional as IsOptional6, IsString as IsString7, IsUUID as IsUUID3, Matches as Matches7, MaxLength as MaxLength6, ValidateIf as ValidateIf2 } from "class-validator";
+import { IsArray as IsArray5, IsBoolean as IsBoolean4, IsISO8601, IsObject as IsObject4, IsOptional as IsOptional6, IsString as IsString7, IsUUID as IsUUID3, Matches as Matches6, MaxLength as MaxLength6, ValidateIf as ValidateIf2 } from "class-validator";
 function _ts_decorate22(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -4593,7 +4553,7 @@ _ts_decorate22([
   IsString7({
     each: true
   }),
-  Matches7(FEATURE_KEY_PATTERN2, {
+  Matches6(FEATURE_KEY_PATTERN2, {
     each: true,
     message: "features entries must be SCREAMING_SNAKE_CASE"
   }),
@@ -4605,7 +4565,7 @@ _ts_decorate22([
   IsString7({
     each: true
   }),
-  Matches7(FEATURE_KEY_PATTERN2, {
+  Matches6(FEATURE_KEY_PATTERN2, {
     each: true,
     message: "bundles entries must be SCREAMING_SNAKE_CASE"
   }),
@@ -4613,16 +4573,17 @@ _ts_decorate22([
 ], CreatePlanVersionDraftDto.prototype, "bundles", void 0);
 _ts_decorate22([
   IsObject4(),
+  IsQuotaRecord(),
   _ts_metadata22("design:type", typeof Record === "undefined" ? Object : Record)
 ], CreatePlanVersionDraftDto.prototype, "quotas", void 0);
 _ts_decorate22([
-  Matches7(DECIMAL_PATTERN2, {
+  Matches6(DECIMAL_PATTERN2, {
     message: 'monthlyNet must be a decimal with at most 2 fraction digits (e.g. "9.90")'
   }),
   _ts_metadata22("design:type", String)
 ], CreatePlanVersionDraftDto.prototype, "monthlyNet", void 0);
 _ts_decorate22([
-  Matches7(DECIMAL_PATTERN2, {
+  Matches6(DECIMAL_PATTERN2, {
     message: "yearlyNet must be a decimal with at most 2 fraction digits"
   }),
   _ts_metadata22("design:type", String)
@@ -4677,7 +4638,7 @@ _ts_decorate22([
   IsString7({
     each: true
   }),
-  Matches7(FEATURE_KEY_PATTERN2, {
+  Matches6(FEATURE_KEY_PATTERN2, {
     each: true
   }),
   _ts_metadata22("design:type", Array)
@@ -4688,7 +4649,7 @@ _ts_decorate22([
   IsString7({
     each: true
   }),
-  Matches7(FEATURE_KEY_PATTERN2, {
+  Matches6(FEATURE_KEY_PATTERN2, {
     each: true
   }),
   _ts_metadata22("design:type", Array)
@@ -4696,16 +4657,17 @@ _ts_decorate22([
 _ts_decorate22([
   IsOptional6(),
   IsObject4(),
+  IsQuotaRecord(),
   _ts_metadata22("design:type", typeof Record === "undefined" ? Object : Record)
 ], UpdatePlanVersionDraftDto.prototype, "quotas", void 0);
 _ts_decorate22([
   IsOptional6(),
-  Matches7(DECIMAL_PATTERN2),
+  Matches6(DECIMAL_PATTERN2),
   _ts_metadata22("design:type", String)
 ], UpdatePlanVersionDraftDto.prototype, "monthlyNet", void 0);
 _ts_decorate22([
   IsOptional6(),
-  Matches7(DECIMAL_PATTERN2),
+  Matches6(DECIMAL_PATTERN2),
   _ts_metadata22("design:type", String)
 ], UpdatePlanVersionDraftDto.prototype, "yearlyNet", void 0);
 _ts_decorate22([
@@ -4787,7 +4749,7 @@ _ts_decorate22([
 ], PublishPlanVersionDto.prototype, "validUntil", void 0);
 
 // src/catalog/plans.controller.ts
-import { Body as Body6, Controller as Controller7, Delete as Delete4, Get as Get7, HttpCode as HttpCode4, HttpStatus as HttpStatus4, Inject as Inject16, Optional as Optional8, Param as Param5, ParseUUIDPipe as ParseUUIDPipe4, Patch as Patch5, Post as Post5, Query as Query7, UseGuards as UseGuards7 } from "@nestjs/common";
+import { Body as Body6, Controller as Controller7, Delete as Delete4, Get as Get7, HttpCode as HttpCode4, HttpStatus as HttpStatus4, Inject as Inject16, Optional as Optional8, Param as Param5, ParseUUIDPipe as ParseUUIDPipe4, Patch as Patch5, Post as Post5, Query as Query4, UseGuards as UseGuards7 } from "@nestjs/common";
 function _ts_decorate23(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -4817,15 +4779,15 @@ function buildPlansController(guards) {
       this.versionsService = versionsService;
     }
     // ─── Master operations ───
-    listPlans(projectKey, onlyPublished) {
-      return this.service.listPlans(projectKey, {
+    listPlans(onlyPublished) {
+      return this.service.listPlans({
         onlyPublished: onlyPublished === "true"
       });
     }
     // Static route BEFORE `@Get(':id')` — Fastify prioritizes static over
     // parametric; this makes the ordering additionally explicit.
-    getTenantCounts(projectKey) {
-      return this.service.getTenantCounts(projectKey);
+    getTenantCounts() {
+      return this.service.getTenantCounts();
     }
     getPlan(planId) {
       return this.service.getPlan(planId);
@@ -4874,22 +4836,17 @@ function buildPlansController(guards) {
   };
   _ts_decorate23([
     Get7(),
-    _ts_param16(0, Query7("projectKey")),
-    _ts_param16(1, Query7("onlyPublished")),
+    _ts_param16(0, Query4("onlyPublished")),
     _ts_metadata23("design:type", Function),
     _ts_metadata23("design:paramtypes", [
-      String,
       String
     ]),
     _ts_metadata23("design:returntype", void 0)
   ], GeneratedPlansController.prototype, "listPlans", null);
   _ts_decorate23([
     Get7("tenant-counts"),
-    _ts_param16(0, Query7("projectKey")),
     _ts_metadata23("design:type", Function),
-    _ts_metadata23("design:paramtypes", [
-      String
-    ]),
+    _ts_metadata23("design:paramtypes", []),
     _ts_metadata23("design:returntype", void 0)
   ], GeneratedPlansController.prototype, "getTenantCounts", null);
   _ts_decorate23([
@@ -4933,6 +4890,7 @@ function buildPlansController(guards) {
   ], GeneratedPlansController.prototype, "softDeletePlan", null);
   _ts_decorate23([
     Delete4(":id/purge"),
+    EnforceMfa(),
     HttpCode4(HttpStatus4.NO_CONTENT),
     _ts_param16(0, Param5("id", new ParseUUIDPipe4())),
     _ts_metadata23("design:type", Function),
@@ -5029,6 +4987,7 @@ function buildPlanVersionsController(guards) {
   ], GeneratedPlanVersionsController.prototype, "updateDraft", null);
   _ts_decorate23([
     Post5(":id/publish"),
+    EnforceMfa(),
     _ts_param16(0, Param5("id", new ParseUUIDPipe4())),
     _ts_param16(1, Body6()),
     _ts_metadata23("design:type", Function),
@@ -5050,6 +5009,7 @@ function buildPlanVersionsController(guards) {
   ], GeneratedPlanVersionsController.prototype, "discardDraft", null);
   _ts_decorate23([
     Post5(":id/terminate"),
+    EnforceMfa(),
     _ts_param16(0, Param5("id", new ParseUUIDPipe4())),
     _ts_param16(1, Body6()),
     _ts_metadata23("design:type", Function),
@@ -5114,9 +5074,22 @@ var CatalogModule = class _CatalogModule {
       }
     }
     if (hasPublicMarketingCatalog && options.publicMarketingCatalog) {
-      controllers.push(buildPublicMarketingCatalogController(options.publicMarketingCatalog.guards, options.publicMarketingCatalog.projectKey, options.publicMarketingCatalog.currency, options.publicMarketingCatalog.vatRate));
+      controllers.push(buildPublicMarketingCatalogController(options.publicMarketingCatalog.guards, options.publicMarketingCatalog.currency, options.publicMarketingCatalog.vatRate));
     }
     const providers = [
+      // Always provided, `null` included: the service asks for it without
+      // `@Optional()`, so a catalogue that publishes the answer cannot be
+      // wired without one. `useExisting` rather than an instance, because
+      // the source is a provider of the module the application wired for
+      // payments — and where that module is out of scope, Nest says so at
+      // boot instead of answering "no payment method is taken".
+      options.publicMarketingCatalog?.newPaymentMethodsFrom ? {
+        provide: NEW_PAYMENT_METHODS_SOURCE_TOKEN,
+        useExisting: options.publicMarketingCatalog.newPaymentMethodsFrom
+      } : {
+        provide: NEW_PAYMENT_METHODS_SOURCE_TOKEN,
+        useValue: null
+      },
       asProvider(BUNDLE_REPOSITORY_TOKEN, options.bundleRepository),
       {
         provide: CATALOG_SERVICE_CONFIG_TOKEN,
@@ -5179,6 +5152,9 @@ CatalogModule = _ts_decorate24([
 ], CatalogModule);
 
 export {
+  PLAN_VERSION_WINDOW_CODES,
+  BUNDLE_VERSION_WINDOW_CODES,
+  resolveValidityWindow,
   loadApprovedCatalogKeys,
   ADVISORY_STRICT_MODE_CODES,
   blockingStrictModeWarnings,
@@ -5189,18 +5165,19 @@ export {
   featureApprovalSignature,
   quotaApprovalSignature,
   CatalogEntriesService,
+  defaultActorFromRequest,
+  actorTagOf,
+  WebAuditLogger,
   ListCatalogEntriesQueryDto,
   ReviewCatalogEntryDto,
   UpdateCatalogEntryI18nDto,
   SyncDiscoveryDto,
   buildCatalogEntriesController,
   PromotionsService,
-  ListPromotionsQueryDto,
   CreatePromotionDto,
   UpdatePromotionDto,
   buildPromotionsController,
   MarketingSettingsService,
-  ListMarketingSettingsQueryDto,
   UpdateMarketingSettingsDto,
   buildMarketingSettingsController,
   PublicMarketingCatalogService,