@odla-ai/chapter 0.37.0 → 0.38.1

package/dist/worker/index.js

@@ -167,204 +167,10 @@ async function applicationIdForSubmission(submissionId) {
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
 
-// src/admission-grants-contract.ts
-var ADMISSION_GRANTS_SCHEMA_VERSION = 1;
-var ADMISSION_GRANTS_PATH = "/api/admission-grants";
-
-// src/signup-control-canonical.ts
-var encoder = new TextEncoder();
-function canonicalValue(value) {
-  if (value === null || typeof value === "boolean" || typeof value === "number" || typeof value === "string") {
-    return JSON.stringify(value);
-  }
-  if (Array.isArray(value)) return `[${value.map(canonicalValue).join(",")}]`;
-  if (typeof value !== "object") throw new TypeError("signup control contains an unsupported value");
-  const record3 = value;
-  const entries = Object.keys(record3).sort().flatMap((key) => {
-    const item = record3[key];
-    return item === void 0 ? [] : [`${JSON.stringify(key)}:${canonicalValue(item)}`];
-  });
-  return `{${entries.join(",")}}`;
-}
-function canonicalSignupControl(value) {
-  return canonicalValue(value);
-}
-async function signupControlDigest(document) {
-  const digest = await crypto.subtle.digest("SHA-256", encoder.encode(canonicalSignupControl(document)));
-  return `sha256:${Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, "0")).join("")}`;
-}
-
-// src/admission-grants.ts
-var ID = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,127}$/;
-var MAX_GRANTS = 2e3;
-var MAX_NOTE = 2e3;
-var EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-var isAdmissionEmail = (value) => EMAIL_RE.test(value);
-function normalizeAdmissionEmail(email) {
+// src/email-identity.ts
+function normalizeChapterEmail(email) {
   return email.trim().toLowerCase();
 }
-function validateAdmissionGrantDocument(input) {
-  const errors = [];
-  const root = input && typeof input === "object" ? input : {};
-  if (root.schemaVersion !== ADMISSION_GRANTS_SCHEMA_VERSION) errors.push("document.schemaVersion must be 1");
-  const revision = Number(root.revision);
-  const generatedAt = Number(root.generatedAt);
-  if (!Number.isSafeInteger(revision) || revision < 1) errors.push("document.revision must be a positive integer");
-  if (!Number.isFinite(generatedAt) || generatedAt <= 0) errors.push("document.generatedAt must be epoch milliseconds");
-  const source = root.source && typeof root.source === "object" ? root.source : {};
-  const target = root.target && typeof root.target === "object" ? root.target : {};
-  const sourceId = typeof source.appId === "string" ? source.appId : "";
-  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 (!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 (!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`);
-  const grants = [];
-  const seenIds = /* @__PURE__ */ new Set();
-  const seenEmails = /* @__PURE__ */ new Set();
-  for (const [index, raw] of rawGrants.slice(0, MAX_GRANTS).entries()) {
-    const grant = raw && typeof raw === "object" ? raw : {};
-    const id = typeof grant.id === "string" ? grant.id : "";
-    const email = typeof grant.email === "string" ? grant.email.trim() : "";
-    const normalized = normalizeAdmissionEmail(email);
-    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(id)) errors.push(`document.grants[${index}].id must be an identifier`);
-    if (seenIds.has(id)) errors.push(`document.grants repeats id "${id}"`);
-    if (!isAdmissionEmail(normalized)) errors.push(`document.grants[${index}].email must be valid`);
-    if (seenEmails.has(normalized)) errors.push(`document.grants repeats email "${normalized}"`);
-    if (decision !== "waive_interview" && decision !== "require_interview") {
-      errors.push(`document.grants[${index}].decision is invalid`);
-    }
-    if (note && note.length > MAX_NOTE) errors.push(`document.grants[${index}].note is too long`);
-    if (expiresAt !== void 0 && (!Number.isFinite(expiresAt) || expiresAt <= 0)) {
-      errors.push(`document.grants[${index}].expiresAt must be epoch milliseconds`);
-    }
-    seenIds.add(id);
-    seenEmails.add(normalized);
-    grants.push({
-      id,
-      email,
-      decision,
-      ...note ? { note } : {},
-      ...expiresAt !== void 0 ? { expiresAt } : {}
-    });
-  }
-  if (errors.length) return { ok: false, errors };
-  return {
-    ok: true,
-    value: {
-      schemaVersion: ADMISSION_GRANTS_SCHEMA_VERSION,
-      revision,
-      generatedAt,
-      source: { appId: sourceId, actor: sourceActor },
-      target: { chapterId, environment },
-      grants
-    }
-  };
-}
-var rows = (value) => Array.isArray(value) ? value : [];
-function asGrant(row) {
-  if (typeof row.id !== "string" || typeof row.emailNormalized !== "string") return null;
-  if (row.sourceScope !== "local" && row.sourceScope !== "parent") return null;
-  if (row.decision !== "waive_interview" && row.decision !== "require_interview") return null;
-  return row;
-}
-async function findAdmissionGrant(db, targetId, email, now) {
-  const emailNormalized = normalizeAdmissionEmail(email);
-  if (!isAdmissionEmail(emailNormalized)) return null;
-  const result = await db.query({ admissionGrants: { $: { where: { emailNormalized }, limit: 100 } } });
-  const active = rows(result.admissionGrants).map(asGrant).filter((grant) => Boolean(
-    grant && grant.targetId === targetId && grant.active === true && !grant.revokedAt && (!grant.expiresAt || grant.expiresAt > now) && !grant.consumedApplicationId
-  )).sort((a, b) => {
-    const scope = Number(b.sourceScope === "local") - Number(a.sourceScope === "local");
-    return scope || b.createdAt - a.createdAt;
-  });
-  return active[0] ?? null;
-}
-async function hasAdmissionRevision(db, sourceId, targetId, environment) {
-  const where = { sourceId, targetId, environment };
-  if (db.aggregate) {
-    return Number((await db.aggregate("admissionGrantRevisions", { count: true }, { where })).count ?? 0) > 0;
-  }
-  const found = await db.query({ admissionGrantRevisions: {} });
-  return rows(found.admissionGrantRevisions).some((row) => row.sourceId === sourceId && row.targetId === targetId && row.environment === environment);
-}
-async function loadLatestAdmissionRevision(db, sourceId, targetId, environment) {
-  if (!await hasAdmissionRevision(db, sourceId, targetId, environment)) return null;
-  const result = await db.query({ admissionGrantRevisions: { $: {
-    where: { sourceId, targetId, environment },
-    order: { revision: "desc" },
-    limit: 1
-  } } });
-  const row = rows(result.admissionGrantRevisions).sort((a, b) => Number(b.revision ?? 0) - Number(a.revision ?? 0))[0];
-  return row ? row : null;
-}
-async function materializeAdmissionGrants(db, envelope, previous, receivedAt) {
-  const { document, digest } = envelope;
-  const current = rows((await db.query({ admissionGrants: { $: {
-    where: { sourceScope: "parent", sourceId: document.source.appId, targetId: document.target.chapterId },
-    limit: MAX_GRANTS
-  } } })).admissionGrants);
-  const incomingIds = new Set(document.grants.map((grant) => `admission:parent:${document.source.appId}:${grant.id}`));
-  const ops = [];
-  for (const row of current) {
-    const id = String(row.id ?? "");
-    if (id && !incomingIds.has(id)) ops.push({ t: "update", ns: "admissionGrants", id, attrs: {
-      active: false,
-      revokedAt: receivedAt,
-      revokedBy: document.source.actor,
-      updatedAt: receivedAt,
-      updatedBy: document.source.actor
-    } });
-  }
-  for (const grant of document.grants) {
-    const id = `admission:parent:${document.source.appId}:${grant.id}`;
-    const existing = current.find((row) => row.id === id);
-    ops.push({ t: "update", ns: "admissionGrants", id, attrs: {
-      id,
-      sourceGrantId: grant.id,
-      sourceScope: "parent",
-      sourceId: document.source.appId,
-      targetId: document.target.chapterId,
-      email: grant.email,
-      emailNormalized: normalizeAdmissionEmail(grant.email),
-      decision: grant.decision,
-      ...grant.note ? { note: grant.note } : {},
-      ...grant.expiresAt ? { expiresAt: grant.expiresAt } : {},
-      active: true,
-      sourceRevision: document.revision,
-      createdAt: Number(existing?.createdAt ?? receivedAt),
-      createdBy: String(existing?.createdBy ?? document.source.actor),
-      updatedAt: receivedAt,
-      updatedBy: document.source.actor
-    } });
-    const retract = [
-      ...!grant.note && existing?.note !== void 0 ? ["note"] : [],
-      ...grant.expiresAt === void 0 && existing?.expiresAt !== void 0 ? ["expiresAt"] : []
-    ];
-    if (retract.length) ops.push({ t: "retract", ns: "admissionGrants", id, attrs: retract });
-  }
-  if (previous?.active) ops.push({ t: "update", ns: "admissionGrantRevisions", id: previous.id, attrs: { active: false } });
-  const revisionId = `admission-revision:${document.source.appId}:${document.target.environment}:${document.revision}`;
-  ops.push({ t: "update", ns: "admissionGrantRevisions", id: revisionId, attrs: {
-    id: revisionId,
-    sourceId: document.source.appId,
-    targetId: document.target.chapterId,
-    environment: document.target.environment,
-    revision: document.revision,
-    digest,
-    active: true,
-    receivedAt
-  } });
-  await db.transact(ops, { mutationId: `admission-grants:${document.source.appId}:${document.target.environment}:${document.revision}:${digest}` });
-}
 
 // src/member.ts
 var DEFAULT_REQUIRED = ["firstName", "lastName", "email", "referral", "whoYouAre", "message"];
@@ -417,9 +223,9 @@ function resolveApplication(a) {
     validateEmail: a?.validateEmail ?? true
   };
 }
-var EMAIL_RE2 = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+var EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 function isValidEmail(value) {
-  return typeof value === "string" && EMAIL_RE2.test(value);
+  return typeof value === "string" && EMAIL_RE.test(value);
 }
 function clampArray(value, max) {
   if (!Array.isArray(value)) return value;
@@ -454,7 +260,7 @@ async function submitApplication(db, chapter, fields, opts) {
     const cap = app.maxLen[f] ?? app.defaultMaxLen;
     if (typeof v === "string" && v.length > cap) return { ok: false, error: `${f} exceeds ${cap} characters` };
   }
-  if (app.validateEmail && typeof fields.email === "string" && !isValidEmail(fields.email)) {
+  if (app.validateEmail && typeof fields.email === "string" && !isValidEmail(fields.email.trim())) {
     return { ok: false, error: "email must be a valid email address" };
   }
   const acked = hasDisclaimerAck(fields);
@@ -470,7 +276,7 @@ async function submitApplication(db, chapter, fields, opts) {
   if (fields.focus !== void 0) row.focus = clampArray(fields.focus, app.maxArrayLen);
   if (opts.groupId) row.groupId = opts.groupId;
   if (typeof fields.email === "string" && isValidEmail(fields.email.trim())) {
-    row.emailNormalized = normalizeAdmissionEmail(fields.email);
+    row.emailNormalized = normalizeChapterEmail(fields.email);
   }
   if (opts.admissionGrant?.decision === "waive_interview") {
     row.admissionGrantId = opts.admissionGrant.id;
@@ -698,6 +504,281 @@ function applicationBookingUpdate(currentStatus, startAt, htmlLink) {
   };
 }
 
+// src/admission-grants-contract.ts
+var ADMISSION_GRANTS_SCHEMA_VERSION = 1;
+var ADMISSION_GRANTS_PATH = "/api/admission-grants";
+
+// src/signup-control-canonical.ts
+var encoder = new TextEncoder();
+function canonicalValue(value) {
+  if (value === null || typeof value === "boolean" || typeof value === "number" || typeof value === "string") {
+    return JSON.stringify(value);
+  }
+  if (Array.isArray(value)) return `[${value.map(canonicalValue).join(",")}]`;
+  if (typeof value !== "object") throw new TypeError("signup control contains an unsupported value");
+  const record3 = value;
+  const entries = Object.keys(record3).sort().flatMap((key) => {
+    const item = record3[key];
+    return item === void 0 ? [] : [`${JSON.stringify(key)}:${canonicalValue(item)}`];
+  });
+  return `{${entries.join(",")}}`;
+}
+function canonicalSignupControl(value) {
+  return canonicalValue(value);
+}
+async function signupControlDigest(document) {
+  const digest = await crypto.subtle.digest("SHA-256", encoder.encode(canonicalSignupControl(document)));
+  return `sha256:${Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, "0")).join("")}`;
+}
+
+// src/admission-grants.ts
+var ID = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,127}$/;
+var MAX_GRANTS = 2e3;
+var MAX_NOTE = 2e3;
+var EMAIL_RE2 = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+var isAdmissionEmail = (value) => EMAIL_RE2.test(value);
+function normalizeAdmissionEmail(email) {
+  return normalizeChapterEmail(email);
+}
+function validateAdmissionGrantDocument(input) {
+  const errors = [];
+  const root = input && typeof input === "object" ? input : {};
+  if (root.schemaVersion !== ADMISSION_GRANTS_SCHEMA_VERSION) errors.push("document.schemaVersion must be 1");
+  const revision = Number(root.revision);
+  const generatedAt = Number(root.generatedAt);
+  if (!Number.isSafeInteger(revision) || revision < 1) errors.push("document.revision must be a positive integer");
+  if (!Number.isFinite(generatedAt) || generatedAt <= 0) errors.push("document.generatedAt must be epoch milliseconds");
+  const source = root.source && typeof root.source === "object" ? root.source : {};
+  const target = root.target && typeof root.target === "object" ? root.target : {};
+  const sourceId = typeof source.appId === "string" ? source.appId : "";
+  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 (!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 (!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`);
+  const grants = [];
+  const seenIds = /* @__PURE__ */ new Set();
+  const seenEmails = /* @__PURE__ */ new Set();
+  for (const [index, raw] of rawGrants.slice(0, MAX_GRANTS).entries()) {
+    const grant = raw && typeof raw === "object" ? raw : {};
+    const id = typeof grant.id === "string" ? grant.id : "";
+    const email = typeof grant.email === "string" ? grant.email.trim() : "";
+    const normalized = normalizeAdmissionEmail(email);
+    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(id)) errors.push(`document.grants[${index}].id must be an identifier`);
+    if (seenIds.has(id)) errors.push(`document.grants repeats id "${id}"`);
+    if (!isAdmissionEmail(normalized)) errors.push(`document.grants[${index}].email must be valid`);
+    if (seenEmails.has(normalized)) errors.push(`document.grants repeats email "${normalized}"`);
+    if (decision !== "waive_interview" && decision !== "require_interview") {
+      errors.push(`document.grants[${index}].decision is invalid`);
+    }
+    if (note && note.length > MAX_NOTE) errors.push(`document.grants[${index}].note is too long`);
+    if (expiresAt !== void 0 && (!Number.isFinite(expiresAt) || expiresAt <= 0)) {
+      errors.push(`document.grants[${index}].expiresAt must be epoch milliseconds`);
+    }
+    seenIds.add(id);
+    seenEmails.add(normalized);
+    grants.push({
+      id,
+      email,
+      decision,
+      ...note ? { note } : {},
+      ...expiresAt !== void 0 ? { expiresAt } : {}
+    });
+  }
+  if (errors.length) return { ok: false, errors };
+  return {
+    ok: true,
+    value: {
+      schemaVersion: ADMISSION_GRANTS_SCHEMA_VERSION,
+      revision,
+      generatedAt,
+      source: { appId: sourceId, actor: sourceActor },
+      target: { chapterId, environment },
+      grants
+    }
+  };
+}
+var rows = (value) => Array.isArray(value) ? value : [];
+function asGrant(row) {
+  if (typeof row.id !== "string" || typeof row.emailNormalized !== "string") return null;
+  if (row.sourceScope !== "local" && row.sourceScope !== "parent") return null;
+  if (row.decision !== "waive_interview" && row.decision !== "require_interview") return null;
+  return row;
+}
+async function findAdmissionGrant(db, targetId, email, now) {
+  const emailNormalized = normalizeAdmissionEmail(email);
+  if (!isAdmissionEmail(emailNormalized)) return null;
+  const result = await db.query({ admissionGrants: { $: { where: { emailNormalized }, limit: 100 } } });
+  const active = rows(result.admissionGrants).map(asGrant).filter((grant) => Boolean(
+    grant && grant.targetId === targetId && grant.active === true && !grant.revokedAt && (!grant.expiresAt || grant.expiresAt > now) && !grant.consumedApplicationId
+  )).sort((a, b) => {
+    const scope = Number(b.sourceScope === "local") - Number(a.sourceScope === "local");
+    return scope || b.createdAt - a.createdAt;
+  });
+  return active[0] ?? null;
+}
+async function hasAdmissionRevision(db, sourceId, targetId, environment) {
+  const where = { sourceId, targetId, environment };
+  if (db.aggregate) {
+    return Number((await db.aggregate("admissionGrantRevisions", { count: true }, { where })).count ?? 0) > 0;
+  }
+  const found = await db.query({ admissionGrantRevisions: {} });
+  return rows(found.admissionGrantRevisions).some((row) => row.sourceId === sourceId && row.targetId === targetId && row.environment === environment);
+}
+async function loadLatestAdmissionRevision(db, sourceId, targetId, environment) {
+  if (!await hasAdmissionRevision(db, sourceId, targetId, environment)) return null;
+  const result = await db.query({ admissionGrantRevisions: { $: {
+    where: { sourceId, targetId, environment },
+    order: { revision: "desc" },
+    limit: 1
+  } } });
+  const row = rows(result.admissionGrantRevisions).sort((a, b) => Number(b.revision ?? 0) - Number(a.revision ?? 0))[0];
+  return row ? row : null;
+}
+async function materializeAdmissionGrants(db, envelope, previous, receivedAt) {
+  const { document, digest } = envelope;
+  const current = rows((await db.query({ admissionGrants: { $: {
+    where: { sourceScope: "parent", sourceId: document.source.appId, targetId: document.target.chapterId },
+    limit: MAX_GRANTS
+  } } })).admissionGrants);
+  const incomingIds = new Set(document.grants.map((grant) => `admission:parent:${document.source.appId}:${grant.id}`));
+  const ops = [];
+  for (const row of current) {
+    const id = String(row.id ?? "");
+    if (id && !incomingIds.has(id)) ops.push({ t: "update", ns: "admissionGrants", id, attrs: {
+      active: false,
+      revokedAt: receivedAt,
+      revokedBy: document.source.actor,
+      updatedAt: receivedAt,
+      updatedBy: document.source.actor
+    } });
+  }
+  for (const grant of document.grants) {
+    const id = `admission:parent:${document.source.appId}:${grant.id}`;
+    const existing = current.find((row) => row.id === id);
+    ops.push({ t: "update", ns: "admissionGrants", id, attrs: {
+      id,
+      sourceGrantId: grant.id,
+      sourceScope: "parent",
+      sourceId: document.source.appId,
+      targetId: document.target.chapterId,
+      email: grant.email,
+      emailNormalized: normalizeAdmissionEmail(grant.email),
+      decision: grant.decision,
+      ...grant.note ? { note: grant.note } : {},
+      ...grant.expiresAt ? { expiresAt: grant.expiresAt } : {},
+      active: true,
+      sourceRevision: document.revision,
+      createdAt: Number(existing?.createdAt ?? receivedAt),
+      createdBy: String(existing?.createdBy ?? document.source.actor),
+      updatedAt: receivedAt,
+      updatedBy: document.source.actor
+    } });
+    const retract = [
+      ...!grant.note && existing?.note !== void 0 ? ["note"] : [],
+      ...grant.expiresAt === void 0 && existing?.expiresAt !== void 0 ? ["expiresAt"] : []
+    ];
+    if (retract.length) ops.push({ t: "retract", ns: "admissionGrants", id, attrs: retract });
+  }
+  if (previous?.active) ops.push({ t: "update", ns: "admissionGrantRevisions", id: previous.id, attrs: { active: false } });
+  const revisionId = `admission-revision:${document.source.appId}:${document.target.environment}:${document.revision}`;
+  ops.push({ t: "update", ns: "admissionGrantRevisions", id: revisionId, attrs: {
+    id: revisionId,
+    sourceId: document.source.appId,
+    targetId: document.target.chapterId,
+    environment: document.target.environment,
+    revision: document.revision,
+    digest,
+    active: true,
+    receivedAt
+  } });
+  await db.transact(ops, { mutationId: `admission-grants:${document.source.appId}:${document.target.environment}:${document.revision}:${digest}` });
+}
+
+// src/flow-fields.ts
+var CHAPTER_FLOW_FIELDS_SCHEMA_VERSION = 1;
+var APPLICATION_LABELS = {
+  firstName: "First name",
+  lastName: "Last name",
+  email: "Email",
+  referral: "Referral source",
+  referralName: "Referral name",
+  whoYouAre: "Who you are",
+  linkedin: "LinkedIn",
+  message: "Intro message",
+  phone: "Phone",
+  state: "State"
+};
+function humanize(id) {
+  const text3 = id.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
+  return text3 ? `${text3[0].toUpperCase()}${text3.slice(1)}` : id;
+}
+function applicationDefs(chapter) {
+  try {
+    return chapter.crm.type("person").fields;
+  } catch {
+    return {};
+  }
+}
+function applicationType(id, def) {
+  if (def && ["string", "email", "url", "enum"].includes(def.type)) return def.type;
+  return id === "email" ? "email" : id === "linkedin" ? "url" : "string";
+}
+function applicationFlowFields(chapter, application = chapter.application) {
+  const defs = applicationDefs(chapter);
+  return [...application.required, ...application.optional].map((id, order) => {
+    const def = defs[id];
+    const conditions = application.conditions[id];
+    const type = applicationType(id, def);
+    return {
+      id,
+      label: def?.label ?? APPLICATION_LABELS[id] ?? humanize(id),
+      type,
+      required: application.required.includes(id),
+      order,
+      maxLength: application.maxLen[id] ?? application.defaultMaxLen,
+      ...type === "enum" && def?.options ? { options: [...def.options] } : {},
+      ...conditions ? { conditions: { ...conditions } } : {},
+      ...type === "email" ? { emailIdentity: "literal" } : {}
+    };
+  });
+}
+function resolveFormationFlowFields(crm, formation) {
+  if (!formation.enabled) return [];
+  const def = crm.type(formation.type);
+  return [...formation.required, ...formation.optional].map((id, order) => {
+    const field = def.fields[id];
+    return {
+      id,
+      label: field.label ?? humanize(id),
+      type: field.type,
+      required: formation.required.includes(id),
+      order,
+      maxLength: formation.maxLen[id] ?? formation.defaultMaxLen,
+      ...field.options ? { options: [...field.options] } : {},
+      ...id === def.emailField || field.type === "email" ? { emailIdentity: "literal" } : {}
+    };
+  });
+}
+function formationFlowFields(chapter, formation = chapter.formation) {
+  return resolveFormationFlowFields(chapter.crm, formation);
+}
+function chapterFlowFieldContract(chapter, flow, application = chapter.application) {
+  return {
+    schemaVersion: CHAPTER_FLOW_FIELDS_SCHEMA_VERSION,
+    flow,
+    fields: flow === "join" ? applicationFlowFields(chapter, application) : formationFlowFields(chapter)
+  };
+}
+
 // src/gift-offers.ts
 var GIFT_OFFER_CATALOG_VERSION = 1;
 var MAX_GIFT_OFFERS = 20;
