@odla-ai/chapter 0.30.0 → 0.31.0

package/dist/worker/index.cjs

@@ -136,7 +136,7 @@ function createWorkerContext(options) {
 }
 
 // src/worker-routes.ts
-var import_crm2 = require("@odla-ai/crm");
+var import_crm3 = require("@odla-ai/crm");
 
 // src/discussion-reference-security.ts
 async function authorizeCrmDiscussionReference(req, env, fetcher = fetch) {
@@ -180,6 +180,9 @@ async function authorizeCrmDiscussionReference(req, env, fetcher = fetch) {
   }
 }
 
+// src/member.ts
+var import_crm = require("@odla-ai/crm");
+
 // src/application-id.ts
 var APPLICATION_ID_DOMAIN = "odla-ai/chapter/application/v1:";
 async function applicationIdForSubmission(submissionId) {
@@ -218,7 +221,9 @@ function applicantProfile(chapter, fields) {
 }
 async function submitApplication(db, chapter, fields, opts) {
   const app = chapter.application;
-  for (const f of app.required) {
+  const fieldStates = (0, import_crm.resolveFieldStates)(app.conditions ?? {}, fields, app.required);
+  for (const [f, state] of Object.entries(fieldStates)) {
+    if (!state.required) continue;
     const v = fields[f];
     if (typeof v !== "string" || v.trim() === "") return { ok: false, error: `${f} is required` };
   }
@@ -237,10 +242,17 @@ async function submitApplication(db, chapter, fields, opts) {
   const id = opts.submissionId ? await applicationIdForSubmission(opts.submissionId) : opts.newId();
   const row = { id, status: chapter.pipeline.initial, createdAt: opts.now };
   for (const f of [...app.required, ...app.optional]) {
+    if (fieldStates[f]?.visible === false) continue;
     if (typeof fields[f] === "string") row[f] = fields[f].trim();
   }
   if (fields.focus !== void 0) row.focus = clampArray(fields.focus, app.maxArrayLen);
   if (opts.groupId) row.groupId = opts.groupId;
+  if (typeof fields.tierId === "string" && fields.tierId) {
+    if (opts.tierIds && !opts.tierIds.includes(fields.tierId)) {
+      return { ok: false, error: "tierId is not an offered tier" };
+    }
+    row.tierId = fields.tierId;
+  }
   if (acked) row.disclaimerAckAt = opts.now;
   const { duplicate } = await db.transact(
     [{ t: "update", ns: "applications", id, attrs: row }],
@@ -248,12 +260,15 @@ async function submitApplication(db, chapter, fields, opts) {
   );
   return { ok: true, id, duplicate, status: chapter.pipeline.initial, disclaimerAckAt: acked ? opts.now : null };
 }
-function joinConfig(group, paymentsReady) {
+function joinConfig(group, paymentsReady, tiers = [], conditions = {}) {
   return {
     id: group.id,
     name: group.name,
     standardPriceCents: group.standardPriceCents ?? 0,
     foundingDiscountCents: group.foundingDiscountCents ?? 0,
+    tiers: [...tiers],
+    // The browser evaluates the same conditions the server enforces.
+    conditions,
     disclaimerText: group.disclaimerText ?? "",
     refundPolicyText: group.refundPolicyText ?? "",
     trustCopy: group.trustCopy ?? "",
@@ -263,6 +278,79 @@ function joinConfig(group, paymentsReady) {
   };
 }
 
+// src/tiers.ts
+function tierIsFree(tier) {
+  return !(tier.priceCents > 0) && !tier.stripePriceId;
+}
+function tierPayable(tier, group, hasSecretKey) {
+  if (tierIsFree(tier)) return true;
+  return Boolean(group.stripePublishableKey && tier.stripePriceId && hasSecretKey);
+}
+function byOrder(a, b) {
+  return a.sortOrder - b.sortOrder || a.id.localeCompare(b.id);
+}
+function resolveTiers(group, rows2 = []) {
+  const stored = rows2.filter((tier) => tier.active);
+  if (stored.length) return [...stored].sort(byOrder);
+  return [{
+    id: "standard",
+    groupId: String(group.id ?? ""),
+    name: "Membership",
+    priceCents: group.standardPriceCents ?? 0,
+    ...group.stripePriceId ? { stripePriceId: group.stripePriceId } : {},
+    sortOrder: 0,
+    active: true
+  }];
+}
+function offerableTiers(tiers, group, hasSecretKey) {
+  return tiers.filter((tier) => tier.active && tierPayable(tier, group, hasSecretKey));
+}
+function findTier(tiers, tierId) {
+  if (!tierId) return tiers.length === 1 ? tiers[0] : null;
+  return tiers.find((tier) => tier.id === tierId) ?? null;
+}
+function joinConfigTiers(tiers) {
+  return tiers.map((tier) => ({
+    id: tier.id,
+    name: tier.name,
+    priceCents: tier.priceCents,
+    blurb: tier.blurb ?? "",
+    free: tierIsFree(tier)
+  }));
+}
+
+// src/tiers-store.ts
+function rowToTier(row, groupId) {
+  return {
+    id: String(row.id ?? ""),
+    groupId: String(row.groupId ?? groupId),
+    name: String(row.name ?? ""),
+    priceCents: typeof row.priceCents === "number" ? row.priceCents : 0,
+    ...typeof row.stripePriceId === "string" && row.stripePriceId ? { stripePriceId: row.stripePriceId } : {},
+    ...typeof row.blurb === "string" ? { blurb: row.blurb } : {},
+    sortOrder: typeof row.sortOrder === "number" ? row.sortOrder : 0,
+    // A row that never set `active` is offered; only an explicit false retires
+    // a tier, so a half-seeded row cannot silently hide a membership.
+    active: row.active !== false
+  };
+}
+async function loadTiers(db, group) {
+  const groupId = String(group.id ?? "");
+  let rows2;
+  try {
+    rows2 = (await db.query({
+      tiers: { $: { where: { groupId }, order: { sortOrder: "asc" }, limit: 100 } }
+    })).tiers;
+  } catch {
+    rows2 = void 0;
+  }
+  const list = Array.isArray(rows2) ? rows2.map((row) => rowToTier(row, groupId)) : [];
+  return resolveTiers(group, list);
+}
+async function loadOfferableTiers(db, group, hasSecretKey) {
+  return offerableTiers(await loadTiers(db, group), group, hasSecretKey);
+}
+
 // src/scheduling.ts
 var SCHEDULING_DEFAULTS = {
   slotMinutes: 45,
@@ -492,7 +580,7 @@ async function createClerkUser(secretKey, input, fetchImpl = fetch) {
 }
 
 // src/network.ts
-var import_crm = require("@odla-ai/crm");
+var import_crm2 = require("@odla-ai/crm");
 
 // src/network-contract.ts
 var DEFAULT_SHARE_FIELDS = {
@@ -594,14 +682,14 @@ async function upsertPerson(deps, opts) {
   const { crm_record } = await deps.db.query({ crm_record: { $: { where: { type: "person", primaryEmail: email }, limit: 1 } } });
   const existing = crm_record?.[0];
   if (existing && typeof existing.id === "string") {
-    await (0, import_crm.updateRecord)(crmDeps3, { id: existing.id, input: opts.input });
+    await (0, import_crm2.updateRecord)(crmDeps3, { id: existing.id, input: opts.input });
     return { recordId: existing.id };
   }
-  const created = await (0, import_crm.createRecord)(crmDeps3, { type: "person", input: opts.input, mutationId: opts.mutationId });
+  const created = await (0, import_crm2.createRecord)(crmDeps3, { type: "person", input: opts.input, mutationId: opts.mutationId });
   return { recordId: created.id };
 }
 async function findSharedRecord(deps, record, tag) {
-  const structured = await (0, import_crm.getRecordByOrigin)(
+  const structured = await (0, import_crm2.getRecordByOrigin)(
     { crm: deps.crm, db: deps.db, now: deps.now, newId: deps.newId },
     record.sourceId,
     record.sourceRecordId
@@ -653,11 +741,11 @@ async function projectSharedRecord(deps, shared, options = {}) {
   const existing = await findSharedRecord(deps, record, tag);
   let recordId;
   if (existing && typeof existing.id === "string") {
-    await (0, import_crm.updateRecord)(crmDeps3, { id: existing.id, input: record.input });
+    await (0, import_crm2.updateRecord)(crmDeps3, { id: existing.id, input: record.input });
     recordId = existing.id;
   } else {
     recordId = `network_${shortHash(`${record.sourceId}\0${record.type}\0${record.sourceRecordId}`)}`;
-    await (0, import_crm.createRecord)({ ...crmDeps3, newId: () => recordId }, {
+    await (0, import_crm2.createRecord)({ ...crmDeps3, newId: () => recordId }, {
       type: record.type,
       input: record.input,
       mutationId: `share-create:${tag}`
@@ -667,7 +755,7 @@ async function projectSharedRecord(deps, shared, options = {}) {
     [{ t: "update", ns: "crm_tag", id: tag, attrs: { key: `${recordId}:${tag}`, recordId, tag, createdAt: deps.now() } }],
     { mutationId: `share-map:${tag}:${recordId}` }
   );
-  await (0, import_crm.upsertRecordOrigin)(crmDeps3, {
+  await (0, import_crm2.upsertRecordOrigin)(crmDeps3, {
     recordId,
     sourceId: record.sourceId,
     sourceRecordId: record.sourceRecordId,
@@ -982,7 +1070,7 @@ var handleCrm = async (req, url, env, ctx) => {
   const crmBase = ctx.crmBase;
   if (url.pathname !== crmBase && !url.pathname.startsWith(crmBase + "/")) return null;
   const db = ctx.makeDb(env);
-  const routes = (0, import_crm2.createCrmRoutes)({
+  const routes = (0, import_crm3.createCrmRoutes)({
     crm: ctx.chapter.crm,
     db,
     authorize: async (r) => {
@@ -1012,7 +1100,15 @@ var handleMember = async (req, url, env, ctx) => {
     if (!group) return json({ error: "not found" }, 404);
     const stripeKey = await getVaultSecret(db, "stripe_secret_key");
     const paymentsReady = Boolean(group.stripePublishableKey && group.stripePriceId && stripeKey);
-    return json({ ...joinConfig(group, paymentsReady), copy: chapter.copy.join });
+    const offered = await loadOfferableTiers(
+      db,
+      group,
+      Boolean(stripeKey)
+    );
+    return json({
+      ...joinConfig(group, paymentsReady, joinConfigTiers(offered), chapter.application.conditions),
+      copy: chapter.copy.join
+    });
   }
   if (req.method === "GET" && url.pathname === "/api/join/resume") {
     const applicationId = url.searchParams.get("application") ?? "";
@@ -1051,9 +1147,11 @@ var handleMember = async (req, url, env, ctx) => {
     const group = Array.isArray(groups) ? groups[0] : void 0;
     if (!group) return json({ error: "not found" }, 404);
     const stripeKey = await getVaultSecret(db, "stripe_secret_key");
-    const paymentsReady = Boolean(group.stripePublishableKey && group.stripePriceId && stripeKey);
     const status = String(app.status ?? "");
-    if (!paymentsReady) return json({ state: "booking", applicationId });
+    const offered = await loadOfferableTiers(db, group, Boolean(stripeKey));
+    const tier = findTier(offered, typeof app.tierId === "string" ? app.tierId : null);
+    const payable = Boolean(tier) && !tierIsFree(tier) && tierPayable(tier, group, Boolean(stripeKey));
+    if (!payable) return json({ state: "booking", applicationId });
     if (status === chapter.pipeline.initial && app.stripeSubscriptionId) {
       return json({ state: "paymentPending", applicationId });
     }
@@ -1072,11 +1170,13 @@ var handleMember = async (req, url, env, ctx) => {
     }
     const submissionId = typeof parsed.submissionId === "string" ? parsed.submissionId : void 0;
     const db = ctx.makeDb(env);
+    const offeredTierIds = typeof parsed.tierId === "string" && parsed.tierId ? (await loadTiers(db, { id: chapter.id })).map((tier) => tier.id) : void 0;
     const result = await submitApplication(db, chapter, parsed, {
       submissionId,
       groupId: chapter.id,
       now: Date.now(),
-      newId: () => crypto.randomUUID()
+      newId: () => crypto.randomUUID(),
+      ...offeredTierIds ? { tierIds: offeredTierIds } : {}
     });
     if (!result.ok) return json({ error: result.error }, 400);
     if (!result.duplicate) {
@@ -1154,7 +1254,7 @@ var handleNetworkShared = async (req, url, env, ctx) => {
 };
 
 // src/crm-sync.ts
-var import_crm3 = require("@odla-ai/crm");
+var import_crm4 = require("@odla-ai/crm");
 var str = (v) => typeof v === "string" ? v : v == null ? "" : String(v);
 var crmDeps = (db, ctx) => ({
   crm: ctx.chapter.crm,
@@ -1201,16 +1301,16 @@ async function syncApplicationToCrm(deps, opts) {
   let recordId;
   if (existing && typeof existing.id === "string") {
     recordId = existing.id;
-    await (0, import_crm3.updateRecord)(recordDeps, { id: recordId, input });
+    await (0, import_crm4.updateRecord)(recordDeps, { id: recordId, input });
   } else {
-    const created = await (0, import_crm3.createRecord)(recordDeps, { type: "person", input, ...stage ? { stage } : {} });
+    const created = await (0, import_crm4.createRecord)(recordDeps, { type: "person", input, ...stage ? { stage } : {} });
     recordId = created.id;
   }
   if (existing && stage && existing.stage !== stage) {
-    await (0, import_crm3.setStage)(recordDeps, { id: recordId, to: stage, authorId: "system", mutationId: `crm:stage:${recordId}:${stage}` }).catch(() => void 0);
+    await (0, import_crm4.setStage)(recordDeps, { id: recordId, to: stage, authorId: "system", mutationId: `crm:stage:${recordId}:${stage}` }).catch(() => void 0);
   }
   await deps.db.transact([{ t: "update", ns: "crm_record", id: recordId, attrs: billingColumns(opts.app) }]);
-  await (0, import_crm3.linkIdentity)(recordDeps, { recordId, email: emailKey, mutationId: `crm:link:${recordId}:${emailKey}` }).catch(() => void 0);
+  await (0, import_crm4.linkIdentity)(recordDeps, { recordId, email: emailKey, mutationId: `crm:link:${recordId}:${emailKey}` }).catch(() => void 0);
   return recordId;
 }
 async function backfillCrm(deps) {
@@ -1660,9 +1760,16 @@ async function startSubscription(req, env, ctx) {
   if (!app) return json({ error: "not found" }, 404);
   if (app.status !== "submitted") return json({ error: "already processed" }, 409);
   const group = await firstRow2(db, "groups", { where: { id: String(app.groupId ?? ctx.chapter.id) }, limit: 1 });
-  const priceId = group?.stripePriceId;
   const secretKey = await getVaultSecret(db, "stripe_secret_key");
-  if (!group || !priceId || !secretKey) return json({ error: "payments not configured" }, 503);
+  if (!group || !secretKey) return json({ error: "payments not configured" }, 503);
+  const tier = findTier(
+    await loadTiers(db, group),
+    typeof app.tierId === "string" ? app.tierId : null
+  );
+  if (!tier) return json({ error: "tier not found", code: "tier_unresolved" }, 400);
+  if (tierIsFree(tier)) return json({ error: "tier is free", code: "tier_not_payable" }, 409);
+  const priceId = tier.stripePriceId;
+  if (!priceId) return json({ error: "payments not configured" }, 503);
   const provider = createStripeProvider({ secretKey });
   let result;
   try {
@@ -2637,7 +2744,7 @@ var handleAdminComms = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-network.ts
-var import_crm5 = require("@odla-ai/crm");
+var import_crm6 = require("@odla-ai/crm");
 var import_db4 = require("@odla-ai/db");
 
 // src/worker-network-fetch.ts
@@ -2655,7 +2762,7 @@ function fetchNetworkTarget(env, target, destination, init) {
 }
 
 // src/worker-network-push.ts
-var import_crm4 = require("@odla-ai/crm");
+var import_crm5 = require("@odla-ai/crm");
 var import_db3 = require("@odla-ai/db");
 async function pushNetworkRecord(db, env, ctx, target, record) {
   const secret = await getVaultSecret(db, target.secretName);
@@ -2667,7 +2774,7 @@ async function pushNetworkRecord(db, env, ctx, target, record) {
   };
   if (!secret) {
     const error = `vault secret "${target.secretName}" is missing`;
-    await (0, import_crm4.recordDeliveryAttempt)(crmDeps3, {
+    await (0, import_crm5.recordDeliveryAttempt)(crmDeps3, {
       recordId: record.id,
       targetId: target.id,
       status: "failed",
@@ -2706,7 +2813,7 @@ async function pushNetworkRecord(db, env, ctx, target, record) {
     const responseBody = await res.json().catch(() => ({}));
     if (!res.ok) {
       const error = responseBody.error ?? "follower rejected the record";
-      await (0, import_crm4.recordDeliveryAttempt)(crmDeps3, {
+      await (0, import_crm5.recordDeliveryAttempt)(crmDeps3, {
         recordId: record.id,
         targetId: target.id,
         status: "failed",
@@ -2721,7 +2828,7 @@ async function pushNetworkRecord(db, env, ctx, target, record) {
         error
       };
     }
-    await (0, import_crm4.recordDeliveryAttempt)(crmDeps3, {
+    await (0, import_crm5.recordDeliveryAttempt)(crmDeps3, {
       recordId: record.id,
       targetId: target.id,
       status: "delivered",
@@ -2737,7 +2844,7 @@ async function pushNetworkRecord(db, env, ctx, target, record) {
     };
   } catch (err) {
     const error = err instanceof Error ? err.message : "delivery failed";
-    await (0, import_crm4.recordDeliveryAttempt)(crmDeps3, {
+    await (0, import_crm5.recordDeliveryAttempt)(crmDeps3, {
       recordId: record.id,
       targetId: target.id,
       status: "failed",
@@ -2778,7 +2885,7 @@ var handleNetworkSnapshot = async (req, url, env, ctx) => {
   const verified = await (0, import_db4.verifyFederatedRequest)(req, { secret });
   if (!verified.ok) return json({ error: "unauthorized", reason: verified.reason }, 401);
   const types = await Promise.all(
-    Object.keys(ctx.chapter.crm.config.types).map((type) => (0, import_crm5.typeSummary)({ crm: ctx.chapter.crm, db }, type))
+    Object.keys(ctx.chapter.crm.config.types).map((type) => (0, import_crm6.typeSummary)({ crm: ctx.chapter.crm, db }, type))
   );
   const snapshot = {
     version: 1,
@@ -2876,7 +2983,7 @@ var handleAdminNetworkPush = async (req, url, env, ctx) => {
   if (requested.size !== body.targetIds.length) return json({ error: "targetIds must contain unique strings" }, 400);
   const targets = ctx.chapter.network.targets.filter((target) => requested.has(target.id));
   if (targets.length !== requested.size) return json({ error: "one or more targetIds are not configured" }, 400);
-  const record = await (0, import_crm5.getRecord)({ crm: ctx.chapter.crm, db: got.db }, body.recordId);
+  const record = await (0, import_crm6.getRecord)({ crm: ctx.chapter.crm, db: got.db }, body.recordId);
   if (!record) return json({ error: "record not found" }, 404);
   const results = await Promise.all(
     targets.map((target) => pushNetworkRecord(got.db, env, ctx, target, record))
@@ -2885,7 +2992,7 @@ var handleAdminNetworkPush = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-network-records.ts
-var import_crm6 = require("@odla-ai/crm");
+var import_crm7 = require("@odla-ai/crm");
 var import_db5 = require("@odla-ai/db");
 var IDENTIFIER = /^[a-z][a-zA-Z0-9_]*$/;
 var MAX_PAGE = 50;
@@ -2939,7 +3046,7 @@ var handleNetworkRecords = async (req, url, env, ctx) => {
   if (limit == null || offset == null || search.length > MAX_SEARCH) {
     return json({ error: "invalid pagination or search parameters" }, 400);
   }
-  const page = await (0, import_crm6.listRecords)(
+  const page = await (0, import_crm7.listRecords)(
     { crm: ctx.chapter.crm, db },
     {
       type,
@@ -3103,7 +3210,7 @@ var handleAdminNetworkNotes = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-network-shared-notes.ts
-var import_crm7 = require("@odla-ai/crm");
+var import_crm8 = require("@odla-ai/crm");
 var import_db6 = require("@odla-ai/db");
 var IDENTIFIER3 = /^[a-z][a-zA-Z0-9_]*$/;
 var RECORD_ID2 = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,255}$/;
@@ -3133,7 +3240,7 @@ function sharedNote(activity, sourceId) {
 }
 async function listSharedNotes(db, sourceId, recordId) {
   const result = await db.query({
-    [import_crm7.CRM_NS.activity]: {
+    [import_crm8.CRM_NS.activity]: {
       $: {
         where: {
           and: [
@@ -3146,7 +3253,7 @@ async function listSharedNotes(db, sourceId, recordId) {
       }
     }
   });
-  return (result[import_crm7.CRM_NS.activity] ?? []).flatMap((activity) => {
+  return (result[import_crm8.CRM_NS.activity] ?? []).flatMap((activity) => {
     const note = sharedNote(activity, sourceId);
     return note ? [note] : [];
   });
@@ -3174,7 +3281,7 @@ var handleNetworkSharedNotes = async (req, url, env, ctx) => {
   if (!IDENTIFIER3.test(recordType) || !RECORD_ID2.test(recordId) || !reader?.sharedNotes.includes(recordType)) {
     return json({ error: "shared notes are not enabled for this reader and record type" }, 403);
   }
-  const record = await (0, import_crm7.getRecord)({ crm: ctx.chapter.crm, db }, recordId);
+  const record = await (0, import_crm8.getRecord)({ crm: ctx.chapter.crm, db }, recordId);
   if (!record || record.type !== recordType) return json({ error: "record not found" }, 404);
   if (req.method === "GET") {
     return json({
@@ -3196,7 +3303,7 @@ var handleNetworkSharedNotes = async (req, url, env, ctx) => {
   }
   const createdAt = Date.now();
   const id = `network:${verified.sender}:${mutationId}`;
-  const result = await (0, import_crm7.addActivity)(
+  const result = await (0, import_crm8.addActivity)(
     {
       crm: ctx.chapter.crm,
       db,
@@ -3287,7 +3394,7 @@ var handleAdminNetworkSharedNotes = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-formation.ts
-var import_crm8 = require("@odla-ai/crm");
+var import_crm9 = require("@odla-ai/crm");
 
 // src/formation.ts
 function formationFields(crm, formation) {
@@ -3353,7 +3460,7 @@ var handleFormation = async (req, url, env, ctx) => {
   const db = ctx.makeDb(env);
   const id = submissionId ? await applicationIdForSubmission(`formation:${ctx.chapter.id}:${submissionId}`) : crypto.randomUUID();
   try {
-    const created = await (0, import_crm8.createRecord)(
+    const created = await (0, import_crm9.createRecord)(
       {
         crm: ctx.chapter.crm,
         db,