@aneuhold/core-ts-db-lib 4.1.11 → 4.1.13

package/lib/services/workout/ExerciseCalibration/WorkoutExerciseCalibrationService.ts

@@ -1,4 +1,10 @@
+import type { UUID } from 'crypto';
+import type { WorkoutExerciseCTO } from '../../../ctos/workout/WorkoutExerciseCTO.js';
 import type { WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
+import { WorkoutExerciseCalibrationSchema } from '../../../documents/workout/WorkoutExerciseCalibration.js';
+
+/** Divisor used in the NASM 1RM formula: 1RM = (weight × reps / 30.48) + weight */
+const NASM_1RM_DIVISOR = 30.48;
 
 /**
  * A service for handling operations related to {@link WorkoutExerciseCalibration}s.
@@ -22,7 +28,21 @@ export default class WorkoutExerciseCalibrationService {
    * @param reps The number of reps performed.
    */
   static get1RMRaw(weight: number, reps: number): number {
-    return (weight * reps) / 30.48 + weight;
+    return (weight * reps) / NASM_1RM_DIVISOR + weight;
+  }
+
+  /**
+   * Returns the NASM 1RM formula as a MongoDB aggregation expression.
+   * This is the MongoDB-equivalent of {@link get1RMRaw} and must be kept
+   * in sync with it.
+   *
+   * @param weightField The MongoDB field reference for weight (e.g. `'$weight'`).
+   * @param repsField The MongoDB field reference for reps (e.g. `'$reps'`).
+   */
+  static get1RMMongoExpr(weightField: string, repsField: string) {
+    return {
+      $add: [{ $divide: [{ $multiply: [weightField, repsField] }, NASM_1RM_DIVISOR] }, weightField]
+    };
   }
 
   /**
@@ -36,20 +56,83 @@ export default class WorkoutExerciseCalibrationService {
    */
   static getTargetWeight(calibration: WorkoutExerciseCalibration, targetReps: number): number {
     const oneRepMax = this.get1RM(calibration);
+    return this.getTargetWeightFrom1RM(oneRepMax, targetReps);
+  }
+
+  /**
+   * Calculates the target weight from a raw 1RM value and a target rep count.
+   *
+   * This applies the same targetPercentage formula as {@link getTargetWeight}
+   * but accepts a pre-computed 1RM instead of a calibration document. Useful
+   * when the effective 1RM is derived from multiple sources (calibrations and
+   * actual sets).
+   *
+   * Returns the calculated weight without rounding. Consumer can use
+   * WorkoutEquipmentTypeService.findNearestWeight() to round if needed.
+   *
+   * @param effective1RM The effective 1 Rep Max value.
+   * @param targetReps The target number of reps.
+   */
+  static getTargetWeightFrom1RM(effective1RM: number, targetReps: number): number {
     const targetPercentage = this.getTargetPercentage(targetReps);
-    return (targetPercentage / 100) * oneRepMax;
+    return (targetPercentage / 100) * effective1RM;
+  }
+
+  /**
+   * Generates auto-calibrations from exercise CTOs whose best set 1RM exceeds
+   * their best calibration 1RM.
+   *
+   * The CTO already provides `bestCalibration` and `bestSet` per exercise, so
+   * this method just compares those two pre-computed values and creates new
+   * calibrations where the set wins.
+   *
+   * @param exerciseCTOs The exercise CTOs to evaluate.
+   * @param userId The user ID for the new calibrations.
+   * @param dateRecorded The date to use as dateRecorded for new calibrations.
+   */
+  static generateAutoCalibrations(
+    exerciseCTOs: WorkoutExerciseCTO[],
+    userId: UUID,
+    dateRecorded: Date
+  ): WorkoutExerciseCalibration[] {
+    const newCalibrations: WorkoutExerciseCalibration[] = [];
+
+    for (const cto of exerciseCTOs) {
+      const { bestSet, bestCalibration } = cto;
+      if (!bestSet?.actualWeight || !bestSet.actualReps || bestSet.actualReps <= 0) continue;
+
+      const set1RM = this.get1RMRaw(bestSet.actualWeight, bestSet.actualReps);
+      const cal1RM = bestCalibration ? this.get1RM(bestCalibration) : 0;
+
+      if (set1RM > cal1RM) {
+        newCalibrations.push(
+          WorkoutExerciseCalibrationSchema.parse({
+            userId,
+            workoutExerciseId: cto._id,
+            weight: bestSet.actualWeight,
+            reps: bestSet.actualReps,
+            exerciseProperties: bestSet.exerciseProperties,
+            dateRecorded,
+            associatedWorkoutSetId: bestSet._id
+          })
+        );
+      }
+    }
+
+    return newCalibrations;
   }
 
   /**
    * Calculates the target percentage of 1RM for a given target rep count.
    *
-   * Uses the formula: targetPercentage = 30 + ((targetReps - 5) * 2.2)
+   * Uses the formula: targetPercentage = 85 - ((targetReps - 5) * 2.2)
    *
-   * This ensures training stays within the 30%-85% 1RM range (30 reps to 5 reps).
+   * This ensures training stays within the 85%-30% 1RM range (5 reps to 30 reps).
+   * Higher rep counts produce lower percentages of 1RM.
    *
    * @param targetReps The target number of reps.
    */
   private static getTargetPercentage(targetReps: number): number {
-    return 30 + (targetReps - 5) * 2.2;
+    return 85 - (targetReps - 5) * 2.2;
   }
 }