@@ -1117,10 +1198,10 @@ async function syncApplicationToCrm(deps, opts) {
   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 data = await deps.db.query({
+    applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } },
+    $users: { $: { limit: 1e3 } }
+  });
   const seen = /* @__PURE__ */ new Set();
   let synced = 0;
   const errors = [];
@@ -1135,8 +1216,8 @@ async function backfillCrm(deps) {
       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 ?? []) {
+  for (const a of data.applications ?? []) await run(a, str(a.status));
+  for (const u of data.$users ?? []) {
     if (u.deleted === true) continue;
     await run({ email: u.email, firstName: str(u.name) });
   }
@@ -1708,7 +1789,7 @@ async function notifyAdminOfApplication(db, env, chapterId, applicationId, field
 // src/worker-routes.ts
 async function memberSessionApplication(db, chapterId, email) {
   let apps = (await db.query({ applications: { $: {
-    where: { emailNormalized: normalizeAdmissionEmail(email) },
+    where: { emailNormalized: normalizeChapterEmail(email) },
     limit: 20
   } } })).applications;
   if (!apps?.length) apps = (await db.query({ applications: { $: { where: { email }, limit: 20 } } })).applications;
@@ -1807,6 +1888,7 @@ var handleMember = async (req, url, env, ctx) => {
     const application = controlledApplication(chapter.application, activeControl?.document);
     return json({
       ...joinConfig(group, paymentsReady, joinConfigTiers(offered), application.conditions),
+      fieldContract: chapterFlowFieldContract(chapter, "join", application),
       copy: { ...chapter.copy.join, ...activeControl?.document.application?.copy ?? {} },
       ...activeControl ? { signupControl: {
         revision: activeControl.revision,
@@ -3050,7 +3132,7 @@ var handleAdminAdmissionGrants = async (req, url, env, ctx) => {
       return json({ error: "invalid JSON body" }, 400);
     }
     const email = typeof body.email === "string" ? body.email.trim() : "";
-    const emailNormalized = normalizeAdmissionEmail(email);
+    const emailNormalized = normalizeChapterEmail(email);
     if (!isValidEmail(emailNormalized)) return json({ error: "email must be valid" }, 400);
     const decision = body.decision ?? "waive_interview";
     if (decision !== "waive_interview" && decision !== "require_interview") {
@@ -3552,7 +3634,7 @@ async function rotateGiftClaim(db, claim, now) {
 async function redeemGiftClaim(db, claim, beneficiary, now) {
   if (claim.status !== "pending" || Number(claim.codeExpiresAt) <= now) return null;
   const chapterId = String(claim.chapterId);
-  const emailNormalized = normalizeAdmissionEmail(beneficiary.email);
+  const emailNormalized = normalizeChapterEmail(beneficiary.email);
   const target = claim.target;
   const ops = [];
   let result;
@@ -3849,7 +3931,7 @@ async function startSubscription(req, env, ctx) {
         offer,
         purchaserType: "application",
         purchaserEmail: String(app.email ?? ""),
-        purchaserEmailNormalized: normalizeAdmissionEmail(String(app.email ?? "")),
+        purchaserEmailNormalized: normalizeChapterEmail(String(app.email ?? "")),
         purchaserApplicationId: applicationId,
         stripeSecret: secretKey,
         publishableKey: group.stripePublishableKey,
@@ -3998,7 +4080,7 @@ var handleGifts = async (req, url, env, ctx) => {
     if (!user) return json({ error: "unauthorized" }, 401);
     const control2 = await loadActiveSignupControl(db, ctx.chapter.id, env.ODLA_ENV);
     const found = await db.query({ giftClaims: { $: { where: {
-      purchaserEmailNormalized: normalizeAdmissionEmail(user.email),
+      purchaserEmailNormalized: normalizeChapterEmail(user.email),
       chapterId: ctx.chapter.id
     }, limit: 200 } } });
     const group = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
@@ -4025,7 +4107,7 @@ var handleGifts = async (req, url, env, ctx) => {
     const group = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
     const stripeSecret = await getVaultSecret(db, "stripe_secret_key");
     if (!group || !stripeSecret || typeof group.stripePublishableKey !== "string") return json({ error: "payments not configured" }, 503);
-    const emailNormalized = normalizeAdmissionEmail(user.email);
+    const emailNormalized = normalizeChapterEmail(user.email);
     const applications = rows2((await db.query({ applications: { $: { where: { emailNormalized }, limit: 20 } } })).applications);
     const app = applications.sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))[0];
     try {
@@ -4067,7 +4149,7 @@ var handleGifts = async (req, url, env, ctx) => {
         return invalid();
       }
     }
-    const owns = user ? claim.purchaserEmailNormalized === normalizeAdmissionEmail(user.email) : claim.purchaserApplicationId === applicationId;
+    const owns = user ? claim.purchaserEmailNormalized === normalizeChapterEmail(user.email) : claim.purchaserApplicationId === applicationId;
     if (!owns) return invalid();
     const rotated = await rotateGiftClaim(db, claim, Date.now());
     return rotated ? json(rotated) : invalid();
@@ -4260,14 +4342,16 @@ var handleAdminPeople = async (req, url, env, ctx) => {
   if (gate9 instanceof Response) return gate9;
   const { db } = gate9;
   const sk = await getVaultSecret(db, "clerk_secret_key");
-  const [appsRes, usersRes, roleList] = await Promise.all([
-    db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 200 } } }),
-    db.query({ $users: { $: { limit: 200 } } }),
+  const [data, roleList] = await Promise.all([
+    db.query({
+      applications: { $: { order: { createdAt: "desc" }, limit: 200 } },
+      $users: { $: { limit: 200 } }
+    }),
     sk ? clerkListUsers(sk).catch(() => []) : Promise.resolve([])
   ]);
   const clerkByUserId = new Map(roleList.map((u) => [u.id, u]));
   const people = /* @__PURE__ */ new Map();
-  for (const u of usersRes.$users ?? []) {
+  for (const u of data.$users ?? []) {
     if (u.deleted === true) continue;
     const email = typeof u.email === "string" ? u.email : "";
     if (!email) continue;
@@ -4282,7 +4366,7 @@ var handleAdminPeople = async (req, url, env, ctx) => {
       application: null
     });
   }
-  for (const a of appsRes.applications ?? []) {
+  for (const a of data.applications ?? []) {
     const key = String(a.email ?? "").toLowerCase();
     if (!key) continue;
     const name = `${a.firstName ?? ""} ${a.lastName ?? ""}`.trim();
@@ -4487,13 +4571,19 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
   const now = Date.now();
   const d7 = now - 7 * 864e5;
   const d30 = now - 30 * 864e5;
-  const [appsRes, meetingsRes, recsRes, groupRes] = await Promise.all([
-    db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } } }),
-    db.query({ meetings: { $: { where: { status: "scheduled" }, order: { startAt: "asc" }, limit: 500 } } }),
-    db.query({ crm_record: { $: { where: { type: "person" }, limit: 1e3 } } }),
-    db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })
-  ]);
-  const apps = rows3(appsRes.applications);
+  const data = await db.query({
+    applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } },
+    meetings: {
+      $: {
+        where: { status: "scheduled" },
+        order: { startAt: "asc" },
+        limit: 500
+      }
+    },
+    crm_record: { $: { where: { type: "person" }, limit: 1e3 } },
+    groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } }
+  });
+  const apps = rows3(data.applications);
   const applications = {
     total: apps.length,
     last7: apps.filter((a) => a.createdAt >= d7).length,
@@ -4505,7 +4595,7 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
     pipeline[s] = 0;
     pipelineDelta[s] = 0;
   }
-  for (const r of rows3(recsRes.crm_record)) {
+  for (const r of rows3(data.crm_record)) {
     const s = r.stage;
     if (s in pipeline) {
       pipeline[s] = (pipeline[s] ?? 0) + 1;
@@ -4513,7 +4603,7 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
       if (Number.isFinite(sc) && sc >= d7) pipelineDelta[s] = (pipelineDelta[s] ?? 0) + 1;
     }
   }
-  const meetings = rows3(meetingsRes.meetings);
+  const meetings = rows3(data.meetings);
   const appById = new Map(apps.map((a) => [a.id, a]));
   const upcoming = meetings.filter((m) => m.startAt >= now - 36e5);
   const calls = { upcoming: upcoming.length, needsAttention: meetings.filter((m) => m.drift && m.drift !== "none").length };
@@ -4529,7 +4619,7 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
       email: a?.email ?? null
     };
   });
-  const group = groupRes.groups?.[0];
+  const group = data.groups?.[0];
   const timezone = resolveScheduling(group?.schedulingJson).timezone;
   let revenue = { billingReady: false };
   let revenueSeries = null;
@@ -4563,16 +4653,18 @@ var handleAdminBilling = async (req, url, env, ctx) => {
   const db = got;
   const sk = await getVaultSecret(db, "stripe_secret_key");
   if (!sk) return json({ billingReady: false, rows: [], summary: null });
-  const [appsRes, subsRes, groupRes] = await Promise.all([
-    db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 200 } } }),
-    stripeCall(sk, "GET", "/v1/subscriptions", { limit: 100, status: "all" }),
-    db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })
+  const [data, subsRes] = await Promise.all([
+    db.query({
+      applications: { $: { order: { createdAt: "desc" }, limit: 200 } },
+      groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } }
+    }),
+    stripeCall(sk, "GET", "/v1/subscriptions", { limit: 100, status: "all" })
   ]);
