@cyc-seattle/platform 1.22.1 → 1.24.0

package/dist/planning/bonus.js

@@ -44,6 +44,7 @@ export function bookBonuses(ctx) {
                 function: ctx.functionFor(owner.account_id, null, "offering"),
                 amount,
                 line_key: `bonus:${owner.key}`,
+                line_name: `Bonus: ${owner.role_name}`,
                 explanation: `${owner.role_name}: ${owner.bonus_rate} × net of its products`,
                 stage: "bonus",
                 mtdc_share: 0,
@@ -57,6 +58,7 @@ export function bookBonuses(ctx) {
                 function: ctx.functionFor(owner.account_id, null, "offering"),
                 amount: amount * taxRate,
                 line_key: `bonus_payroll_tax:${owner.key}`,
+                line_name: `Payroll tax on bonus: ${owner.role_name}`,
                 explanation: `${taxRate} × ${owner.role_name}'s bonus`,
                 stage: "bonus",
                 mtdc_share: 0,

package/dist/planning/context.d.ts

@@ -9,6 +9,8 @@ export interface Entry {
     function: AccountFunction | null;
     amount: number;
     line_key: string;
+    /** What the line is, in plain words. */
+    line_name: string;
     explanation: string;
     stage: Stage;
     /** How much of the amount MTDC counts: 0 when excluded, a fraction for a mix of rented and owned RIBs. */

package/dist/planning/engine.js

@@ -7,7 +7,7 @@ import { bookPayrollTax } from "./payroll.js";
 import { allocatePools } from "./pools.js";
 import { bookRevenue, countDays } from "./revenue.js";
 import { bookSalaries } from "./salaried.js";
-import { enrollmentOf, Staffing } from "./staffing.js";
+import { enrollmentOf, round2, Staffing } from "./staffing.js";
 /**
  * Calculates the plan year's P&L from a plan's rows. The steps run in the order
  * docs/planning-engine.md gives, each reading only what earlier steps recorded.
@@ -17,7 +17,7 @@ export function computePlan(data) {
     for (const o of data.plan_offerings)
         ctx.enrollment.set(o.id, enrollmentOf(o));
     checkAreas(ctx);
-    const { activities, coaching } = new Staffing(ctx).run(scheduleActivities(ctx));
+    const { activities, coaching, doubleBooked } = new Staffing(ctx).run(scheduleActivities(ctx));
     countDays(ctx, activities);
     bookRevenue(ctx);
     const booker = new CostCenterBooker(ctx);
@@ -35,7 +35,7 @@ export function computePlan(data) {
         pnl: summarize(ctx, lines, mtdcByOffering),
         organization: organizationTotals(ctx, lines),
         activities,
-        positions: summarizePositions(ctx, coaching, charged, bonuses),
+        positions: summarizePositions(ctx, coaching, charged, bonuses, doubleBooked),
         warnings: ctx.warnings,
     };
 }
@@ -66,9 +66,17 @@ function checkAreas(ctx) {
             ctx.warn("offering_in_wrong_plan", `Offering ${offering.name} of ${product.name} is in ${where}`, offering.key);
         }
     }
+    const operations = new Set(ctx.data.plan_versions.filter((v) => ctx.planOfVersion.get(v.id)?.kind === "operations").map((v) => v.id));
+    for (const version of ctx.data.plan_versions) {
+        const pinned = version.operations_version_id;
+        if (pinned == null || operations.size === 0 || operations.has(pinned))
+            continue;
+        const area = ctx.areas.get(ctx.planOfVersion.get(version.id)?.program_area_id ?? "");
+        ctx.warn("other_operations_version", `${area?.name ?? "A program area"}'s plan was saved with a different Operations Plan version from the one it's calculated with`, version.id);
+    }
 }
 /** Each salaried position's year: its salary, where its hours went, and its hourly wages and bonus. */
-function summarizePositions(ctx, coaching, charged, bonuses) {
+function summarizePositions(ctx, coaching, charged, bonuses, doubleBooked) {
     const taxRate = ctx.rates?.payroll_tax_rate ?? 0;
     const known = new Set(ctx.data.plan_salaried_positions.map((p) => p.key));
     const named = [
@@ -99,6 +107,8 @@ function summarizePositions(ctx, coaching, charged, bonuses) {
             bonus_cents: Math.round(bonus),
             total_pay_cents: Math.round(total),
             payroll_tax_cents: Math.round(total * taxRate),
+            double_booked_hours: round2(doubleBooked.get(position.key)?.hours ?? 0),
+            double_booked_dates: doubleBooked.get(position.key)?.dates ?? 0,
         };
     });
 }
@@ -143,6 +153,7 @@ function sumLines(ctx) {
             function: e.function,
             amount_cents: 0,
             line_key: e.line_key,
+            line_name: e.line_name,
             explanation: e.explanation,
             exact: 0,
         };

package/dist/planning/lines.js

@@ -74,6 +74,7 @@ export function bookBudgetLines(ctx, booker) {
             function: ctx.functionFor(line.account_id, line.function, onOrg ? "org" : line.cost_center_type),
             amount: line.amount_cents,
             line_key: `budget:${line.key}`,
+            line_name: line.name,
             explanation: line.name,
             mtdc_share: line.excluded_from_mtdc ? 0 : 1,
         });
@@ -97,6 +98,7 @@ export function bookLaborLines(ctx, booker) {
             function: ctx.functionFor(line.account_id, line.function, line.cost_center_type),
             amount: level.pay_type === "volunteer" ? 0 : line.hours * (level.hourly_rate_cents ?? 0),
             line_key: `labor:${line.key}`,
+            line_name: line.name,
             explanation: `${line.name}: hours × ${level.name}'s rate`,
             wages: true,
         });

package/dist/planning/payroll.js

@@ -25,6 +25,7 @@ export function bookPayrollTax(ctx) {
             function: w.function,
             amount: w.amount * rate,
             line_key: "payroll_tax",
+            line_name: "Payroll tax",
             explanation: `${rate} × wages`,
         });
     }