package/lib/services/workout/Mesocycle/WorkoutMesocyclePlanContext.d.ts

@@ -1,12 +1,14 @@
 import type { UUID } from 'crypto';
+import type { WorkoutExerciseCTO } from '../../../ctos/workout/WorkoutExerciseCTO.js';
+import type { WorkoutMuscleGroupVolumeCTO } from '../../../ctos/workout/WorkoutMuscleGroupVolumeCTO.js';
 import type { WorkoutEquipmentType } from '../../../documents/workout/WorkoutEquipmentType.js';
 import type { WorkoutExercise } from '../../../documents/workout/WorkoutExercise.js';
-import type { CalibrationExercisePair, WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
 import type { WorkoutMesocycle } from '../../../documents/workout/WorkoutMesocycle.js';
 import type { WorkoutMicrocycle } from '../../../documents/workout/WorkoutMicrocycle.js';
 import type { WorkoutSession } from '../../../documents/workout/WorkoutSession.js';
 import type { WorkoutSessionExercise } from '../../../documents/workout/WorkoutSessionExercise.js';
 import type { WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
+import type { WorkoutVolumeLandmarkEstimate } from '../../../ctos/workout/WorkoutMuscleGroupVolumeCTO.js';
 /**
  * Central shared context for generating or updating a {@link WorkoutMesocycle}.
  *
@@ -21,15 +23,25 @@ export default class WorkoutMesocyclePlanContext {
     existingSessionExercises: WorkoutSessionExercise[];
     existingSets: WorkoutSet[];
     /**
-     * A constant for now that defines what the target RIR is for the first microcycle of every mesocycle,
-     * regardless of anything else.
+     * The target RIR for the first microcycle of the mesocycle. Varies by cycle
+     * type: MuscleGain starts at 4, Cut starts at 3, Resensitization stays at 3.
      */
-    readonly FIRST_MICROCYCLE_RIR = 4;
-    readonly calibrationMap: Map<UUID, WorkoutExerciseCalibration>;
+    readonly firstMicrocycleRir: number;
+    /**
+     * Number of microcycles between each baseline set addition.
+     * MuscleGain = 1 (every microcycle), Cut = 2 (every other), Resensitization = 0 (never).
+     */
+    readonly progressionInterval: number;
+    /**
+     * Whether this mesocycle type skips the deload microcycle. True for
+     * Resensitization cycles.
+     */
+    readonly skipDeload: boolean;
     readonly exerciseMap: Map<UUID, WorkoutExercise>;
     readonly equipmentMap: Map<UUID, WorkoutEquipmentType>;
     readonly sessionMap: Map<UUID, WorkoutSession>;
     readonly sessionExerciseMap: Map<UUID, WorkoutSessionExercise>;
+    readonly setMap: Map<UUID, WorkoutSet>;
     readonly microcyclesToCreate: WorkoutMicrocycle[];
     /**
      * All microcycles for this mesocycle in chronological order.
@@ -42,10 +54,10 @@ export default class WorkoutMesocyclePlanContext {
     readonly sessionExercisesToCreate: WorkoutSessionExercise[];
     readonly setsToCreate: WorkoutSet[];
     /**
-     * The array of sessions corresponding to the array of calibration exercise pairs, in order,
+     * The array of sessions corresponding to the array of exercise CTOs, in order,
      * for that session.
      */
-    plannedSessionExercisePairs: CalibrationExercisePair[][] | undefined;
+    plannedSessionExerciseCTOs: WorkoutExerciseCTO[][] | undefined;
     /**
      * Stores the mesocycle's muscle-group-wide exercise ordering.
      *
@@ -53,12 +65,17 @@ export default class WorkoutMesocyclePlanContext {
      * exercises that share a primary muscle group, regardless of which session they
      * ended up in.
      */
-    muscleGroupToExercisePairsMap: Map<UUID, CalibrationExercisePair[]> | undefined;
+    muscleGroupToExerciseCTOsMap: Map<UUID, WorkoutExerciseCTO[]> | undefined;
+    /**
+     * Maps muscle group ID to its estimated volume landmarks (MEV, MRV, MAV).
+     * Populated from WorkoutMuscleGroupVolumeCTOs when provided.
+     */
+    muscleGroupToVolumeLandmarkMap: Map<UUID, WorkoutVolumeLandmarkEstimate>;
     exerciseIdToSessionIndex: Map<UUID, number> | undefined;
     /**
      * Creates a new workout mesocycle planning context.
      */
-    constructor(mesocycle: WorkoutMesocycle, calibrations: WorkoutExerciseCalibration[], exercises: WorkoutExercise[], equipmentTypes: WorkoutEquipmentType[], existingMicrocycles?: WorkoutMicrocycle[], existingSessions?: WorkoutSession[], existingSessionExercises?: WorkoutSessionExercise[], existingSets?: WorkoutSet[]);
+    constructor(mesocycle: WorkoutMesocycle, exerciseCTOs: WorkoutExerciseCTO[], volumeCTOs?: WorkoutMuscleGroupVolumeCTO[], existingMicrocycles?: WorkoutMicrocycle[], existingSessions?: WorkoutSession[], existingSessionExercises?: WorkoutSessionExercise[], existingSets?: WorkoutSet[]);
     /**
      * Adds a microcycle to the list of microcycles to create and the overall chronological list.
      */
@@ -71,13 +88,17 @@ export default class WorkoutMesocyclePlanContext {
      * Adds a session exercise to the context and updates internal maps.
      */
     addSessionExercise(sessionExercise: WorkoutSessionExercise): void;
+    /**
+     * Adds sets to the context and updates the set map for O(1) lookup.
+     */
+    addSets(sets: WorkoutSet[]): void;
     /**
      * Stores the planned session -> exercises structure for the mesocycle and derives
      * the muscle-group-wide ordering used for set progression.
      */
-    setPlannedSessionExercisePairs(plannedSessionExercisePairs: CalibrationExercisePair[][]): void;
+    setPlannedSessionExerciseCTOs(plannedSessionExerciseCTOs: WorkoutExerciseCTO[][]): void;
     /**
-     * Builds and stores a map of primary muscle group -> ordered exercise pairs for the mesocycle plan.
+     * Builds and stores a map of primary muscle group -> ordered exercise CTOs for the mesocycle plan.
      *
      * Also builds a map of exercise ID -> session index for use during session generation.
      *
@@ -85,6 +106,6 @@ export default class WorkoutMesocyclePlanContext {
      * each session in order. This allows set progression to be distributed evenly across a muscle group
      * for the entire microcycle, even when exercises are split across sessions.
      */
-    private buildSessionPairsMaps;
+    private buildSessionCTOMaps;
 }
 //# sourceMappingURL=WorkoutMesocyclePlanContext.d.ts.map

package/lib/services/workout/Mesocycle/WorkoutMesocyclePlanContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutMesocyclePlanContext.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Mesocycle/WorkoutMesocyclePlanContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,KAAK,EACV,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,0DAA0D,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA2B;IA4CrC,SAAS,EAAE,gBAAgB;IAI3B,mBAAmB,EAAE,iBAAiB,EAAE;IACxC,gBAAgB,EAAE,cAAc,EAAE;IAClC,wBAAwB,EAAE,sBAAsB,EAAE;IAClD,YAAY,EAAE,UAAU,EAAE;IAlDnC;;;OAGG;IACH,SAAgB,oBAAoB,KAAK;IAEzC,SAAgB,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;IACtE,SAAgB,WAAW,EAAE,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACxD,SAAgB,YAAY,EAAE,GAAG,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC9D,SAAgB,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACtD,SAAgB,kBAAkB,EAAE,GAAG,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAEtE,SAAgB,mBAAmB,EAAE,iBAAiB,EAAE,CAAM;IAC9D;;;;;OAKG;IACH,SAAgB,kBAAkB,EAAE,iBAAiB,EAAE,CAAM;IAC7D,SAAgB,gBAAgB,EAAE,cAAc,EAAE,CAAM;IACxD,SAAgB,wBAAwB,EAAE,sBAAsB,EAAE,CAAM;IACxE,SAAgB,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhD;;;OAGG;IACI,2BAA2B,EAAE,uBAAuB,EAAE,EAAE,GAAG,SAAS,CAAC;IAC5E;;;;;;OAMG;IACI,6BAA6B,EAAE,GAAG,CAAC,IAAI,EAAE,uBAAuB,EAAE,CAAC,GAAG,SAAS,CAAC;IAChF,wBAAwB,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAE/D;;OAEG;gBAEM,SAAS,EAAE,gBAAgB,EAClC,YAAY,EAAE,0BAA0B,EAAE,EAC1C,SAAS,EAAE,eAAe,EAAE,EAC5B,cAAc,EAAE,oBAAoB,EAAE,EAC/B,mBAAmB,GAAE,iBAAiB,EAAO,EAC7C,gBAAgB,GAAE,cAAc,EAAO,EACvC,wBAAwB,GAAE,sBAAsB,EAAO,EACvD,YAAY,GAAE,UAAU,EAAO;IAcxC;;OAEG;IACI,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAKvD;;OAEG;IACI,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAKhD;;OAEG;IACI,kBAAkB,CAAC,eAAe,EAAE,sBAAsB,GAAG,IAAI;IAKxE;;;OAGG;IACI,8BAA8B,CACnC,2BAA2B,EAAE,uBAAuB,EAAE,EAAE,GACvD,IAAI;IAKP;;;;;;;;OAQG;IACH,OAAO,CAAC,qBAAqB;CA6B9B"}
+{"version":3,"file":"WorkoutMesocyclePlanContext.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Mesocycle/WorkoutMesocyclePlanContext.ts"],"names":[],"mappings":"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"}

package/lib/services/workout/Mesocycle/WorkoutMesocyclePlanContext.js

@@ -1,3 +1,5 @@
+import { CycleType } from '../../../documents/workout/WorkoutMesocycle.js';
+import WorkoutVolumePlanningService from '../util/VolumePlanning/WorkoutVolumePlanningService.js';
 /**
  * Central shared context for generating or updating a {@link WorkoutMesocycle}.
  *
@@ -12,15 +14,25 @@ export default class WorkoutMesocyclePlanContext {
     existingSessionExercises;
     existingSets;
     /**
-     * A constant for now that defines what the target RIR is for the first microcycle of every mesocycle,
-     * regardless of anything else.
+     * The target RIR for the first microcycle of the mesocycle. Varies by cycle
+     * type: MuscleGain starts at 4, Cut starts at 3, Resensitization stays at 3.
      */
-    FIRST_MICROCYCLE_RIR = 4;
-    calibrationMap;
+    firstMicrocycleRir;
+    /**
+     * Number of microcycles between each baseline set addition.
+     * MuscleGain = 1 (every microcycle), Cut = 2 (every other), Resensitization = 0 (never).
+     */
+    progressionInterval;
+    /**
+     * Whether this mesocycle type skips the deload microcycle. True for
+     * Resensitization cycles.
+     */
+    skipDeload;
     exerciseMap;
     equipmentMap;
     sessionMap;
     sessionExerciseMap;
+    setMap;
     microcyclesToCreate = [];
     /**
      * All microcycles for this mesocycle in chronological order.
@@ -33,10 +45,10 @@ export default class WorkoutMesocyclePlanContext {
     sessionExercisesToCreate = [];
     setsToCreate = [];
     /**
-     * The array of sessions corresponding to the array of calibration exercise pairs, in order,
+     * The array of sessions corresponding to the array of exercise CTOs, in order,
      * for that session.
      */
-    plannedSessionExercisePairs;
+    plannedSessionExerciseCTOs;
     /**
      * Stores the mesocycle's muscle-group-wide exercise ordering.
      *
@@ -44,22 +56,48 @@ export default class WorkoutMesocyclePlanContext {
      * exercises that share a primary muscle group, regardless of which session they
      * ended up in.
      */
-    muscleGroupToExercisePairsMap;
+    muscleGroupToExerciseCTOsMap;
+    /**
+     * Maps muscle group ID to its estimated volume landmarks (MEV, MRV, MAV).
+     * Populated from WorkoutMuscleGroupVolumeCTOs when provided.
+     */
+    muscleGroupToVolumeLandmarkMap;
     exerciseIdToSessionIndex;
     /**
      * Creates a new workout mesocycle planning context.
      */
-    constructor(mesocycle, calibrations, exercises, equipmentTypes, existingMicrocycles = [], existingSessions = [], existingSessionExercises = [], existingSets = []) {
+    constructor(mesocycle, exerciseCTOs, volumeCTOs = [], existingMicrocycles = [], existingSessions = [], existingSessionExercises = [], existingSets = []) {
         this.mesocycle = mesocycle;
         this.existingMicrocycles = existingMicrocycles;
         this.existingSessions = existingSessions;
         this.existingSessionExercises = existingSessionExercises;
         this.existingSets = existingSets;
-        this.calibrationMap = new Map(calibrations.map((c) => [c._id, c]));
-        this.exerciseMap = new Map(exercises.map((e) => [e._id, e]));
-        this.equipmentMap = new Map(equipmentTypes.map((et) => [et._id, et]));
+        // Set cycle-type-specific planning parameters
+        const { cycleType } = mesocycle;
+        if (cycleType === CycleType.Cut) {
+            this.firstMicrocycleRir = 3;
+            this.progressionInterval = 2;
+            this.skipDeload = false;
+        }
+        else if (cycleType === CycleType.Resensitization) {
+            this.firstMicrocycleRir = 3;
+            this.progressionInterval = 0;
+            this.skipDeload = true;
+        }
+        else {
+            this.firstMicrocycleRir = 4;
+            this.progressionInterval = 1;
+            this.skipDeload = false;
+        }
+        // Build volume landmark estimates from historical CTOs
+        this.muscleGroupToVolumeLandmarkMap = new Map(volumeCTOs.map((cto) => [cto._id, WorkoutVolumePlanningService.estimateVolumeLandmarks(cto)]));
+        // Derive exercise map from CTOs
+        this.exerciseMap = new Map(exerciseCTOs.map((cto) => [cto._id, cto]));
+        // Derive equipment map from CTOs
+        this.equipmentMap = new Map(exerciseCTOs.map((cto) => [cto.equipmentType._id, cto.equipmentType]));
         this.sessionMap = new Map(existingSessions.map((s) => [s._id, s]));
         this.sessionExerciseMap = new Map(existingSessionExercises.map((s) => [s._id, s]));
+        this.setMap = new Map(existingSets.map((s) => [s._id, s]));
         const existingMicrocyclesForMesocycle = existingMicrocycles
             .filter((m) => m.workoutMesocycleId === mesocycle._id)
             .sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
@@ -86,16 +124,25 @@ export default class WorkoutMesocyclePlanContext {
         this.sessionExercisesToCreate.push(sessionExercise);
         this.sessionExerciseMap.set(sessionExercise._id, sessionExercise);
     }
+    /**
+     * Adds sets to the context and updates the set map for O(1) lookup.
+     */
+    addSets(sets) {
+        this.setsToCreate.push(...sets);
+        for (const set of sets) {
+            this.setMap.set(set._id, set);
+        }
+    }
     /**
      * Stores the planned session -> exercises structure for the mesocycle and derives
      * the muscle-group-wide ordering used for set progression.
      */
-    setPlannedSessionExercisePairs(plannedSessionExercisePairs) {
-        this.plannedSessionExercisePairs = plannedSessionExercisePairs;
-        this.buildSessionPairsMaps(plannedSessionExercisePairs);
+    setPlannedSessionExerciseCTOs(plannedSessionExerciseCTOs) {
+        this.plannedSessionExerciseCTOs = plannedSessionExerciseCTOs;
+        this.buildSessionCTOMaps(plannedSessionExerciseCTOs);
     }
     /**
-     * Builds and stores a map of primary muscle group -> ordered exercise pairs for the mesocycle plan.
+     * Builds and stores a map of primary muscle group -> ordered exercise CTOs for the mesocycle plan.
      *
      * Also builds a map of exercise ID -> session index for use during session generation.
      *
@@ -103,28 +150,27 @@ export default class WorkoutMesocyclePlanContext {
      * each session in order. This allows set progression to be distributed evenly across a muscle group
      * for the entire microcycle, even when exercises are split across sessions.
      */
-    buildSessionPairsMaps(sessionsToExercisePairs) {
-        const muscleGroupToPairsMap = new Map();
+    buildSessionCTOMaps(sessionsToCTOs) {
+        const muscleGroupToCTOsMap = new Map();
         const exerciseIdToSessionIndex = new Map();
-        for (let sessionIndex = 0; sessionIndex < sessionsToExercisePairs.length; sessionIndex++) {
-            const sessionExercisePairs = sessionsToExercisePairs[sessionIndex];
-            for (const exercisePair of sessionExercisePairs) {
-                // Set the session index for this exercise as well
-                exerciseIdToSessionIndex.set(exercisePair.exercise._id, sessionIndex);
-                const primaryMuscleGroupId = exercisePair.exercise.primaryMuscleGroups[0];
+        for (let sessionIndex = 0; sessionIndex < sessionsToCTOs.length; sessionIndex++) {
+            const sessionCTOs = sessionsToCTOs[sessionIndex];
+            for (const cto of sessionCTOs) {
+                exerciseIdToSessionIndex.set(cto._id, sessionIndex);
+                const primaryMuscleGroupId = cto.primaryMuscleGroups[0];
                 if (!primaryMuscleGroupId) {
-                    throw new Error(`Exercise ${exercisePair.exercise._id}, ${exercisePair.exercise.exerciseName} has no primary muscle group`);
+                    throw new Error(`Exercise ${cto._id}, ${cto.exerciseName} has no primary muscle group`);
                 }
-                const existing = muscleGroupToPairsMap.get(primaryMuscleGroupId);
+                const existing = muscleGroupToCTOsMap.get(primaryMuscleGroupId);
                 if (existing) {
-                    existing.push(exercisePair);
+                    existing.push(cto);
                 }
                 else {
-                    muscleGroupToPairsMap.set(primaryMuscleGroupId, [exercisePair]);
+                    muscleGroupToCTOsMap.set(primaryMuscleGroupId, [cto]);
                 }
             }
         }
-        this.muscleGroupToExercisePairsMap = muscleGroupToPairsMap;
+        this.muscleGroupToExerciseCTOsMap = muscleGroupToCTOsMap;
         this.exerciseIdToSessionIndex = exerciseIdToSessionIndex;
     }
 }

package/lib/services/workout/Mesocycle/WorkoutMesocyclePlanContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutMesocyclePlanContext.js","sourceRoot":"","sources":["../../../../src/services/workout/Mesocycle/WorkoutMesocyclePlanContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkoutMesocyclePlanContext.js","sourceRoot":"","sources":["../../../../src/services/workout/Mesocycle/WorkoutMesocyclePlanContext.ts"],"names":[],"mappings":"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"}

package/lib/services/workout/Mesocycle/WorkoutMesocyclePlanContext.ts

@@ -1,15 +1,16 @@
 import type { UUID } from 'crypto';
+import type { WorkoutExerciseCTO } from '../../../ctos/workout/WorkoutExerciseCTO.js';
+import type { WorkoutMuscleGroupVolumeCTO } from '../../../ctos/workout/WorkoutMuscleGroupVolumeCTO.js';
 import type { WorkoutEquipmentType } from '../../../documents/workout/WorkoutEquipmentType.js';
 import type { WorkoutExercise } from '../../../documents/workout/WorkoutExercise.js';
-import type {
-  CalibrationExercisePair,
-  WorkoutExerciseCalibration
-} from '../../../documents/workout/WorkoutExerciseCalibration.js';
 import type { WorkoutMesocycle } from '../../../documents/workout/WorkoutMesocycle.js';
+import { CycleType } from '../../../documents/workout/WorkoutMesocycle.js';
 import type { WorkoutMicrocycle } from '../../../documents/workout/WorkoutMicrocycle.js';
 import type { WorkoutSession } from '../../../documents/workout/WorkoutSession.js';
 import type { WorkoutSessionExercise } from '../../../documents/workout/WorkoutSessionExercise.js';
 import type { WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
+import type { WorkoutVolumeLandmarkEstimate } from '../../../ctos/workout/WorkoutMuscleGroupVolumeCTO.js';
+import WorkoutVolumePlanningService from '../util/VolumePlanning/WorkoutVolumePlanningService.js';
 
 /**
  * Central shared context for generating or updating a {@link WorkoutMesocycle}.
@@ -20,16 +21,28 @@ import type { WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
  */
 export default class WorkoutMesocyclePlanContext {
   /**
-   * A constant for now that defines what the target RIR is for the first microcycle of every mesocycle,
-   * regardless of anything else.
+   * The target RIR for the first microcycle of the mesocycle. Varies by cycle
+   * type: MuscleGain starts at 4, Cut starts at 3, Resensitization stays at 3.
    */
-  public readonly FIRST_MICROCYCLE_RIR = 4;
+  public readonly firstMicrocycleRir: number;
+
+  /**
+   * Number of microcycles between each baseline set addition.
+   * MuscleGain = 1 (every microcycle), Cut = 2 (every other), Resensitization = 0 (never).
+   */
+  public readonly progressionInterval: number;
+
+  /**
+   * Whether this mesocycle type skips the deload microcycle. True for
+   * Resensitization cycles.
+   */
+  public readonly skipDeload: boolean;
 
-  public readonly calibrationMap: Map<UUID, WorkoutExerciseCalibration>;
   public readonly exerciseMap: Map<UUID, WorkoutExercise>;
   public readonly equipmentMap: Map<UUID, WorkoutEquipmentType>;
   public readonly sessionMap: Map<UUID, WorkoutSession>;
   public readonly sessionExerciseMap: Map<UUID, WorkoutSessionExercise>;
+  public readonly setMap: Map<UUID, WorkoutSet>;
 
   public readonly microcyclesToCreate: WorkoutMicrocycle[] = [];
   /**
@@ -44,10 +57,10 @@ export default class WorkoutMesocyclePlanContext {
   public readonly setsToCreate: WorkoutSet[] = [];
 
   /**
-   * The array of sessions corresponding to the array of calibration exercise pairs, in order,
+   * The array of sessions corresponding to the array of exercise CTOs, in order,
    * for that session.
    */
-  public plannedSessionExercisePairs: CalibrationExercisePair[][] | undefined;
+  public plannedSessionExerciseCTOs: WorkoutExerciseCTO[][] | undefined;
   /**
    * Stores the mesocycle's muscle-group-wide exercise ordering.
    *
@@ -55,7 +68,12 @@ export default class WorkoutMesocyclePlanContext {
    * exercises that share a primary muscle group, regardless of which session they
    * ended up in.
    */
-  public muscleGroupToExercisePairsMap: Map<UUID, CalibrationExercisePair[]> | undefined;
+  public muscleGroupToExerciseCTOsMap: Map<UUID, WorkoutExerciseCTO[]> | undefined;
+  /**
+   * Maps muscle group ID to its estimated volume landmarks (MEV, MRV, MAV).
+   * Populated from WorkoutMuscleGroupVolumeCTOs when provided.
+   */
+  public muscleGroupToVolumeLandmarkMap: Map<UUID, WorkoutVolumeLandmarkEstimate>;
   public exerciseIdToSessionIndex: Map<UUID, number> | undefined;
 
   /**
@@ -63,19 +81,45 @@ export default class WorkoutMesocyclePlanContext {
    */
   constructor(
     public mesocycle: WorkoutMesocycle,
-    calibrations: WorkoutExerciseCalibration[],
-    exercises: WorkoutExercise[],
-    equipmentTypes: WorkoutEquipmentType[],
+    exerciseCTOs: WorkoutExerciseCTO[],
+    volumeCTOs: WorkoutMuscleGroupVolumeCTO[] = [],
     public existingMicrocycles: WorkoutMicrocycle[] = [],
     public existingSessions: WorkoutSession[] = [],
     public existingSessionExercises: WorkoutSessionExercise[] = [],
     public existingSets: WorkoutSet[] = []
   ) {
-    this.calibrationMap = new Map(calibrations.map((c) => [c._id, c]));
-    this.exerciseMap = new Map(exercises.map((e) => [e._id, e]));
-    this.equipmentMap = new Map(equipmentTypes.map((et) => [et._id, et]));
+    // Set cycle-type-specific planning parameters
+    const { cycleType } = mesocycle;
+    if (cycleType === CycleType.Cut) {
+      this.firstMicrocycleRir = 3;
+      this.progressionInterval = 2;
+      this.skipDeload = false;
+    } else if (cycleType === CycleType.Resensitization) {
+      this.firstMicrocycleRir = 3;
+      this.progressionInterval = 0;
+      this.skipDeload = true;
+    } else {
+      this.firstMicrocycleRir = 4;
+      this.progressionInterval = 1;
+      this.skipDeload = false;
+    }
+
+    // Build volume landmark estimates from historical CTOs
+    this.muscleGroupToVolumeLandmarkMap = new Map(
+      volumeCTOs.map((cto) => [cto._id, WorkoutVolumePlanningService.estimateVolumeLandmarks(cto)])
+    );
+
+    // Derive exercise map from CTOs
+    this.exerciseMap = new Map(exerciseCTOs.map((cto) => [cto._id, cto]));
+
+    // Derive equipment map from CTOs
+    this.equipmentMap = new Map(
+      exerciseCTOs.map((cto) => [cto.equipmentType._id, cto.equipmentType])
+    );
+
     this.sessionMap = new Map(existingSessions.map((s) => [s._id, s]));
     this.sessionExerciseMap = new Map(existingSessionExercises.map((s) => [s._id, s]));
+    this.setMap = new Map(existingSets.map((s) => [s._id, s]));
 
     const existingMicrocyclesForMesocycle = existingMicrocycles
       .filter((m) => m.workoutMesocycleId === mesocycle._id)
@@ -107,19 +151,27 @@ export default class WorkoutMesocyclePlanContext {
     this.sessionExerciseMap.set(sessionExercise._id, sessionExercise);
   }
 
+  /**
+   * Adds sets to the context and updates the set map for O(1) lookup.
+   */
+  public addSets(sets: WorkoutSet[]): void {
+    this.setsToCreate.push(...sets);
+    for (const set of sets) {
+      this.setMap.set(set._id, set);
+    }
+  }
+
   /**
    * Stores the planned session -> exercises structure for the mesocycle and derives
    * the muscle-group-wide ordering used for set progression.
    */
-  public setPlannedSessionExercisePairs(
-    plannedSessionExercisePairs: CalibrationExercisePair[][]
-  ): void {
-    this.plannedSessionExercisePairs = plannedSessionExercisePairs;
-    this.buildSessionPairsMaps(plannedSessionExercisePairs);
+  public setPlannedSessionExerciseCTOs(plannedSessionExerciseCTOs: WorkoutExerciseCTO[][]): void {
+    this.plannedSessionExerciseCTOs = plannedSessionExerciseCTOs;
+    this.buildSessionCTOMaps(plannedSessionExerciseCTOs);
   }
 
   /**
-   * Builds and stores a map of primary muscle group -> ordered exercise pairs for the mesocycle plan.
+   * Builds and stores a map of primary muscle group -> ordered exercise CTOs for the mesocycle plan.
    *
    * Also builds a map of exercise ID -> session index for use during session generation.
    *
@@ -127,33 +179,30 @@ export default class WorkoutMesocyclePlanContext {
    * each session in order. This allows set progression to be distributed evenly across a muscle group
    * for the entire microcycle, even when exercises are split across sessions.
    */
-  private buildSessionPairsMaps(sessionsToExercisePairs: CalibrationExercisePair[][]): void {
-    const muscleGroupToPairsMap = new Map<UUID, CalibrationExercisePair[]>();
+  private buildSessionCTOMaps(sessionsToCTOs: WorkoutExerciseCTO[][]): void {
+    const muscleGroupToCTOsMap = new Map<UUID, WorkoutExerciseCTO[]>();
     const exerciseIdToSessionIndex = new Map<UUID, number>();
 
-    for (let sessionIndex = 0; sessionIndex < sessionsToExercisePairs.length; sessionIndex++) {
-      const sessionExercisePairs = sessionsToExercisePairs[sessionIndex];
-      for (const exercisePair of sessionExercisePairs) {
-        // Set the session index for this exercise as well
-        exerciseIdToSessionIndex.set(exercisePair.exercise._id, sessionIndex);
+    for (let sessionIndex = 0; sessionIndex < sessionsToCTOs.length; sessionIndex++) {
+      const sessionCTOs = sessionsToCTOs[sessionIndex];
+      for (const cto of sessionCTOs) {
+        exerciseIdToSessionIndex.set(cto._id, sessionIndex);
 
-        const primaryMuscleGroupId = exercisePair.exercise.primaryMuscleGroups[0];
+        const primaryMuscleGroupId = cto.primaryMuscleGroups[0];
         if (!primaryMuscleGroupId) {
-          throw new Error(
-            `Exercise ${exercisePair.exercise._id}, ${exercisePair.exercise.exerciseName} has no primary muscle group`
-          );
+          throw new Error(`Exercise ${cto._id}, ${cto.exerciseName} has no primary muscle group`);
         }
 
-        const existing = muscleGroupToPairsMap.get(primaryMuscleGroupId);
+        const existing = muscleGroupToCTOsMap.get(primaryMuscleGroupId);
         if (existing) {
-          existing.push(exercisePair);
+          existing.push(cto);
         } else {
-          muscleGroupToPairsMap.set(primaryMuscleGroupId, [exercisePair]);
+          muscleGroupToCTOsMap.set(primaryMuscleGroupId, [cto]);
         }
       }
     }
 
-    this.muscleGroupToExercisePairsMap = muscleGroupToPairsMap;
+    this.muscleGroupToExerciseCTOsMap = muscleGroupToCTOsMap;
     this.exerciseIdToSessionIndex = exerciseIdToSessionIndex;
   }
 }