-  const testMode = String(groupRes.groups?.[0]?.stripePublishableKey ?? "").startsWith("pk_test");
+  const testMode = String(data.groups?.[0]?.stripePublishableKey ?? "").startsWith("pk_test");
   if (!subsRes.ok) return json({ error: "billing lookup failed upstream" }, 502);
   const subById = new Map(rows3(subsRes.body.data).map((s) => [s.id, s]));
   const billingRows = [];
-  for (const a of rows3(appsRes.applications)) {
+  for (const a of rows3(data.applications)) {
     if (!a.stripeCustomerId && !a.stripeSubscriptionId) continue;
     const sub = a.stripeSubscriptionId ? subById.get(a.stripeSubscriptionId) : void 0;
     const items = sub?.items?.data ?? [];
@@ -4912,21 +5004,27 @@ var handleAdminComms = async (req, url, env, ctx) => {
   if (got instanceof Response) return got;
   const db = got;
   const appId = m[1];
-  const [emailRes, meetingRes, appRes] = await Promise.all([
-    db.query({ emailLog: { $: { where: { applicationId: appId }, order: { sentAt: "desc" }, limit: 100 } } }),
-    db.query({ meetings: { $: { where: { applicationId: appId } } } }),
-    db.query({ applications: { $: { where: { id: appId }, limit: 1 } } })
-  ]);
-  const app = appRes.applications?.[0] ?? null;
+  const data = await db.query({
+    emailLog: {
+      $: {
+        where: { applicationId: appId },
+        order: { sentAt: "desc" },
+        limit: 100
+      }
+    },
+    meetings: { $: { where: { applicationId: appId } } },
+    applications: { $: { where: { id: appId }, limit: 1 } }
+  });
+  const app = data.applications?.[0] ?? null;
   const group = await loadGroup2(db, str2(app?.groupId, ctx.chapter.id));
   const vars = app ? { firstName: str2(app.firstName), lastName: str2(app.lastName), email: str2(app.email), phone: str2(app.phone), state: str2(app.state), adminUrl: `${url.origin}/admin/`, membersUrl: `${url.origin}/members/` } : null;
-  const emails = (emailRes.emailLog ?? []).filter((r) => r.template !== "adminNotification").map((r) => {
+  const emails = (data.emailLog ?? []).filter((r) => r.template !== "adminNotification").map((r) => {
     let mailBody = typeof r.body === "string" ? r.body : null;
     if (!mailBody && group && vars) mailBody = renderTemplateBody(emailGroupFrom(group), String(r.template), vars);
     const channel = r.error ? "email (failed)" : r.redirected ? "email (dev-redirected)" : r.transport === "log-only" ? "email (not delivered)" : "email";
     return { kind: "email", channel, label: String(r.template), subject: str2(r.subject), to: r.to ?? null, body: mailBody, at: r.sentAt, error: r.error ?? null };
   });
-  const calendar = (meetingRes.meetings ?? []).map((m2) => ({
+  const calendar = (data.meetings ?? []).map((m2) => ({
     kind: "calendar",
     channel: "Google Calendar",
     label: m2.status === "cancelled" ? "Invitation (call later cancelled)" : "Meeting invitation",
@@ -5595,31 +5693,17 @@ var handleAdminNetworkSharedNotes = async (req, url, env, ctx) => {
 
 // src/worker-routes-formation.ts
 import { createRecord as createRecord3 } from "@odla-ai/crm";
-
-// src/formation.ts
-function formationFields(crm, formation) {
-  const def = crm.type(formation.type);
-  return [...formation.required, ...formation.optional].map((id) => {
-    const field = def.fields[id];
-    return {
-      id,
-      label: field.label ?? id,
-      type: field.type,
-      required: formation.required.includes(id),
-      ...field.options ? { options: field.options } : {}
-    };
-  });
-}
-
-// src/worker-routes-formation.ts
 var SUBMISSION = /^[A-Za-z0-9_-]{8,128}$/;
 var handleFormation = async (req, url, env, ctx) => {
   const formation = ctx.chapter.formation;
   if (!formation.enabled) return null;
   if (req.method === "GET" && url.pathname === "/api/formation/config") {
+    const fieldContract = chapterFlowFieldContract(ctx.chapter, "formation");
     return json({
       type: formation.type,
-      fields: formationFields(ctx.chapter.crm, formation)
+      fieldContract,
+      // Backward compatibility for hosts that consumed the original array.
+      fields: fieldContract.fields
     });
   }
   if (req.method !== "POST" || url.pathname !== "/api/formation/applications") return null;