@odla-ai/chapter 0.52.0 → 0.53.0

package/dist/worker/index.cjs

@@ -39,6 +39,7 @@ __export(worker_exports, {
   refundNamedSeatByOperator: () => refundNamedSeatByOperator,
   renderActiveSignupControlHtml: () => renderActiveSignupControlHtml,
   resolveNetworkTargetTransport: () => resolveNetworkTargetTransport,
+  retermMembershipDiscount: () => retermMembershipDiscount,
   retryChapterApprovalEffects: () => retryChapterApprovalEffects,
   retryLeaderAdmissionDeliveries: () => retryLeaderAdmissionDeliveries,
   withActiveSignupControlTheme: () => withActiveSignupControlTheme
@@ -544,30 +545,30 @@ async function checkBillingTerms(secretKey, input, resume, now, createMissing) {
   const terms2 = subscriptionBillingTerms(input.billingTerms);
   if (!resume && terms2.initialTermEndsAt !== void 0 && (terms2.initialTermEndsAt <= now || terms2.initialTermEndsAt - now > 730 * 864e5)) fail();
   if (!terms2.discount) return;
-  const { couponId: couponId2, percentOffBps, duration, policyVersionId } = terms2.discount;
+  const { couponId, percentOffBps, duration, policyVersionId } = terms2.discount;
   const productId = input.discountProductId;
   if (productId !== void 0 && !/^prod_[A-Za-z0-9_]+$/.test(productId)) fail();
   const metadata = { ...stripePartitionMetadata(input), discountPolicyVersionId: policyVersionId };
   const expansion = { "expand[0]": "applies_to" };
-  let result = await (0, import_stripe.stripeRequest)({ secretKey }, "GET", `/v1/coupons/${encodeURIComponent(couponId2)}`, expansion);
+  let result = await (0, import_stripe.stripeRequest)({ secretKey }, "GET", `/v1/coupons/${encodeURIComponent(couponId)}`, expansion);
   if (createMissing && result.status === 404 && result.body?.error?.code === "resource_missing") {
     result = await (0, import_stripe.stripeRequest)(
       { secretKey },
       "POST",
       "/v1/coupons",
       {
-        id: couponId2,
+        id: couponId,
         percent_off: percentOffBps / 100,
         duration,
         metadata,
         ...expansion,
         ...productId ? { "applies_to[products][0]": productId } : {}
       },
-      { idempotencyKey: `chapter-policy-coupon:${couponId2}` }
+      { idempotencyKey: `chapter-policy-coupon:${couponId}` }
     );
   }
   const coupon = result.body;
-  if (!result.ok || !coupon || coupon.id !== couponId2 || !resume && coupon.valid !== true || coupon.livemode !== (input.environment === "prod") || coupon.percent_off !== percentOffBps / 100 || coupon.duration !== duration || coupon.amount_off != null || (productId ? !Array.isArray(coupon.applies_to?.products) || coupon.applies_to.products.length !== 1 || coupon.applies_to.products[0] !== productId : coupon.applies_to != null) || !Object.entries(metadata).every(([key3, value]) => coupon.metadata?.[key3] === value)) fail();
+  if (!result.ok || !coupon || coupon.id !== couponId || !resume && coupon.valid !== true || coupon.livemode !== (input.environment === "prod") || coupon.percent_off !== percentOffBps / 100 || coupon.duration !== duration || coupon.amount_off != null || (productId ? !Array.isArray(coupon.applies_to?.products) || coupon.applies_to.products.length !== 1 || coupon.applies_to.products[0] !== productId : coupon.applies_to != null) || !Object.entries(metadata).every(([key3, value]) => coupon.metadata?.[key3] === value)) fail();
 }
 function subscriptionBillingParams(input, productId) {
   if (!input.billingTerms) return {};
@@ -1932,7 +1933,7 @@ async function hash(value) {
   const bytes = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify(value)));
   return [...new Uint8Array(bytes)].map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
-async function couponId(input, policyId) {
+async function membershipDiscountCouponId(input, policyId) {
   return policyId ? `odla_m_${await hash([input.appId, input.chapterId, input.environment, input.runtime, input.skuId, policyId])}` : void 0;
 }
 async function load(db, ns, id6) {
@@ -1958,7 +1959,7 @@ async function restore(row2, input) {
     discountPolicy: contract.discountPolicy,
     approvedFoundingCount: Number(row2.approvedFoundingCount),
     now: Number(row2.issuedAt),
-    couponId: await couponId(input, contract.discountPolicy?.id)
+    couponId: await membershipDiscountCouponId(input, contract.discountPolicy?.id)
   });
   if (expected.offering.chapterId !== input.chapterId || expected.offering.baseSkuId !== input.skuId) reject("invalid_offer_snapshot");
   const result = {
@@ -1989,7 +1990,7 @@ async function previewMembershipCommercialOffer(db, input) {
     discountPolicy: policy,
     approvedFoundingCount: Number(approvedFoundingCount),
     now: input.now,
-    couponId: await couponId(input, policy?.id)
+    couponId: await membershipDiscountCouponId(input, policy?.id)
   });
   const discount = contract.billingTerms.discount;
   return {
@@ -2039,7 +2040,7 @@ async function issueMembershipCommercialOffer(db, input) {
     discountPolicy: policy,
     approvedFoundingCount: Number(approvedFoundingCount),
     now: input.now,
-    couponId: await couponId(input, policy?.id)
+    couponId: await membershipDiscountCouponId(input, policy?.id)
   });
   const value = {
     id: input.offerId,
@@ -4192,6 +4193,239 @@ var handleAdminMembershipPolicyVersions = async (req, url, env, ctx) => {
   return json(await listMembershipPolicyVersions(db, { chapterId, now: Date.now() }));
 };
 
+// src/membership-discount-reterm.ts
+var import_stripe8 = require("@odla-ai/stripe");
+
+// src/subscription-provider-contract.ts
+var import_stripe7 = require("@odla-ai/stripe");
+function subscriptionContractMismatch() {
+  throw Object.assign(new Error("Stripe subscription does not match the checkout contract"), { code: "stripe_contract_mismatch" });
+}
+async function verifySubscriptionPrice(secretKey, input, resume = false) {
+  if (!/^price_[A-Za-z0-9]+$/.test(input.priceId) || !Number.isSafeInteger(input.priceCents) || input.priceCents <= 0 || !/^[a-z]{3}$/.test(input.currency) || !["month", "year"].includes(input.interval)) subscriptionContractMismatch();
+  const result = await (0, import_stripe7.stripeRequest)({ secretKey }, "GET", `/v1/prices/${encodeURIComponent(input.priceId)}`);
+  const price = result.body;
+  if (!result.ok || !price || price.id !== input.priceId || !resume && price.active !== true || price.unit_amount !== input.priceCents || price.currency !== input.currency || price.type !== "recurring" || price.billing_scheme !== "per_unit" || price.custom_unit_amount || price.transform_quantity || price.recurring?.interval !== input.interval || price.recurring?.interval_count !== 1 || price.recurring?.usage_type !== "licensed" || price.livemode !== (input.environment === "prod")) subscriptionContractMismatch();
+  return typeof price.product === "string" ? price.product : void 0;
+}
+function verifySubscriptionResult(sub, input, customerId, metadata) {
+  const items = sub?.items;
+  if (!sub || !/^sub_[A-Za-z0-9]+$/.test(sub.id) || sub.customer !== customerId || input.existingSubscriptionId && sub.id !== input.existingSubscriptionId || !(input.billingTerms?.initialTermEndsAt ? ["incomplete", "active", "trialing"] : ["incomplete", "active"]).includes(sub.status) || sub.livemode !== (input.environment === "prod") || !Object.entries(metadata).every(([key3, value]) => sub.metadata?.[key3] === value) || !Array.isArray(items?.data) || items.has_more !== false || items.data.length !== 1 || items.data[0]?.price?.id !== input.priceId || items.data[0]?.quantity !== 1) subscriptionContractMismatch();
+  const invoice = sub.latest_invoice;
+  if (!invoice || typeof invoice !== "object" || invoice.customer !== customerId || invoice.currency !== input.currency || invoice.total !== subscriptionAmountDue(input) || invoice.billing_reason !== "subscription_create") subscriptionContractMismatch();
+  verifySubscriptionBillingResult(sub, input);
+}
+
+// src/membership-discount-reterm.ts
+var SAFE = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
+var RETERMABLE = /* @__PURE__ */ new Set(["active", "paid_pending_approval", "cancel_at_term_end", "payment_grace"]);
+var PROVIDER_LIVE = /* @__PURE__ */ new Set(["active", "trialing", "past_due"]);
+var couponOf = (discount) => {
+  const ref = discount?.source?.coupon ?? discount?.coupon;
+  return typeof ref === "string" ? ref : typeof ref?.id === "string" ? ref.id : void 0;
+};
+async function retermPolicy(db, scope2, id6) {
+  const row2 = await membershipLoad(db, "discountPolicyVersion", id6);
+  if (!row2) membershipFail("membership_reterm_policy_unknown");
+  let policy;
+  try {
+    policy = membershipDiscountPolicyVersion(row2.snapshot);
+  } catch {
+    return membershipFail("membership_reterm_policy_ineligible");
+  }
+  if (policy.id !== id6 || policy.chapterId !== scope2.chapterId || policy.status !== "published" || policy.benefitDuration.kind !== "while_active" || policy.percentOffBps <= 0 || policy.discountEligibleSkuIds.length === 0) membershipFail("membership_reterm_policy_ineligible");
+  return policy;
+}
+async function attachProviderDiscount(sk, scope2, member, policy, couponId, productId) {
+  const subId = String(member.providerSubscriptionId), path = `/v1/subscriptions/${encodeURIComponent(subId)}`;
+  const read2 = await (0, import_stripe8.stripeRequest)({ secretKey: sk }, "GET", path, { "expand[0]": "discounts" });
+  const sub = read2.body, items = sub?.items?.data;
+  const metadata = { ...stripePartitionMetadata(scope2), applicationId: String(member.applicationId) };
+  if (!read2.ok || sub.id !== subId || sub.customer !== member.providerCustomerId || sub.livemode !== (scope2.environment === "prod") || !PROVIDER_LIVE.has(sub.status) || !Object.entries(metadata).every(([key3, value]) => sub.metadata?.[key3] === value) || sub.items?.has_more !== false || !Array.isArray(items) || items.length < 1 || items.length > 2 || items.filter((item) => item.price?.id === member.providerPriceId && item.quantity === 1 && item.price?.product === productId).length !== 1) {
+    throw Object.assign(new Error("provider subscription does not match the frozen membership"), { code: "provider_mismatch" });
+  }
+  const discounts = sub.discounts ?? (sub.discount ? [sub.discount] : []);
+  if (!Array.isArray(discounts)) throw Object.assign(new Error("provider discounts unreadable"), { code: "provider_mismatch" });
+  const present = discounts.map(couponOf);
+  if (present.length === 1 && present[0] === couponId) return false;
+  if (present.length > 0) throw Object.assign(new Error("provider subscription carries an unrelated discount"), { code: "provider_mismatch" });
+  const written = await (0, import_stripe8.stripeRequest)({ secretKey: sk }, "POST", path, {
+    "discounts[0][coupon]": couponId,
+    "expand[0]": "discounts",
+    "metadata[discountPolicyVersionId]": policy.id
+  }, { idempotencyKey: `membership-reterm:${String(member.id)}:${policy.id}` });
+  const after = written.body?.discounts;
+  if (!written.ok || written.body?.id !== subId || !Array.isArray(after) || after.length !== 1 || couponOf(after[0]) !== couponId) {
+    membershipFail("membership_reterm_provider_unconfirmed");
+  }
+  return true;
+}
+async function retermMembershipDiscount(db, stripeSecretKey, scope2, input, now) {
+  membershipClock(now);
+  const limit = input.limit ?? 100;
+  if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200) throw new TypeError("invalid reterm limit");
+  if (typeof input.policyVersionId !== "string" || !SAFE.test(input.policyVersionId)) throw new TypeError("invalid policy version id");
+  if (input.membershipIds !== void 0 && (!Array.isArray(input.membershipIds) || input.membershipIds.length === 0 || input.membershipIds.length > limit || input.membershipIds.some((id6) => typeof id6 !== "string" || !SAFE.test(id6)))) throw new TypeError("invalid membership ids");
+  const state = await loadMembershipAuthorityState(db, scope2);
+  const policy = await retermPolicy(db, scope2, input.policyVersionId);
+  const receipt = { policyVersionId: policy.id, retermed: [], unchanged: [], skipped: [], more: false };
+  const skip = (membershipId, reason) => {
+    receipt.skipped.push({ membershipId, reason });
+  };
+  let rows5;
+  if (input.membershipIds) {
+    rows5 = [];
+    for (const id6 of input.membershipIds) {
+      const member = await membershipLoad(db, "networkMembership", id6);
+      if (!member) skip(id6, "not_found");
+      else if (Object.entries(scope2).some(([key3, value]) => member[key3] !== value)) skip(id6, "scope_mismatch");
+      else rows5.push(member);
+    }
+  } else {
+    const found = (await db.query({ networkMembership: { $: { where: { ...scope2 }, order: { updatedAt: "asc" }, limit: limit + 1 } } })).networkMembership ?? [];
+    if (found.some((member) => Object.entries(scope2).some(([key3, value]) => member[key3] !== value))) throw new Error("membership reterm scope mismatch");
+    receipt.more = found.length > limit;
+    rows5 = found.slice(0, limit);
+  }
+  for (const member of rows5) {
+    const id6 = String(member.id);
+    if (member.discountPolicyVersionId === policy.id) {
+      receipt.unchanged.push(id6);
+      continue;
+    }
+    if (!RETERMABLE.has(String(member.status))) {
+      skip(id6, "status");
+      continue;
+    }
+    if (member.founding !== true) {
+      skip(id6, "not_founding");
+      continue;
+    }
+    if (member.cohort !== policy.cohortLabel) {
+      skip(id6, "cohort_mismatch");
+      continue;
+    }
+    const skuId = String(member.baseSkuId);
+    if (!policy.discountEligibleSkuIds.includes(skuId)) {
+      skip(id6, "sku_not_discounted");
+      continue;
+    }
+    const base = Number(member.baseAmountCents), current = Number(member.renewalAmountCents);
+    const renewal = Math.round(base * (1e4 - policy.percentOffBps) / 1e4);
+    if (!Number.isSafeInteger(base) || base <= 0 || !Number.isSafeInteger(current) || renewal > current) {
+      skip(id6, "would_not_widen");
+      continue;
+    }
+    const couponId = await membershipDiscountCouponId({ ...scope2, skuId }, policy.id);
+    let providerUpdated;
+    try {
+      const productId = await verifySubscriptionPrice(stripeSecretKey, {
+        priceId: String(member.providerPriceId),
+        priceCents: base,
+        currency: String(member.currency),
+        interval: member.interval === "month" ? "month" : "year",
+        environment: scope2.environment
+      }, true);
+      if (!productId) throw Object.assign(new Error("price has no product"), { code: "provider_mismatch" });
+      await prepareSubscriptionBillingTerms(stripeSecretKey, {
+        ...scope2,
+        priceCents: base,
+        currency: String(member.currency),
+        discountProductId: productId,
+        billingTerms: {
+          offeringVersionId: String(member.offeringVersionId),
+          discount: { policyVersionId: policy.id, couponId, percentOffBps: policy.percentOffBps, duration: "forever" }
+        }
+      }, false);
+      providerUpdated = await attachProviderDiscount(stripeSecretKey, scope2, member, policy, couponId, productId);
+    } catch (error) {
+      const code = error.code;
+      if (code === "provider_mismatch" || code === "stripe_contract_mismatch") {
+        skip(id6, "provider_mismatch");
+        continue;
+      }
+      throw error;
+    }
+    try {
+      await db.transact([membershipUpdate("networkMembership", id6, {
+        discountPolicyVersionId: policy.id,
+        discountSnapshot: policy,
+        renewalAmountCents: renewal,
+        revision: Number(member.revision) + 1,
+        updatedAt: now
+      })], {
+        mutationId: `membership-reterm:${id6}:${policy.id}:${member.revision}`,
+        guards: [
+          { ns: "networkMembership", id: id6, exists: true, equals: { revision: member.revision, status: member.status } },
+          { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative" } },
+          { ns: "discountPolicyVersion", id: policy.id, exists: true }
+        ]
+      });
+    } catch (error) {
+      if (error.code !== "transact_guard_failed") throw error;
+      return membershipFail("membership_reterm_retry_required");
+    }
+    receipt.retermed.push({
+      membershipId: id6,
+      ...typeof member.discountPolicyVersionId === "string" ? { previousPolicyVersionId: member.discountPolicyVersionId } : {},
+      previousRenewalAmountCents: current,
+      renewalAmountCents: renewal,
+      providerUpdated
+    });
+  }
+  return receipt;
+}
+
+// src/worker-routes-admin-membership-reterm.ts
+var PATH4 = "/api/admin/membership-discount/reterm";
+var SCOPE3 = /^[a-z0-9][a-z0-9-]{1,62}$/;
+var ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
+var BAD = "chapterId and policyVersionId are required; runtime, appId, membershipIds and limit are optional";
+var handleAdminMembershipReterm = async (req, url, env, ctx) => {
+  if (url.pathname !== PATH4) return null;
+  const operator = ctx.membershipAuthorityOperator;
+  if (!operator) return json({ error: "not found" }, 404);
+  if (req.method !== "POST") return json({ error: "method not allowed" }, 405);
+  const raw2 = ctx.makeDb(env), user = await ctx.verifyUser(req, env);
+  if (!user) return json({ error: "unauthorized" }, 401);
+  if (!await ctx.isSuperAdminEmail(raw2, user.email, user.userId)) return json({ error: "super-admin required", code: "super_admin_required" }, 403);
+  let db;
+  try {
+    db = operator.makeDb(env);
+  } catch {
+    return json({ error: "the membership authority is not hosted by this deployment" }, 404);
+  }
+  let body;
+  try {
+    body = await req.json();
+  } catch {
+    return json({ error: BAD }, 400);
+  }
+  const appId = body.appId ?? body.chapterId, runtime = body.runtime ?? env.ODLA_RUNTIME;
+  if (typeof body.chapterId !== "string" || !SCOPE3.test(body.chapterId) || typeof appId !== "string" || !SCOPE3.test(appId) || typeof runtime !== "string" || !/^[a-z0-9]{2,12}$/.test(runtime) || typeof body.policyVersionId !== "string" || !ID.test(body.policyVersionId) || body.membershipIds !== void 0 && (!Array.isArray(body.membershipIds) || body.membershipIds.length === 0 || body.membershipIds.length > 200 || body.membershipIds.some((id6) => typeof id6 !== "string" || !ID.test(id6))) || body.limit !== void 0 && (!Number.isSafeInteger(body.limit) || Number(body.limit) < 1 || Number(body.limit) > 200)) {
+    return json({ error: BAD }, 400);
+  }
+  const secret = await getVaultSecret(db, operator.stripeSecretName ?? "stripe_secret_key");
+  if (!secret) return json({ error: "network payment provider unavailable" }, 503);
+  try {
+    const receipt = await retermMembershipDiscount(
+      db,
+      secret,
+      { appId, chapterId: body.chapterId, environment: env.ODLA_ENV, runtime },
+      {
+        policyVersionId: body.policyVersionId,
+        ...body.membershipIds ? { membershipIds: body.membershipIds } : {},
+        ...body.limit !== void 0 ? { limit: Number(body.limit) } : {}
+      },
+      Date.now()
+    );
+    return json({ ok: true, ...receipt });
+  } catch (error) {
+    const code = error.code;
+    return json({ error: "re-term is pending; retry to confirm", ...code ? { code } : {} }, code ? 409 : 503);
+  }
+};
+
 // src/worker-routes-membership-cancel.ts
 var handleMembershipCancellation = async (req, url, env, ctx) => {
   const match = url.pathname.match(/^\/api\/admin\/applications\/([0-9a-f-]+)\/cancel-renewal$/);
@@ -4852,7 +5086,7 @@ async function readAdmissionRows(db, namespace, where, maximum) {
 }
 
 // src/admission-grants.ts
-var ID = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,127}$/;
+var ID2 = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,127}$/;
 var MAX_GRANTS = 2e3;
 var MAX_NOTE = 2e3;
 var EMAIL_RE2 = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@@ -4874,10 +5108,10 @@ function validateAdmissionGrantDocument(input) {
   const sourceActor = typeof source.actor === "string" ? source.actor.trim() : "";
   const chapterId = typeof target.chapterId === "string" ? target.chapterId : "";
   const environment = typeof target.environment === "string" ? target.environment : "";
-  if (!ID.test(sourceId)) errors.push("document.source.appId must be an identifier");
+  if (!ID2.test(sourceId)) errors.push("document.source.appId must be an identifier");
   if (!sourceActor || sourceActor.length > 256) errors.push("document.source.actor must be 1-256 characters");
-  if (!ID.test(chapterId)) errors.push("document.target.chapterId must be an identifier");
-  if (!ID.test(environment)) errors.push("document.target.environment must be an identifier");
+  if (!ID2.test(chapterId)) errors.push("document.target.chapterId must be an identifier");
+  if (!ID2.test(environment)) errors.push("document.target.environment must be an identifier");
   if (!Array.isArray(root.grants)) errors.push("document.grants must be an array");
   const rawGrants = Array.isArray(root.grants) ? root.grants : [];
   if (rawGrants.length > MAX_GRANTS) errors.push(`document.grants supports at most ${MAX_GRANTS} entries`);
@@ -4892,7 +5126,7 @@ function validateAdmissionGrantDocument(input) {
     const decision = grant.decision;
     const note = typeof grant.note === "string" ? grant.note.trim() : void 0;
     const expiresAt = grant.expiresAt === void 0 ? void 0 : Number(grant.expiresAt);
-    if (!ID.test(id6)) errors.push(`document.grants[${index2}].id must be an identifier`);
+    if (!ID2.test(id6)) errors.push(`document.grants[${index2}].id must be an identifier`);
     if (seenIds.has(id6)) errors.push(`document.grants repeats id "${id6}"`);
     if (!isAdmissionEmail(normalized)) errors.push(`document.grants[${index2}].email must be valid`);
     if (seenEmails.has(normalized)) errors.push(`document.grants repeats email "${normalized}"`);
@@ -5108,7 +5342,7 @@ function chapterFlowFieldContract(chapter, flow, application = chapter.applicati
 // src/gift-offers.ts
 var GIFT_OFFER_CATALOG_VERSION = 1;
 var MAX_GIFT_OFFERS = 20;
-var ID2 = /^[a-z][a-z0-9-]{1,79}$/;
+var ID3 = /^[a-z][a-z0-9-]{1,79}$/;
 var PRICE = /^price_[A-Za-z0-9]{12,}$/;
 var CURRENCY = /^[a-z]{3}$/;
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -5141,7 +5375,7 @@ function validateGiftOfferCatalog(input, tierIds) {
     const allowed2 = /* @__PURE__ */ new Set(["id", "target", "billingMode", "stripePriceId", "priceCents", "currency", "redemptionLifetimeHours", "activeFrom", "activeUntil", "title", "description", "ctaLabel"]);
     for (const key3 of Object.keys(item)) if (!allowed2.has(key3)) errors.push(`${path}.${key3} is not supported`);
     const id6 = text3(item.id, `${path}.id`, errors, 80);
-    if (id6 && !ID2.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
+    if (id6 && !ID3.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
     if (ids2.has(id6)) errors.push(`${path}.id duplicates "${id6}"`);
     ids2.add(id6);
     const targetRaw = record(item.target);
@@ -5152,7 +5386,7 @@ function validateGiftOfferCatalog(input, tierIds) {
       target = { type: "tier", tierId };
     } else if (targetRaw?.type === "entitlement") {
       const entitlementKey = text3(targetRaw.entitlementKey, `${path}.target.entitlementKey`, errors, 80);
-      if (entitlementKey && !ID2.test(entitlementKey)) errors.push(`${path}.target.entitlementKey must be a lowercase kebab-case id`);
+      if (entitlementKey && !ID3.test(entitlementKey)) errors.push(`${path}.target.entitlementKey must be a lowercase kebab-case id`);
       target = { type: "entitlement", entitlementKey };
     } else errors.push(`${path}.target.type must be tier or entitlement`);
     if (item.billingMode !== "one_time" && item.billingMode !== "subscription") errors.push(`${path}.billingMode must be one_time or subscription`);
@@ -6938,7 +7172,7 @@ async function memberContentDigest(document) {
 }
 
 // src/member-content-validation-helpers.ts
-var ID3 = /^[a-z][a-z0-9-]{0,79}$/;
+var ID4 = /^[a-z][a-z0-9-]{0,79}$/;
 var SLUG2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var ROOT_KEYS3 = /* @__PURE__ */ new Set(["schemaVersion", "revision", "generatedAt", "source", "target", "pages", "upsellOverrides"]);
 var SOURCE_KEYS = /* @__PURE__ */ new Set(["type", "appId"]);
@@ -6978,7 +7212,7 @@ function offerValue(value, path, errors, tiers, audience) {
   }
   unknownKeys2(raw2, OFFER_KEYS, path, errors);
   const tierId = textValue(raw2.tierId, `${path}.tierId`, errors, 80, true) ?? "";
-  if (tierId && !ID3.test(tierId)) errors.push(`${path}.tierId must be a lowercase kebab-case id`);
+  if (tierId && !ID4.test(tierId)) errors.push(`${path}.tierId must be a lowercase kebab-case id`);
   if (tiers.size && !tiers.has(tierId)) errors.push(`${path}.tierId must reference a declared tier`);
   if (audience?.kind === "tiers" && tierId && !audience.tierIds.includes(tierId)) {
     errors.push(`${path}.tierId must grant access to this page`);
@@ -7011,7 +7245,7 @@ function validateMemberContentDocument(input, options = {}) {
     const type = sourceRaw.type;
     const appId = textValue(sourceRaw.appId, "document.source.appId", errors, 63, true) ?? "";
     if (type !== "parent" && type !== "chapter") errors.push("document.source.type must be parent or chapter");
-    if (appId && !ID3.test(appId)) errors.push("document.source.appId must be a lowercase app slug");
+    if (appId && !ID4.test(appId)) errors.push("document.source.appId must be a lowercase app slug");
     if (options.sourceType && type !== options.sourceType) errors.push(`document.source.type must be ${options.sourceType}`);
     if (options.sourceAppId && appId !== options.sourceAppId) errors.push(`document.source.appId must be ${options.sourceAppId}`);
     if (type === "parent" || type === "chapter") source = { type, appId };
@@ -7048,7 +7282,7 @@ function validateMemberContentDocument(input, options = {}) {
     const id6 = textValue(raw2.id, `${path}.id`, errors, 80, true) ?? "";
     const slug = textValue(raw2.slug, `${path}.slug`, errors, 120, true) ?? "";
     const title = textValue(raw2.title, `${path}.title`, errors, MAX_TEXT, true) ?? "";
-    if (id6 && !ID3.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
+    if (id6 && !ID4.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
     if (slug && !SLUG2.test(slug)) errors.push(`${path}.slug must be a lowercase URL slug`);
     if (ids2.has(id6) || knownParentIds.has(id6)) errors.push(`${path}.id duplicates page "${id6}"`);
     if (slugs.has(slug) || (options.parentPages ?? []).some((page) => page.slug === slug)) errors.push(`${path}.slug duplicates "${slug}"`);
@@ -7975,7 +8209,7 @@ async function deliverAdmissionGrants(options) {
 }
 
 // src/worker-routes-network-admission.ts
-var PATH4 = "/api/admin/network/admissions";
+var PATH5 = "/api/admin/network/admissions";
 var RETRY_PATH = "/api/admin/network/admissions/retry";
 var REVOKE_PATH = "/api/admin/network/admissions/revoke";
 var MUTATION_ID2 = /^[A-Za-z0-9_-]{16,128}$/;
@@ -8055,11 +8289,11 @@ async function parseBody(req) {
   }
 }
 var handleAdminNetworkAdmissions = async (req, url, env, ctx) => {
-  if (![PATH4, RETRY_PATH, REVOKE_PATH].includes(url.pathname)) return null;
+  if (![PATH5, RETRY_PATH, REVOKE_PATH].includes(url.pathname)) return null;
   const auth = await gate2(req, env, ctx);
   if ("response" in auth) return auth.response;
   const db = auth.db;
-  if (url.pathname === PATH4 && req.method === "GET") {
+  if (url.pathname === PATH5 && req.method === "GET") {
     const targetId2 = url.searchParams.get("targetId") ?? "";
     const target2 = targetFor(ctx, targetId2);
     if (!target2) return reject6(404, "unknown_target", "admission target is not configured");
@@ -8333,10 +8567,10 @@ var handleSchedule = async (req, url, env, ctx) => {
 };
 
 // src/payments-stripe.ts
-var import_stripe10 = require("@odla-ai/stripe");
+var import_stripe11 = require("@odla-ai/stripe");
 
 // src/payments-refund.ts
-var import_stripe7 = require("@odla-ai/stripe");
+var import_stripe9 = require("@odla-ai/stripe");
 var row = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
 var id2 = (value) => typeof value === "string" ? value : String(row(value).id ?? "");
 var providerId2 = (value, prefix) => new RegExp(`^${prefix}_[A-Za-z0-9]+$`).test(value);
@@ -8346,7 +8580,7 @@ function fail6(code = "refund_target_mismatch") {
 async function refundSubscriptionPayment(secretKey, input) {
   if (!providerId2(input.customerId, "cus") || !providerId2(input.subscriptionId, "sub")) fail6();
   const call = async (method, path, params, key3) => {
-    const result = await (0, import_stripe7.stripeRequest)({ secretKey }, method, path, params, key3 ? { idempotencyKey: key3 } : {});
+    const result = await (0, import_stripe9.stripeRequest)({ secretKey }, method, path, params, key3 ? { idempotencyKey: key3 } : {});
     if (!result.ok) fail6("stripe_error");
     if (!result.body || typeof result.body !== "object" || Array.isArray(result.body)) fail6("stripe_invalid_response");
     return result.body;
@@ -8420,35 +8654,13 @@ async function refundSubscriptionPayment(secretKey, input) {
 }
 
 // src/subscription-payment-identity.ts
-var import_stripe9 = require("@odla-ai/stripe");
-
-// src/subscription-provider-contract.ts
-var import_stripe8 = require("@odla-ai/stripe");
-function subscriptionContractMismatch() {
-  throw Object.assign(new Error("Stripe subscription does not match the checkout contract"), { code: "stripe_contract_mismatch" });
-}
-async function verifySubscriptionPrice(secretKey, input, resume = false) {
-  if (!/^price_[A-Za-z0-9]+$/.test(input.priceId) || !Number.isSafeInteger(input.priceCents) || input.priceCents <= 0 || !/^[a-z]{3}$/.test(input.currency) || !["month", "year"].includes(input.interval)) subscriptionContractMismatch();
-  const result = await (0, import_stripe8.stripeRequest)({ secretKey }, "GET", `/v1/prices/${encodeURIComponent(input.priceId)}`);
-  const price = result.body;
-  if (!result.ok || !price || price.id !== input.priceId || !resume && price.active !== true || price.unit_amount !== input.priceCents || price.currency !== input.currency || price.type !== "recurring" || price.billing_scheme !== "per_unit" || price.custom_unit_amount || price.transform_quantity || price.recurring?.interval !== input.interval || price.recurring?.interval_count !== 1 || price.recurring?.usage_type !== "licensed" || price.livemode !== (input.environment === "prod")) subscriptionContractMismatch();
-  return typeof price.product === "string" ? price.product : void 0;
-}
-function verifySubscriptionResult(sub, input, customerId, metadata) {
-  const items = sub?.items;
-  if (!sub || !/^sub_[A-Za-z0-9]+$/.test(sub.id) || sub.customer !== customerId || input.existingSubscriptionId && sub.id !== input.existingSubscriptionId || !(input.billingTerms?.initialTermEndsAt ? ["incomplete", "active", "trialing"] : ["incomplete", "active"]).includes(sub.status) || sub.livemode !== (input.environment === "prod") || !Object.entries(metadata).every(([key3, value]) => sub.metadata?.[key3] === value) || !Array.isArray(items?.data) || items.has_more !== false || items.data.length !== 1 || items.data[0]?.price?.id !== input.priceId || items.data[0]?.quantity !== 1) subscriptionContractMismatch();
-  const invoice = sub.latest_invoice;
-  if (!invoice || typeof invoice !== "object" || invoice.customer !== customerId || invoice.currency !== input.currency || invoice.total !== subscriptionAmountDue(input) || invoice.billing_reason !== "subscription_create") subscriptionContractMismatch();
-  verifySubscriptionBillingResult(sub, input);
-}
-
-// src/subscription-payment-identity.ts
+var import_stripe10 = require("@odla-ai/stripe");
 var id3 = (value) => typeof value === "string" ? value : String(value?.id ?? "");
 async function tagSubscriptionPayment(secretKey, invoice, customerId, metadata, clientSecret2, applicationId) {
   let paymentId = id3(invoice.payment_intent);
   if (!paymentId) {
     if (!/^in_[A-Za-z0-9]+$/.test(id3(invoice))) subscriptionContractMismatch();
-    const result2 = await (0, import_stripe9.stripeRequest)({ secretKey }, "GET", "/v1/invoice_payments", { invoice: id3(invoice), limit: 100 });
+    const result2 = await (0, import_stripe10.stripeRequest)({ secretKey }, "GET", "/v1/invoice_payments", { invoice: id3(invoice), limit: 100 });
     const list = result2.body;
     if (!result2.ok || list?.has_more !== false || !Array.isArray(list.data) || list.data.length !== 1) subscriptionContractMismatch();
     const link = list.data[0];
@@ -8457,11 +8669,11 @@ async function tagSubscriptionPayment(secretKey, invoice, customerId, metadata,
   }
   if (!/^pi_[A-Za-z0-9]+$/.test(paymentId)) subscriptionContractMismatch();
   const path = `/v1/payment_intents/${paymentId}`;
-  const result = await (0, import_stripe9.stripeRequest)({ secretKey }, "GET", path);
+  const result = await (0, import_stripe10.stripeRequest)({ secretKey }, "GET", path);
   const payment = result.body;
   if (!result.ok || payment?.id !== paymentId || id3(payment.customer) !== customerId || payment.amount !== invoice.total || payment.currency !== invoice.currency || payment.client_secret !== clientSecret2 || payment.livemode !== (metadata.odlaEnvironment === "prod") || !Object.entries(metadata).every(([key3, value]) => payment.metadata?.[key3] === void 0 || payment.metadata[key3] === value)) subscriptionContractMismatch();
   if (Object.entries(metadata).every(([key3, value]) => payment.metadata?.[key3] === value)) return;
-  const tagged = await (0, import_stripe9.stripeRequest)(
+  const tagged = await (0, import_stripe10.stripeRequest)(
     { secretKey },
     "POST",
     path,
@@ -8473,7 +8685,7 @@ async function tagSubscriptionPayment(secretKey, invoice, customerId, metadata,
 
 // src/payments-stripe.ts
 async function stripeCall(sk, method, path, params, idempotencyKey) {
-  return (0, import_stripe10.stripeRequest)(
+  return (0, import_stripe11.stripeRequest)(
     { secretKey: sk },
     method,
     path,
@@ -8592,7 +8804,7 @@ function createStripeProvider(config) {
       return { customerId, subscriptionId: String(sub.body.id), clientSecret: clientSecret2 };
     },
     async ingestWebhook(rawBody, sigHeader) {
-      if (!webhookSecret || !await (0, import_stripe10.verifyStripeSignature)(rawBody, sigHeader, webhookSecret)) {
+      if (!webhookSecret || !await (0, import_stripe11.verifyStripeSignature)(rawBody, sigHeader, webhookSecret)) {
         return { ok: false, reason: "bad_signature" };
       }
       const event = JSON.parse(rawBody);
@@ -10260,6 +10472,7 @@ function dashboardMetricData(points, now) {
 }
 
 // src/chapter-billing-amount.ts
+var hasProviderDiscount = (sub, items) => Boolean(sub?.discount || Array.isArray(sub?.discounts) && sub.discounts.length || items.some((it) => it.discounts?.length));
 function chapterBillingAmount(sub, intent, env) {
   const unknown = { amountCents: null, listAmountCents: null, interval: "year", annualCents: null };
   const items = sub?.items?.data;
@@ -10276,10 +10489,11 @@ function chapterBillingAmount(sub, intent, env) {
       const primary = items.filter((it) => it.price?.id === intent.priceId);
       if (primary.length !== 1 || primary[0].quantity !== 1 || primary[0].price.unit_amount !== intent.priceCents || intent.interval !== interval || intent.currency !== "usd") return { ...unknown, listAmountCents, interval };
       if (terms2?.discount?.duration === "forever") amountCents = listAmountCents - intent.priceCents + Math.round(intent.priceCents * (1e4 - terms2.discount.percentOffBps) / 1e4);
+      else if (hasProviderDiscount(sub, items)) amountCents = null;
     } catch {
       amountCents = null;
     }
-  } else if (sub?.discount || Array.isArray(sub?.discounts) && sub.discounts.length || items.some((it) => it.discounts?.length)) amountCents = null;
+  } else if (hasProviderDiscount(sub, items)) amountCents = null;
   return { amountCents, listAmountCents, interval, annualCents: amountCents === null ? null : amountCents * (interval === "month" ? 12 : 1) };
 }
 function chapterBillingActive(sub, app) {
@@ -12858,7 +13072,7 @@ async function revealNetworkPersonRegistryRecord(db, input, mutationId, actor, n
 }
 
 // src/worker-routes-network-person-registry.ts
-var PATH5 = "/api/admin/network-person-registry";
+var PATH6 = "/api/admin/network-person-registry";
 var MAX_BODY2 = 8 * 1024 * 1024;
 var MUTATION_ID4 = /^[A-Za-z0-9_-]{16,128}$/;
 var positiveRevision = (value) => {
@@ -12883,7 +13097,7 @@ function registryError(error) {
   return null;
 }
 var handleAdminNetworkPersonRegistry = async (req, url, env, ctx) => {
-  if (url.pathname !== PATH5) return null;
+  if (url.pathname !== PATH6) return null;
   if (!ctx.chapter.networkPersonRegistry) return json({ error: "not found" }, 404);
   if (req.method !== "GET" && req.method !== "POST") return json({ error: "method not allowed" }, 405);
   if (req.method === "POST" && Number(req.headers.get("content-length") ?? 0) > MAX_BODY2) {
@@ -13058,7 +13272,7 @@ var handleAdminNetworkPersonRegistry = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-network-commercial.ts
-var import_stripe11 = require("@odla-ai/stripe");
+var import_stripe12 = require("@odla-ai/stripe");
 
 // src/worker-routes-network-commercial-parity.ts
 var import_db13 = require("@odla-ai/db");
@@ -13434,7 +13648,7 @@ var handleNetworkCommercialStripeWebhook = async (req, url, env, ctx) => {
     return json({ error: "commercial webhook is not configured" }, 503);
   }
   try {
-    const event = await (0, import_stripe11.constructStripeEvent)(body, signature, secret);
+    const event = await (0, import_stripe12.constructStripeEvent)(body, signature, secret);
     const fact = normalizeNetworkCommercialStripeEvent(event, await stripeEventDigest(body));
     if (!fact.eventId || !fact.eventType || !fact.objectId) return json({ error: "Stripe event identity is invalid" }, 400);
     const result = await ingestNetworkCommercialFact(
@@ -13455,7 +13669,7 @@ var handleNetworkCommercialStripeWebhook = async (req, url, env, ctx) => {
       ...result.status === "replayed" && result.resolvedCollision ? { resolvedCollision: true } : {}
     });
   } catch (error) {
-    if (error instanceof import_stripe11.StripeError) return json({ error: error.message, code: error.code }, 400);
+    if (error instanceof import_stripe12.StripeError) return json({ error: error.message, code: error.code }, 400);
     throw error;
   }
 };
@@ -13518,7 +13732,7 @@ var handleAdminNetworkCommercialReadModel = async (req, url, env, ctx) => {
       const secretKey = await getVaultSecret(db, "stripe_secret_key");
       if (!secretKey) return json({ error: "Stripe reconciliation is not configured" }, 503);
       try {
-        const stripe = (0, import_stripe11.initStripe)({ secretKey });
+        const stripe = (0, import_stripe12.initStripe)({ secretKey });
         const [customers, subscriptions, invoices, refunds, payments] = await Promise.all([
           listStripeObjects(stripe, "/v1/customers"),
           listStripeObjects(stripe, "/v1/subscriptions", { status: "all" }),
@@ -13532,7 +13746,7 @@ var handleAdminNetworkCommercialReadModel = async (req, url, env, ctx) => {
           ...reconcileStripeSnapshot(projection2, { customers, subscriptions, invoices, refunds, payments }, ctx.chapter.networkCommercialReadModel.sources)
         });
       } catch (error) {
-        if (error instanceof import_stripe11.StripeError) return json({ error: "Stripe reconciliation failed", code: error.code }, 502);
+        if (error instanceof import_stripe12.StripeError) return json({ error: "Stripe reconciliation failed", code: error.code }, 502);
         return json({ error: "Stripe reconciliation failed" }, 502);
       }
     }
@@ -13629,7 +13843,7 @@ var handleFormation = async (req, url, env, ctx) => {
 var import_db14 = require("@odla-ai/db");
 
 // src/builder-library-validation.ts
-var ID4 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+var ID5 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var APP_ID = /^[a-z0-9][a-z0-9-]{1,62}$/;
 var MAX_RESOURCES = 200;
 var MAX_MARKDOWN3 = 65536;
@@ -13690,7 +13904,7 @@ function resourceValue(value, path, errors) {
   }
   unknownKeys3(raw2, RESOURCE_KEYS, path, errors);
   const id6 = text7(raw2.id, `${path}.id`, errors, 80) ?? "";
-  if (id6 && !ID4.test(id6)) errors.push(`${path}.id must be lowercase kebab-case`);
+  if (id6 && !ID5.test(id6)) errors.push(`${path}.id must be lowercase kebab-case`);
   const kind = text7(raw2.kind, `${path}.kind`, errors) ?? "";
   if (!KINDS.has(kind)) errors.push(`${path}.kind is unsupported`);
   const title = text7(raw2.title, `${path}.title`, errors, 240) ?? "";
@@ -14112,7 +14326,7 @@ var handleAdminBuilderLibrary = async (req, url, env, ctx) => {
 };
 
 // src/membership-cancel-authority.ts
-var import_stripe12 = require("@odla-ai/stripe");
+var import_stripe13 = require("@odla-ai/stripe");
 async function cancelMembershipAtTermEnd(db, target, now, stripeSecret) {
   membershipClock(now);
   const id6 = await networkMembershipId(target);
@@ -14123,14 +14337,14 @@ async function cancelMembershipAtTermEnd(db, target, now, stripeSecret) {
     membershipFail("membership_cancellation_unavailable");
   }
   const path = `/v1/subscriptions/${encodeURIComponent(String(member.providerSubscriptionId))}`;
-  const read2 = await (0, import_stripe12.stripeRequest)({ secretKey: stripeSecret }, "GET", path);
+  const read2 = await (0, import_stripe13.stripeRequest)({ secretKey: stripeSecret }, "GET", path);
   const sub = read2.body;
   if (!read2.ok || sub.id !== member.providerSubscriptionId || sub.customer !== member.providerCustomerId || sub.livemode !== (target.environment === "prod") || !Object.entries({
     ...stripePartitionMetadata(target),
     applicationId: target.applicationId
   }).every(([key3, value]) => sub.metadata?.[key3] === value)) membershipFail("membership_cancellation_provider_mismatch");
   if (sub.status !== "canceled" && sub.cancel_at_period_end !== true) {
-    const write = await (0, import_stripe12.stripeRequest)(
+    const write = await (0, import_stripe13.stripeRequest)(
       { secretKey: stripeSecret },
       "POST",
       path,
@@ -14352,7 +14566,7 @@ async function refundNetworkMembership(db, input, secretKey, now) {
 }
 
 // src/membership-provider-lifecycle.ts
-var import_stripe13 = require("@odla-ai/stripe");
+var import_stripe14 = require("@odla-ai/stripe");
 
 // src/membership-renewal-authority.ts
 async function reconcileMembershipRenewal(db, input, now) {
@@ -14514,7 +14728,7 @@ async function reconcileMembershipBilling(db, input, now, stripeSecretName = "st
     }
     if (fact.subscriptionId !== member.providerSubscriptionId || fact.objectKind !== "subscription") membershipFail("membership_billing_scope_mismatch");
     if (["refund_pending", "refunded", "declined", "canceled", "restarting"].includes(String(member.status))) return receipt();
-    const result = await (0, import_stripe13.stripeRequest)({ secretKey: sk }, "GET", `/v1/subscriptions/${encodeURIComponent(String(member.providerSubscriptionId))}`);
+    const result = await (0, import_stripe14.stripeRequest)({ secretKey: sk }, "GET", `/v1/subscriptions/${encodeURIComponent(String(member.providerSubscriptionId))}`);
     const sub = result.body;
     if (!result.ok || sub.id !== member.providerSubscriptionId || sub.customer !== member.providerCustomerId || sub.livemode !== (input.environment === "prod") || typeof sub.cancel_at_period_end !== "boolean" || !["active", "trialing", "past_due", "unpaid", "canceled"].includes(sub.status) || !Object.entries({ ...stripePartitionMetadata(input), applicationId: input.applicationId }).every(([key3, value]) => sub.metadata?.[key3] === value)) {
       membershipFail("membership_billing_provider_mismatch");
@@ -14630,7 +14844,7 @@ async function reserveNamedMembershipSeat(db, input, now) {
 }
 
 // src/membership-seat-stripe.ts
-var import_stripe14 = require("@odla-ai/stripe");
+var import_stripe15 = require("@odla-ai/stripe");
 var reject7 = () => {
   throw Object.assign(new Error("named seat provider contract mismatch"), { code: "named_seat_provider_mismatch" });
 };
@@ -14642,7 +14856,7 @@ var metadataFor = (seat) => ({
 });
 var matches = (value, expected) => value && Object.entries(expected).every(([key3, item]) => value[key3] === item);
 async function read(sk, path, params) {
-  const response = await (0, import_stripe14.stripeRequest)({ secretKey: sk }, "GET", path, params);
+  const response = await (0, import_stripe15.stripeRequest)({ secretKey: sk }, "GET", path, params);
   if (!response.ok) return reject7();
   return response.body;
 }
@@ -14665,9 +14879,9 @@ async function subscriptionForSeat(sk, seat) {
   if (!Array.isArray(discounts) || discounts.length > 5) reject7();
   for (const discount of discounts) {
     const couponRef = discount.source?.coupon ?? discount.coupon;
-    const couponId2 = typeof couponRef === "string" ? couponRef : couponRef?.id;
-    if (!couponId2 || typeof couponId2 !== "string") reject7();
-    const coupon = await read(sk, `/v1/coupons/${encodeURIComponent(couponId2)}`, { "expand[0]": "applies_to" });
+    const couponId = typeof couponRef === "string" ? couponRef : couponRef?.id;
+    if (!couponId || typeof couponId !== "string") reject7();
+    const coupon = await read(sk, `/v1/coupons/${encodeURIComponent(couponId)}`, { "expand[0]": "applies_to" });
     if (coupon.livemode !== (seat.environment === "prod") || !Array.isArray(coupon.applies_to?.products) || coupon.applies_to.products.length !== 1 || coupon.applies_to.products[0] !== primary.price.product) reject7();
   }
   return sub;
@@ -14679,11 +14893,11 @@ async function createNamedSeatStripePayment(sk, seat, now) {
   }
   await subscriptionForSeat(sk, seat);
   const metadata = metadataFor(seat);
-  const result = seat.providerPaymentIntentId ? await (0, import_stripe14.stripeRequest)(
+  const result = seat.providerPaymentIntentId ? await (0, import_stripe15.stripeRequest)(
     { secretKey: sk },
     "GET",
     `/v1/payment_intents/${encodeURIComponent(seat.providerPaymentIntentId)}`
-  ) : await (0, import_stripe14.stripeRequest)({ secretKey: sk }, "POST", "/v1/payment_intents", {
+  ) : await (0, import_stripe15.stripeRequest)({ secretKey: sk }, "POST", "/v1/payment_intents", {
     amount: seat.amountCents,
     currency: seat.currency,
     customer: seat.providerCustomerId,
@@ -14701,7 +14915,7 @@ async function attachNamedSeatStripeRenewal(sk, seat) {
   const sub = await subscriptionForSeat(sk, seat);
   const existing = sub.items.data.find((item2) => item2.metadata?.seatId === seat.id);
   if (existing) return String(existing.id);
-  const result = await (0, import_stripe14.stripeRequest)({ secretKey: sk }, "POST", "/v1/subscription_items", {
+  const result = await (0, import_stripe15.stripeRequest)({ secretKey: sk }, "POST", "/v1/subscription_items", {
     subscription: seat.providerSubscriptionId,
     price: seat.priceId,
     quantity: 1,
@@ -15153,7 +15367,7 @@ var respond = (body, status2 = 200) => new Response(JSON.stringify(body), {
   status: status2,
   headers: { "content-type": "application/json", "cache-control": "no-store" }
 });
-var SAFE = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
+var SAFE2 = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
 var SAFE_ERROR = /* @__PURE__ */ new Set([
   "offer_identity_conflict",
   "membership_authority_unavailable",
@@ -15201,7 +15415,7 @@ function createMembershipAuthorityHandler(options) {
   if (options.stripeSecretName !== void 0 && !/^[A-Za-z][A-Za-z0-9_-]{1,127}$/.test(options.stripeSecretName)) throw new TypeError("invalid Stripe secret slot");
   const identities = /* @__PURE__ */ new Set();
   for (const peer of peers) {
-    if (!/^[a-z0-9][a-z0-9-]{1,62}$/.test(peer.appId) || !SAFE.test(peer.chapterId) || !/^[a-z0-9][a-z0-9-]{1,31}$/.test(peer.environment) || !/^[a-z0-9]{2,12}$/.test(peer.runtime) || !/^[A-Za-z][A-Za-z0-9_-]{1,127}$/.test(peer.secretName)) throw new TypeError("invalid authority peer");
+    if (!/^[a-z0-9][a-z0-9-]{1,62}$/.test(peer.appId) || !SAFE2.test(peer.chapterId) || !/^[a-z0-9][a-z0-9-]{1,31}$/.test(peer.environment) || !/^[a-z0-9]{2,12}$/.test(peer.runtime) || !/^[A-Za-z][A-Za-z0-9_-]{1,127}$/.test(peer.secretName)) throw new TypeError("invalid authority peer");
     const identity = `${peer.appId}:${peer.runtime}`;
     if (identities.has(identity)) throw new TypeError("ambiguous authority peer");
     identities.add(identity);
@@ -15235,7 +15449,7 @@ function createMembershipAuthorityHandler(options) {
       try {
         input = JSON.parse(verified.body);
         const fields = action === "seat-invitation" ? MEMBERSHIP_SEAT_ACTION_FIELDS[action] : action === "offer-preview" ? ["skuId"] : ["applicationId", "skuId", ...action === "offers" ? ["requestId"] : action === "checkouts" ? ["offerId", "offerDigest", "quoteDigest", "priceId"] : action === "payments" ? ["eventId", "providerSubscriptionId", "providerCustomerId"] : action === "renewals" ? ["eventId"] : action === "restarts" ? ["previousSubscriptionId"] : MEMBERSHIP_SEAT_ACTION_FIELDS[action] ?? []];
-        if (!input || typeof input !== "object" || Array.isArray(input) || Object.keys(input).some((key3) => !fields.includes(key3)) || !fields.every((key3) => typeof input[key3] === "string" && (["recipientName", "recipientEmail", "purchaserEmail", "verifiedRecipientEmail"].includes(key3) ? input[key3].length > 0 && input[key3].length <= 254 && !/[\u0000-\u001f\u007f]/.test(input[key3]) : SAFE.test(input[key3])))) {
+        if (!input || typeof input !== "object" || Array.isArray(input) || Object.keys(input).some((key3) => !fields.includes(key3)) || !fields.every((key3) => typeof input[key3] === "string" && (["recipientName", "recipientEmail", "purchaserEmail", "verifiedRecipientEmail"].includes(key3) ? input[key3].length > 0 && input[key3].length <= 254 && !/[\u0000-\u001f\u007f]/.test(input[key3]) : SAFE2.test(input[key3])))) {
           throw new TypeError("invalid request");
         }
       } catch {
@@ -15572,7 +15786,7 @@ function createMembershipAuthorityStorage(db, secretNames) {
 }
 
 // src/membership-seat-cancel.ts
-var import_stripe15 = require("@odla-ai/stripe");
+var import_stripe16 = require("@odla-ai/stripe");
 async function cancelUnpaidNamedSeat(db, target, secretKey, now) {
   membershipClock(now);
   const state = await loadMembershipAuthorityState(db, target);
@@ -15600,7 +15814,7 @@ async function cancelUnpaidNamedSeat(db, target, secretKey, now) {
   }
   const metadata = { ...stripePartitionMetadata(target), applicationId: target.applicationId, membershipId: seat.primaryMembershipId, seatId: seat.id };
   const request = async (method, path, params) => {
-    const result = await (0, import_stripe15.stripeRequest)(
+    const result = await (0, import_stripe16.stripeRequest)(
       { secretKey },
       method,
       path,
@@ -15613,7 +15827,7 @@ async function cancelUnpaidNamedSeat(db, target, secretKey, now) {
   let payment;
   if (seat.providerPaymentIntentId) payment = await request("GET", `/v1/payment_intents/${encodeURIComponent(String(seat.providerPaymentIntentId))}`);
   else {
-    const snapshot = await listStripeObjects((0, import_stripe15.initStripe)({ secretKey }), "/v1/payment_intents", { customer: String(seat.providerCustomerId) });
+    const snapshot = await listStripeObjects((0, import_stripe16.initStripe)({ secretKey }), "/v1/payment_intents", { customer: String(seat.providerCustomerId) });
     const matches2 = snapshot.objects.filter((row2) => row2.metadata?.seatId === target.seatId);
     if (!snapshot.complete || matches2.length !== 1) throw new Error("seat payment creation outcome unresolved");
     payment = matches2[0];
@@ -16459,6 +16673,7 @@ var BUILTIN_ROUTES = [
   handleAdminNamedSeat,
   handleAdminMembershipSeats,
   handleAdminMembershipPolicyVersions,
+  handleAdminMembershipReterm,
   handleAdminMeetings,
   handleAdminScheduling,
   // Roster + identity