package/dist/planning/pools.js

@@ -24,6 +24,7 @@ export function allocatePools(ctx) {
             account_id: e.account_id,
             function: e.function,
             line_key: `pool:${e.cost_center_key}:${e.line_key}`,
+            line_name: `${pool?.name ?? "Pool"} share: ${e.line_name}`,
             explanation: `${pool?.name ?? "Pool"}: ${e.explanation}`,
             stage: "pool",
             mtdc_share: 0,

package/dist/planning/revenue.js

@@ -31,26 +31,27 @@ export function bookRevenue(ctx) {
             ctx.warn("no_revenue_account", `Product ${product.name} has no revenue account`, product.id);
             continue;
         }
-        const book = (account, amount, line, explanation, mtdc_share = 1) => ctx.book({
+        const book = (account, amount, line, name, explanation, mtdc_share = 1) => ctx.book({
             cost_center_type: "offering",
             cost_center_key: offering.key,
             account_id: account,
             function: ctx.functionFor(account, null, "offering"),
             amount,
             line_key: `${line}:${offering.key}`,
+            line_name: name,
             explanation,
             mtdc_share,
         });
-        book(revenueAccount, total, "revenue", `${price}¢ × ${enrollment} enrolled`);
+        book(revenueAccount, total, "revenue", "Revenue", `${price}¢ × ${enrollment} enrolled`);
         if (offering.cogs_rate != null && offering.cogs_rate > 0) {
             const cogs = ctx.costAccount("cogs");
             if (cogs !== undefined)
-                book(cogs, total * offering.cogs_rate, "cogs", `${offering.cogs_rate} × revenue`);
+                book(cogs, total * offering.cogs_rate, "cogs", "Cost of goods sold", `${offering.cogs_rate} × revenue`);
         }
         for (const charge of ctx.data.plan_revenue_charges) {
             if (!(charge.product_kinds ?? []).includes(product.kind))
                 continue;
-            book(charge.account_id, total * charge.rate, `charge:${charge.key}`, `${charge.name}: ${charge.rate} × revenue`, charge.excluded_from_mtdc ? 0 : 1);
+            book(charge.account_id, total * charge.rate, `charge:${charge.key}`, charge.name, `${charge.name}: ${charge.rate} × revenue`, charge.excluded_from_mtdc ? 0 : 1);
         }
     }
 }

package/dist/planning/salaried.js

@@ -74,6 +74,7 @@ export function bookSalaries(ctx, coaching, booker) {
                 function: ctx.functionFor(account, null, "offering"),
                 amount: c.hours * (rate ?? 0) * scale,
                 line_key: `salary:${position.key}:${c.line}`,
+                line_name: `${position.name}: ${c.line}`,
                 explanation: `${position.name}: ${c.line} hours at the salary's hourly equivalent`,
                 wages: true,
             });
