@odla-ai/chapter 0.23.0 → 0.24.0

package/dist/worker/index.d.cts

@@ -15,7 +15,14 @@ interface ChapterCopy {
     join: {
         form: TextFields<"submit" | "submitting" | "submitFailed" | "unexpectedFailure">;
         booking: TextFields<"unavailable" | "loadFailed" | "slotTaken" | "failed" | "loading" | "book" | "booking">;
-        payment: TextFields<"setupFailed" | "preparing" | "pending" | "processing" | "payAndContinue" | "incomplete">;
+        /**
+         * `consent` is the affirmative statement a member agrees to before the card
+         * form appears, rendered beside the checkbox and beneath the policy text.
+         * It is what the member is shown at the moment of consent, so it says they
+         * agree rather than merely restating the policy. Set it to an empty string
+         * to render the checkbox with the policy as its only label.
+         */
+        payment: TextFields<"setupFailed" | "preparing" | "pending" | "processing" | "payAndContinue" | "incomplete" | "consent">;
         done: TextFields<"label" | "calendarInvite" | "memberArea">;
     };
     members: {

package/dist/worker/index.d.ts

@@ -15,7 +15,14 @@ interface ChapterCopy {
     join: {
         form: TextFields<"submit" | "submitting" | "submitFailed" | "unexpectedFailure">;
         booking: TextFields<"unavailable" | "loadFailed" | "slotTaken" | "failed" | "loading" | "book" | "booking">;
-        payment: TextFields<"setupFailed" | "preparing" | "pending" | "processing" | "payAndContinue" | "incomplete">;
+        /**
+         * `consent` is the affirmative statement a member agrees to before the card
+         * form appears, rendered beside the checkbox and beneath the policy text.
+         * It is what the member is shown at the moment of consent, so it says they
+         * agree rather than merely restating the policy. Set it to an empty string
+         * to render the checkbox with the policy as its only label.
+         */
+        payment: TextFields<"setupFailed" | "preparing" | "pending" | "processing" | "payAndContinue" | "incomplete" | "consent">;
         done: TextFields<"label" | "calendarInvite" | "memberArea">;
     };
     members: {

package/dist/worker/index.js

@@ -921,6 +921,93 @@ var handleMember = async (req, url, env, ctx) => {
   return null;
 };
 
+// src/crm-sync.ts
+import { createRecord as createRecord2, updateRecord as updateRecord2, setStage, linkIdentity } from "@odla-ai/crm";
+var str = (v) => typeof v === "string" ? v : v == null ? "" : String(v);
+var crmDeps = (db, ctx) => ({
+  crm: ctx.chapter.crm,
+  db,
+  now: () => Date.now(),
+  newId: () => crypto.randomUUID(),
+  chapter: ctx.chapter
+});
+function personInputFromApp(chapter, app) {
+  const input = sharedPersonInput({
+    email: str(app.email),
+    firstName: str(app.firstName) || void 0,
+    lastName: str(app.lastName) || void 0,
+    phone: str(app.phone) || void 0,
+    linkedin: str(app.linkedin) || void 0,
+    hubRecordId: str(app.id)
+  });
+  for (const f of chapter.application.crmFields) {
+    if (app[f] !== void 0) input[f] = app[f];
+  }
+  if (app.id !== void 0) input.applicationId = str(app.id);
+  return input;
+}
+function billingColumns(app) {
+  const status = str(app.status);
+  const paid = Boolean(app.stripeSubscriptionId) && status !== "refunded";
+  const billingStatus = status === "refunded" ? "refunded" : app.canceled === true ? "canceled" : paid ? "active" : "none";
+  const cols = { billingStatus };
+  if (app.stripeCustomerId) cols.stripeCustomerId = str(app.stripeCustomerId);
+  if (app.stripeSubscriptionId) cols.subscriptionId = str(app.stripeSubscriptionId);
+  if (typeof app.renewalAt === "number") cols.renewalAt = app.renewalAt;
+  return cols;
+}
+async function syncApplicationToCrm(deps, opts) {
+  const emailKey = str(opts.app.email).toLowerCase();
+  if (!emailKey) return null;
+  const recordDeps = { crm: deps.crm, db: deps.db, now: deps.now, newId: deps.newId };
+  const input = personInputFromApp(deps.chapter, opts.app);
+  const { crm_record } = await deps.db.query({
+    crm_record: { $: { where: { type: "person", primaryEmail: emailKey }, limit: 1 } }
+  });
+  const existing = crm_record?.[0] ?? null;
+  const stage = opts.stage || void 0;
+  let recordId;
+  if (existing && typeof existing.id === "string") {
+    recordId = existing.id;
+    await updateRecord2(recordDeps, { id: recordId, input });
+  } else {
+    const created = await createRecord2(recordDeps, { type: "person", input, ...stage ? { stage } : {} });
+    recordId = created.id;
+  }
+  if (existing && stage && existing.stage !== stage) {
+    await 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 linkIdentity(recordDeps, { recordId, email: emailKey, mutationId: `crm:link:${recordId}:${emailKey}` }).catch(() => void 0);
+  return recordId;
+}
+async function backfillCrm(deps) {
+  const [appsRes, usersRes] = await Promise.all([
+    deps.db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } } }),
+    deps.db.query({ $users: { $: { limit: 1e3 } } })
+  ]);
+  const seen = /* @__PURE__ */ new Set();
+  let synced = 0;
+  const errors = [];
+  const run = async (app, stage) => {
+    const key = str(app.email).toLowerCase();
+    if (!key || seen.has(key)) return;
+    seen.add(key);
+    try {
+      await syncApplicationToCrm(deps, { app, stage });
+      synced += 1;
+    } catch (err) {
+      errors.push({ email: key, error: err instanceof Error ? err.message : String(err) });
+    }
+  };
+  for (const a of appsRes.applications ?? []) await run(a, str(a.status));
+  for (const u of usersRes.$users ?? []) {
+    if (u.deleted === true) continue;
+    await run({ email: u.email, firstName: str(u.name) });
+  }
+  return { synced, errors };
+}
+
 // src/worker-routes-schedule.ts
 import { computeBookableSlots, initCalendar } from "@odla-ai/calendar";
 function errCode(err) {
@@ -1024,8 +1111,11 @@ async function bookSlot(req, env, ctx) {
     if (code === "calendar_slot_unavailable") return json({ error: "slot no longer available", code }, 409);
     return json({ error: "booking failed", code }, 502);
   }
-  const appOp = { t: "update", ns: "applications", id: applicationId, attrs: applicationBookingUpdate(status, startAt, htmlLink) };
+  const bookingAttrs = applicationBookingUpdate(status, startAt, htmlLink);
+  const appOp = { t: "update", ns: "applications", id: applicationId, attrs: bookingAttrs };
   await db.transact([meetingOp, appOp]);
+  const booked = { ...app, ...bookingAttrs };
+  await syncApplicationToCrm(crmDeps(db, ctx), { app: booked, stage: String(booked.status ?? "") }).catch(() => void 0);
   if (typeof app.email === "string" && app.email) {
     await sendTemplated(
       { db, envName: env.ODLA_ENV, sender: env.SEND_EMAIL, from: env.EMAIL_FROM, now: () => Date.now(), newId: () => crypto.randomUUID() },
@@ -1375,6 +1465,8 @@ async function ingestWebhook(req, env, ctx) {
   const patch = webhookPatch(event, String(app.status ?? ""));
   if (Object.keys(patch).length) {
     await db.transact([{ t: "update", ns: "applications", id: String(app.id), attrs: patch }], { mutationId: webhookMutationId(eventId) });
+    const next = { ...app, ...patch };
+    await syncApplicationToCrm(crmDeps(db, ctx), { app: next, stage: String(next.status ?? "") }).catch(() => void 0);
   }
   if (event.kind === "first_payment") {
     await notifyPaymentConfirmed(db, env, eventId, app);
@@ -1566,86 +1658,6 @@ async function clerkSetRole(secretKey, id, role, fetchImpl = fetch) {
   return res.ok;
 }
 
-// src/crm-sync.ts
-import { createRecord as createRecord2, updateRecord as updateRecord2, setStage, linkIdentity } from "@odla-ai/crm";
-var str = (v) => typeof v === "string" ? v : v == null ? "" : String(v);
-function personInputFromApp(chapter, app) {
-  const input = sharedPersonInput({
-    email: str(app.email),
-    firstName: str(app.firstName) || void 0,
-    lastName: str(app.lastName) || void 0,
-    phone: str(app.phone) || void 0,
-    linkedin: str(app.linkedin) || void 0,
-    hubRecordId: str(app.id)
-  });
-  for (const f of chapter.application.crmFields) {
-    if (app[f] !== void 0) input[f] = app[f];
-  }
-  if (app.id !== void 0) input.applicationId = str(app.id);
-  return input;
-}
-function billingColumns(app) {
-  const status = str(app.status);
-  const paid = Boolean(app.stripeSubscriptionId) && status !== "refunded";
-  const billingStatus = status === "refunded" ? "refunded" : app.canceled === true ? "canceled" : paid ? "active" : "none";
-  const cols = { billingStatus };
-  if (app.stripeCustomerId) cols.stripeCustomerId = str(app.stripeCustomerId);
-  if (app.stripeSubscriptionId) cols.subscriptionId = str(app.stripeSubscriptionId);
-  if (typeof app.renewalAt === "number") cols.renewalAt = app.renewalAt;
-  return cols;
-}
-async function syncApplicationToCrm(deps, opts) {
-  const emailKey = str(opts.app.email).toLowerCase();
-  if (!emailKey) return null;
-  const crmDeps3 = { crm: deps.crm, db: deps.db, now: deps.now, newId: deps.newId };
-  const input = personInputFromApp(deps.chapter, opts.app);
-  const { crm_record } = await deps.db.query({
-    crm_record: { $: { where: { type: "person", primaryEmail: emailKey }, limit: 1 } }
-  });
-  const existing = crm_record?.[0] ?? null;
-  const stage = opts.stage || void 0;
-  let recordId;
-  if (existing && typeof existing.id === "string") {
-    recordId = existing.id;
-    await updateRecord2(crmDeps3, { id: recordId, input });
-  } else {
-    const created = await createRecord2(crmDeps3, { type: "person", input, ...stage ? { stage } : {} });
-    recordId = created.id;
-  }
-  if (existing && stage && existing.stage !== stage) {
-    await setStage(crmDeps3, { 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 linkIdentity(crmDeps3, { recordId, email: emailKey, mutationId: `crm:link:${recordId}:${emailKey}` }).catch(() => void 0);
-  return recordId;
-}
-async function backfillCrm(deps) {
-  const [appsRes, usersRes] = await Promise.all([
-    deps.db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } } }),
-    deps.db.query({ $users: { $: { limit: 1e3 } } })
-  ]);
-  const seen = /* @__PURE__ */ new Set();
-  let synced = 0;
-  const errors = [];
-  const run = async (app, stage) => {
-    const key = str(app.email).toLowerCase();
-    if (!key || seen.has(key)) return;
-    seen.add(key);
-    try {
-      await syncApplicationToCrm(deps, { app, stage });
-      synced += 1;
-    } catch (err) {
-      errors.push({ email: key, error: err instanceof Error ? err.message : String(err) });
-    }
-  };
-  for (const a of appsRes.applications ?? []) await run(a, str(a.status));
-  for (const u of usersRes.$users ?? []) {
-    if (u.deleted === true) continue;
-    await run({ email: u.email, firstName: str(u.name) });
-  }
-  return { synced, errors };
-}
-
 // src/worker-routes-admin-people.ts
 async function adminGate(req, env, ctx) {
   const rawDb = ctx.makeDb(env);
@@ -1654,7 +1666,7 @@ async function adminGate(req, env, ctx) {
   if (!await ctx.isAdmin(rawDb, u)) return json({ error: "forbidden" }, 403);
   return { db: rawDb, actor: { userId: u.userId, email: u.email ?? void 0 } };
 }
-var crmDeps = (db, ctx) => ({
+var crmDeps2 = (db, ctx) => ({
   crm: ctx.chapter.crm,
   db,
   now: () => Date.now(),
@@ -1665,7 +1677,7 @@ var handleAdminCrmSync = async (req, url, env, ctx) => {
   if (req.method !== "POST" || url.pathname !== "/api/admin/crm/sync") return null;
   const gate5 = await adminGate(req, env, ctx);
   if (gate5 instanceof Response) return gate5;
-  const result = await backfillCrm(crmDeps(gate5.db, ctx));
+  const result = await backfillCrm(crmDeps2(gate5.db, ctx));
   return json({ ok: true, ...result });
 };
 var handleAdminPeople = async (req, url, env, ctx) => {
@@ -1945,7 +1957,6 @@ async function gate2(req, env, ctx) {
   return rawDb;
 }
 var calFor = (env) => initCalendar3({ appId: env.ODLA_APP_ID, env: env.ODLA_ENV, adminToken: env.ODLA_API_KEY, endpoint: env.ODLA_PLATFORM });
-var crmDeps2 = (db, ctx) => ({ crm: ctx.chapter.crm, db, now: () => Date.now(), newId: () => crypto.randomUUID(), chapter: ctx.chapter });
 var readJson = async (req) => {
   try {
     return await req.json();
@@ -2031,7 +2042,7 @@ var handleAdminApprove = async (req, url, env, ctx) => {
   if (!canApprove(String(app.status), ctx.chapter.pipeline)) return json({ error: `cannot approve from status "${String(app.status)}"` }, 409);
   const target = "approved";
   await db.transact([{ t: "update", ns: "applications", id, attrs: { status: target } }]);
-  await syncApplicationToCrm(crmDeps2(db, ctx), { app: { ...app, status: target }, stage: target }).catch(() => void 0);
+  await syncApplicationToCrm(crmDeps(db, ctx), { app: { ...app, status: target }, stage: target }).catch(() => void 0);
   const { promoteTo, send } = ctx.chapter.operations.onApprove;
   let rolePromoted = false;
   const sk = await getVaultSecret(db, "clerk_secret_key");
@@ -2112,7 +2123,7 @@ var handleAdminApplicationPatch = async (req, url, env, ctx) => {
   if (Object.keys(attrs).length === 0) return json({ error: "nothing to update" }, 400);
   await db.transact([{ t: "update", ns: "applications", id, attrs }]);
   if (attrs.status !== void 0) {
-    await syncApplicationToCrm(crmDeps2(db, ctx), { app: { ...app, ...attrs }, stage: String(attrs.status) }).catch(() => void 0);
+    await syncApplicationToCrm(crmDeps(db, ctx), { app: { ...app, ...attrs }, stage: String(attrs.status) }).catch(() => void 0);
   }
   return json({ ok: true });
 };