@@ -86,6 +87,7 @@ export function bookSalaries(ctx, coaching, booker) {
             function: ctx.functionFor(account, null, "pool"),
             amount: salary - demand * scale,
             line_key: `salary:${position.key}:remainder`,
+            line_name: `${position.name}: rest of salary`,
             explanation: `${position.name}: salary not charged to coaching or bookings`,
             wages: true,
         });

package/dist/planning/staffing.d.ts

@@ -11,6 +11,13 @@ export interface SalariedCoaching {
     /** The wages for `hourly` hours. */
     wages: number;
 }
+/** A salaried position's year of coaching two groups at once. */
+export interface DoubleBooked {
+    /** Hours another coach would need: n − 1 for each hour it's on n groups at once. */
+    hours: number;
+    /** Dates it's on two groups at once. */
+    dates: number;
+}
 /** Whole kids: `target_enrollment` if set, otherwise `capacity × fill_rate` rounded. */
 export declare function enrollmentOf(offering: PlanOffering): number;
 export declare class Staffing {
@@ -42,7 +49,7 @@ export declare class Staffing {
     private overlapping;
     /**
      * Warns when a salaried position coaches two activities at once that aren't staffed as one block
-     * group. It's still charged to both.
+     * group. It's still charged to both. Returns each position's double-booked hours and dates.
      */
     private checkDoubleBooked;
     /**
@@ -54,6 +61,7 @@ export declare class Staffing {
     run(scheduled: ScheduledActivity[]): {
         activities: ComputedActivity[];
         coaching: SalariedCoaching[];
+        doubleBooked: Map<Id, DoubleBooked>;
     };
     /**
      * A trip's coaches each fly and stay; the miles are driven once. Its coaches are those of its

package/dist/planning/staffing.js

@@ -231,7 +231,7 @@ export class Staffing {
     }
     /**
      * Warns when a salaried position coaches two activities at once that aren't staffed as one block
-     * group. It's still charged to both.
+     * group. It's still charged to both. Returns each position's double-booked hours and dates.
      */
     checkDoubleBooked(staffed) {
         const byDay = new Map();
@@ -244,6 +244,7 @@ export class Staffing {
             }
         }
         const names = new Map(this.ctx.data.plan_salaried_positions.map((p) => [p.key, p.name]));
+        const result = new Map();
         for (const [id, list] of byDay) {
             const [key, date] = id.split("|");
             const clash = list.flatMap((x, i) => list
@@ -251,8 +252,13 @@ export class Staffing {
                 .flatMap((y) => ((x.group !== null && x.group === y.group) || !overlaps(x, y) ? [] : [[x, y]])))[0];
             if (clash === undefined)
                 continue;
-            this.ctx.warn("position_double_booked", `${names.get(key) ?? key} coaches ${clash[0].a.offering.name} and ${clash[1].a.offering.name} at the same time on ${date}`, key);
+            const hours = extraCoachMinutes(list) / 60;
+            const sum = result.get(key) ?? { hours: 0, dates: 0 };
+            result.set(key, { hours: sum.hours + hours, dates: sum.dates + 1 });
+            this.ctx.warn("position_double_booked", `${names.get(key) ?? key} coaches ${clash[0].a.offering.name} and ${clash[1].a.offering.name} at the same time on ${date}` +
+                (hours > 0 ? `, so another coach is needed for ${round2(hours)} hours` : ""), key);
         }
+        return result;
     }
     /**
      * One RIB's hourly and daily cost, averaged over the RIB resources by `quantity`, and the part of
@@ -299,13 +305,15 @@ export class Staffing {
                 this.staffBlock(block, group);
             });
         }
-        this.checkDoubleBooked(staffed);
+        const doubleBooked = this.checkDoubleBooked(staffed);
         const coaching = [];
         const resourcesByActivity = new Map();
         for (const r of ctx.data.plan_activity_resources) {
             resourcesByActivity.set(r.activity_id, [...(resourcesByActivity.get(r.activity_id) ?? []), r]);
         }
         const resources = new Map(ctx.data.plan_resources.map((r) => [r.key, r]));
+        const boatClasses = new Map(ctx.data.boat_classes.map((c) => [c.id, c]));
+        const salaried = new Map(ctx.data.plan_salaried_positions.map((p) => [p.key, p]));
         const ribRate = this.ribRate();
         for (const s of staffed) {
             const { a } = s;
@@ -313,7 +321,7 @@ export class Staffing {
             const key = offering.key;
             const paidHours = a.paid_minutes / 60;
             const waterHours = a.on_water_minutes / 60;
-            const book = (type, amount, line, explanation, mtdcShare = 1) => {
+            const book = (type, amount, line, name, explanation, mtdcShare = 1) => {
                 if (amount === 0)
                     return;
                 const account = ctx.costAccount(type);
@@ -326,6 +334,7 @@ export class Staffing {
                     function: ctx.functionFor(account, null, "offering"),
                     amount,
                     line_key: `${line}:${key}`,
+                    line_name: name,
                     explanation,
                     mtdc_share: mtdcShare,
                     wages: type === "coach_wages",
@@ -343,8 +352,11 @@ export class Staffing {
             }
             const volunteer = s.level?.pay_type === "volunteer";
             const rate = volunteer ? 0 : (s.level?.hourly_rate_cents ?? 0);
-            const wages = hourly * paidHours * rate;
-            book("coach_wages", wages, "coach_wages", "Hourly coaches × paid hours × the coach level's rate");
+            // A salaried coach paid by the hour may have their own rate, even on a volunteer level.
+            const rateOf = (p) => salaried.get(p.key)?.hourly_coaching_rate_cents ?? rate;
+            const own = s.hourlyPositions.reduce((t, p) => t + p.coaches * (rateOf(p) - rate), 0);
+            const wages = (hourly * rate + own) * paidHours;
+            book("coach_wages", wages, "coach_wages", "Coach wages", "Hourly coaches × paid hours × each one's rate");
             for (const p of s.positions) {
                 coaching.push({
                     position_key: p.key,
@@ -356,7 +368,7 @@ export class Staffing {
             }
             for (const p of s.hourlyPositions) {
                 const hours = p.coaches * paidHours;
-                coaching.push({ position_key: p.key, offering_key: key, hours, pay: "hourly", wages: hours * rate });
+                coaching.push({ position_key: p.key, offering_key: key, hours, pay: "hourly", wages: hours * rateOf(p) });
             }
             if (s.ribs > 0 && waterHours > 0) {
                 if (ribRate === undefined) {
@@ -365,7 +377,7 @@ export class Staffing {
                 else {
                     const cost = s.ribs * (waterHours * ribRate.hourly + ribRate.daily);
                     const rental = s.ribs * (waterHours * ribRate.hourlyRental + ribRate.rental);
-                    book("ribs", cost, "ribs", "RIBs × on-water hours × the RIB rate, plus a day rate", cost > 0 ? 1 - rental / cost : 1);
+                    book("ribs", cost, "ribs", "RIBs", "RIBs × on-water hours × the RIB rate, plus a day rate", cost > 0 ? 1 - rental / cost : 1);
                 }
             }
             for (const [classId, boats] of s.boats) {
@@ -374,7 +386,7 @@ export class Staffing {
                 const boatRate = ctx.data.plan_boat_rates.find((r) => r.boat_class_id === classId);
                 if (boatRate === undefined)
                     continue;
-                book("boat_maintenance", boats * waterHours * boatRate.maintenance_per_boat_hour_cents, `boats:${classId}`, "Boats × on-water hours × the class's maintenance rate");
+                book("boat_maintenance", boats * waterHours * boatRate.maintenance_per_boat_hour_cents, `boats:${classId}`, `Boat maintenance: ${boatClasses.get(classId)?.name ?? "boats"}`, "Boats × on-water hours × the class's maintenance rate");
             }
             for (const use of resourcesByActivity.get(a.stored.id) ?? []) {
                 const resource = resources.get(use.resource_key);
@@ -383,12 +395,13 @@ export class Staffing {
                     continue;
                 }
                 const hours = use.hours ?? paidHours;
-                book("resources", use.quantity * (hours * hourlyCost(resource) + (resource.cost_per_day_cents ?? 0)), `resource:${use.resource_key}`, `${resource.name}: quantity × hours × hourly cost, plus a day rate`, resource.excluded_from_mtdc ? 0 : 1);
+                book("resources", use.quantity * (hours * hourlyCost(resource) + (resource.cost_per_day_cents ?? 0)), `resource:${use.resource_key}`, resource.name, `${resource.name}: quantity × hours × hourly cost, plus a day rate`, resource.excluded_from_mtdc ? 0 : 1);
             }
         }
         this.bookTrips(staffed);
         return {
             coaching,
+            doubleBooked,
             activities: staffed.map((s) => ({
                 offering_id: s.a.offering.id,
                 offering_key: s.a.offering.key,
@@ -441,6 +454,7 @@ export class Staffing {
                 function: ctx.functionFor(account, null, "offering"),
                 amount,
                 line_key: `trip:${trip.key}`,
+                line_name: trip.name,
                 explanation: `${trip.name}: ${round2(coaches)} coaches, ${trip.nights ?? 0} nights, ${trip.miles ?? 0} miles`,
             });
         }
@@ -456,6 +470,39 @@ function overlaps(x, y) {
         return true;
     return xs < ye && ys < xe;
 }
+/**
+ * Minutes another coach would cover among one position's activities on one date: at each moment
+ * it's on n groups, n − 1. A block group staffed together is one. Untimed activities add nothing.
+ */
+function extraCoachMinutes(list) {
+    const spans = new Map();
+    list.forEach((s, i) => {
+        if (s.a.start_minutes === null || s.a.end_minutes === null)
+            return;
+        const id = s.group ?? `own|${i}`;
+        const span = spans.get(id);
+        spans.set(id, {
+            start: Math.min(span?.start ?? Infinity, s.a.start_minutes),
+            end: Math.max(span?.end ?? -Infinity, s.a.end_minutes),
+        });
+    });
+    const edges = [...spans.values()]
+        .flatMap(({ start, end }) => [
+        { at: start, step: 1 },
+        { at: end, step: -1 },
+    ])
+        .sort((x, y) => x.at - y.at || x.step - y.step);
+    let on = 0;
+    let last = 0;
+    let minutes = 0;
+    for (const { at, step } of edges) {
+        if (on > 1)
+            minutes += (on - 1) * (at - last);
+        on += step;
+        last = at;
+    }
+    return minutes;
+}
 function hourlyCost(r) {
     return (r.cost_per_hour_cents ?? 0) + (r.fuel_per_hour_cents ?? 0) + (r.maintenance_per_hour_cents ?? 0);
 }

package/dist/planning/types.d.ts

@@ -83,6 +83,8 @@ export interface Plan {
 export interface PlanVersion {
     id: Id;
     plan_id: Id;
+    /** A saved area plan's: the Operations Plan version it was saved with. */
+    operations_version_id?: Id | null;
 }
 export type ActivityKind = "practice" | "regatta" | "clinic" | "travel";
 export interface PlanOffering extends Versioned {
@@ -196,6 +198,8 @@ export interface PlanSalariedPosition extends Versioned {
     /** The pool that takes the salary its hours don't charge to programs. */
     remainder_pool_id: Id | null;
     form_990_line: string | null;
+    /** What it's paid an hour to coach an offering that pays it by the hour, instead of the offering's level. */
+    hourly_coaching_rate_cents?: number | null;
 }
 /** Hours charged to a product, or to a program area and shared among its offerings: one of the two. */
 export interface PlanSalariedBooking extends Versioned {
@@ -313,6 +317,8 @@ export interface CostLine {
     /** Always positive: the account's type says whether it's revenue or expense. */
     amount_cents: number;
     line_key: string;
+    /** What the line is, in plain words, such as "G&A share: Payroll tax". */
+    line_name: string;
     explanation: string;
 }
 /** Revenue, expenses and net, in cents. */
@@ -393,6 +399,10 @@ export interface PositionSummary {
     total_pay_cents: number;
     /** The year's payroll tax on its total pay. */
     payroll_tax_cents: number;
+    /** Hours another coach would need while it's on two or more groups at once: n − 1 for n groups. */
+    double_booked_hours: number;
+    /** Dates it's on two or more groups at once. */
+    double_booked_dates: number;
 }
 export interface EngineOutput {
     lines: CostLine[];

package/dist/schema/index.d.ts

@@ -67,6 +67,8 @@ export interface Schema {
     resource_kinds: ResourceKinds[];
     sync_runs: SyncRuns[];
     sync_tasks: SyncTasks[];
+    version_set_members: VersionSetMembers[];
+    version_sets: VersionSets[];
 }
 /** The chart of accounts that plans, results, and actuals book to. */
 export interface Accounts {
@@ -685,8 +687,8 @@ export interface PlanResources {
 /** Each cost and revenue line in a saved version's P&L. Worked out when the version was saved, and never changed. */
 export interface PlanResultLines {
     id: string;
-    /** The saved version these results are for. */
-    version_id: string | PlanVersions;
+    /** The saved version these results are for, if they aren't a club plan's. */
+    version_id: string | PlanVersions | null;
     cost_center_type: "offering" | "product" | "program_area" | "pool" | "org";
     cost_center_key: string | null;
     cost_center_name: string;
@@ -694,15 +696,21 @@ export interface PlanResultLines {
     function: "program" | "management" | "fundraising" | null;
     /** Always positive: the account says whether it's revenue or a cost. In cents: 12500 is $125.00. */
     amount_cents: number;
-    /** What the line is, as the P&L names it. */
+    /** The engine's key for the line. */
     line: string;
     explanation: string | null;
+    /** The club plan these results are for, if they aren't a version's. */
+    version_set_id: string | VersionSets | null;
+    /** In a club plan's results, the plan that holds what it's charged to. */
+    version_set_member_id: string | VersionSetMembers | null;
+    /** What the line is, in plain words, such as G&A share: Payroll tax. */
+    line_name: string | null;
 }
 /** A saved version's P&L for each offering, product, and program area. Worked out when the version was saved, and never changed. */
 export interface PlanResultPnl {
     id: string;
-    /** The saved version these results are for. */
-    version_id: string | PlanVersions;
+    /** The saved version these results are for, if they aren't a club plan's. */
+    version_id: string | PlanVersions | null;
     level: "offering" | "product" | "program_area";
     subject_key: string;
     name: string;
@@ -717,12 +725,16 @@ export interface PlanResultPnl {
     enrollment: number;
     days: number;
     sailor_days: number;
+    /** The club plan these results are for, if they aren't a version's. */
+    version_set_id: string | VersionSets | null;
+    /** In a club plan's results, the plan that holds what it's charged to. */
+    version_set_member_id: string | VersionSetMembers | null;
 }
 /** Each salaried position's pay for the year, in a saved version. Worked out when the version was saved, and never changed. */
 export interface PlanResultPositions {
     id: string;
-    /** The saved version these results are for. */
-    version_id: string | PlanVersions;
+    /** The saved version these results are for, if they aren't a club plan's. */
+    version_id: string | PlanVersions | null;
     position_key: string;
     name: string;
     /** In cents: 12500 is $125.00. */
@@ -742,6 +754,12 @@ export interface PlanResultPositions {
     total_pay_cents: number;
     /** The year's payroll tax on the total pay. In cents: 12500 is $125.00. */
     payroll_tax_cents: number;
+    /** The club plan these results are for, if they aren't a version's. */
+    version_set_id: string | VersionSets | null;
+    /** Hours another coach would cover while this position coaches two or more groups at once: for three groups at once, two coaches. */
+    double_booked_hours: string | null;
+    /** Dates this position coaches two or more groups at once. */
+    double_booked_dates: number | null;
 }
 /** The other saved versions a version's results were worked out with. Worked out when the version was saved, and never changed. */
 export interface PlanResultVersions {
@@ -754,18 +772,20 @@ export interface PlanResultVersions {
 /** What the P&L warned about when a version was saved. Worked out when the version was saved, and never changed. */
 export interface PlanResultWarnings {
     id: string;
-    /** The saved version these results are for. */
-    version_id: string | PlanVersions;
+    /** The saved version these results are for, if they aren't a club plan's. */
+    version_id: string | PlanVersions | null;
     /** The kind of warning. */
     code: string;
     message: string;
     subject_key: string | null;
+    /** The club plan these results are for, if they aren't a version's. */
+    version_set_id: string | VersionSets | null;
 }
 /** A saved version's club-wide totals. Worked out when the version was saved, and never changed. */
 export interface PlanResults {
     id: string;
-    /** The saved version these results are for. */
-    version_id: string | PlanVersions;
+    /** The saved version these results are for, if they aren't a club plan's. */
+    version_id: string | PlanVersions | null;
     calculated_at: string;
     /** In cents: 12500 is $125.00. */
     operating_revenue_cents: number;
@@ -783,6 +803,8 @@ export interface PlanResults {
     capital_cents: number;
     /** Operating net, plus fundraising net, less capital. In cents: 12500 is $125.00. */
     total_cents: number;
+    /** The club plan these results are for, if they aren't a version's. */
+    version_set_id: string | VersionSets | null;
 }
 /** A charge set as a share of each offering's revenue, such as scholarships or card fees. Operations Plan only. */
 export interface PlanRevenueCharges {
@@ -835,6 +857,8 @@ export interface PlanSalariedPositions {
     /** The pool that takes the salary its hours don't charge to programs. */
     remainder_pool_id: string | PlanPools | null;
     form_990_line: string | null;
+    /** What this position is paid an hour to coach an offering that pays its salaried coach by the hour, instead of the offering's coach level. Leave empty to use the level. In cents: 12500 is $125.00. */
+    hourly_coaching_rate_cents: number | null;
 }
 /** A level hourly staff are paid at, such as head coach. */
 export interface PlanStaffLevels {
@@ -960,6 +984,8 @@ export interface Programs {
     name: string;
     /** The product this program belongs to. Its kind must be Program. */
     product_id: string | Products;
+    /** A team, such as a race team. Families on a team see everyone on every team. */
+    team: boolean;
     /** Who has a role in this program. */
     role_assignments: (string | ProgramRoleAssignments)[];
     /** The program's Google Group, if it has one. Most programs don't. */
@@ -1024,3 +1050,33 @@ export interface SyncTasks {
     /** Set once the task has failed too many times. It keeps retrying; this flags it for staff. */
     needs_attention: boolean;
 }
+/** One plan's version in a club plan. Set when the club plan is saved, and never changed. */
+export interface VersionSetMembers {
+    id: string;
+    version_set_id: string | VersionSets;
+    plan_id: string | Plans;
+    /** The plan's active version when the club plan was saved. */
+    version_id: string | PlanVersions;
+}
+/** The club's plan for a year, saved: the active Operations Plan version and each program area's, with the P&L they make together. Saved when it's added, and never changed. */
+export interface VersionSets {
+    id: string;
+    /** The organization the club plan is for. */
+    organization_id: string | Organizations;
+    /** The year the club plan is for. */
+    fiscal_year: number;
+    /** Such as 2027 budget as adopted. */
+    name: string;
+    /** Why it was saved. */
+    message: string | null;
+    /** Set when the club plan is saved. */
+    saved_by: string | null;
+    /** Set when the club plan is saved. */
+    saved_at: string | null;
+    /** The version of the planning engine that calculated its numbers. */
+    platform_version: string | null;
+    /** The active version of each plan when the club plan was saved. */
+    members: (string | VersionSetMembers)[];
+    /** What the club's P&L showed when it was saved, worked out a moment after. A club plan with none means working them out failed, and an admin can fill them in. */
+    results: (string | PlanResults)[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyc-seattle/platform",
-  "version": "1.22.1",
+  "version": "1.24.0",
   "description": "Pulumi components for CYC's shared Google Cloud platform: WebService, the platform outputs reader, and the stacks that build the platform",
   "author": "CYC Community Sailing Center",
   "license": "Apache-2.0",