@aneuhold/core-ts-db-lib 4.1.12 → 4.1.14

package/lib/services/workout/Exercise/WorkoutExerciseService.js

@@ -1,6 +1,7 @@
 import { ExerciseProgressionType, ExerciseRepRange } from '../../../documents/workout/WorkoutExercise.js';
 import WorkoutEquipmentTypeService from '../EquipmentType/WorkoutEquipmentTypeService.js';
 import WorkoutExerciseCalibrationService from '../ExerciseCalibration/WorkoutExerciseCalibrationService.js';
+import WorkoutSessionExerciseService from '../SessionExercise/WorkoutSessionExerciseService.js';
 import WorkoutSFRService from '../util/SFR/WorkoutSFRService.js';
 /**
  * A service for handling operations related to {@link WorkoutExercise}s.
@@ -41,6 +42,10 @@ export default class WorkoutExerciseService {
      * This method applies either rep-based or load-based progression depending on the exercise's
      * preferred progression type, then rounds the weight to available equipment options.
      *
+     * When a `previousFirstSet` is provided, autoregulation adjusts progression based on the
+     * surplus between planned and actual performance. Without it, the calibration-based formula
+     * is used as a baseline.
+     *
      * Rep progression: The weight is calculated based on reps at microcycle 0, and reps increase
      * by 2 per microcycle to reach max reps at the final accumulation microcycle (ideally),
      * or drop back down and increase weight by 2%.
@@ -49,7 +54,7 @@ export default class WorkoutExerciseService {
      * If weight can't be increased, adds 2 reps instead.
      */
     static calculateTargetRepsAndWeightForFirstSet(params) {
-        const { exercise, calibration, equipment, microcycleIndex, firstMicrocycleRir } = params;
+        const { exercise, calibration, equipment, microcycleIndex, firstMicrocycleRir, previousFirstSet } = params;
         // Validate equipment has weight options
         if (!equipment.weightOptions || equipment.weightOptions.length === 0) {
             throw new Error(`No weight options defined for equipment type ${equipment._id}, ${equipment.title}`);
@@ -57,6 +62,134 @@ export default class WorkoutExerciseService {
         // Get rep range for this exercise
         const repRange = this.getRepRangeValues(exercise.repRange);
         const repRangeMidpoint = Math.floor((repRange.min + repRange.max) / 2);
+        // If we have a previous set with complete data, use autoregulation
+        if (previousFirstSet && this.hasCompleteAutoRegulationData(previousFirstSet)) {
+            return this.calculateAutoRegulatedTargets({
+                exercise,
+                equipment,
+                previousFirstSet,
+                repRange
+            });
+        }
+        // Calibration-based formula (no previous set available)
+        return this.calculateCalibrationBasedTargets({
+            exercise,
+            calibration,
+            equipment,
+            microcycleIndex,
+            firstMicrocycleRir,
+            repRange,
+            repRangeMidpoint
+        });
+    }
+    /**
+     * Calculates targets using auto-regulation based on actual performance from a previous set.
+     */
+    static calculateAutoRegulatedTargets(params) {
+        const { exercise, equipment, previousFirstSet, repRange } = params;
+        const surplus = WorkoutSessionExerciseService.calculateSetSurplus(previousFirstSet.actualReps, previousFirstSet.plannedReps, previousFirstSet.rir, previousFirstSet.plannedRir);
+        if (exercise.preferredProgressionType === ExerciseProgressionType.Rep) {
+            return this.calculateAutoRegulatedRepTargets(previousFirstSet, surplus, repRange, equipment);
+        }
+        return this.calculateAutoRegulatedLoadTargets(previousFirstSet, surplus, repRange, equipment);
+    }
+    /**
+     * Auto-regulated rep progression. Weight stays the same, reps adjust based on surplus.
+     *
+     * | Surplus | Action |
+     * |---:|---|
+     * | >= 3 | Accelerate: actualReps + 2 (progress from actual, not planned) |
+     * | 0 to 2 | Normal: plannedReps + 2 |
+     * | -1 to -2 | Hold: plannedReps (don't add reps) |
+     * | <= -3 | Regress: actualReps (use actual as new baseline) |
+     */
+    static calculateAutoRegulatedRepTargets(previousSet, surplus, repRange, equipment) {
+        let targetReps;
+        let targetWeight = previousSet.plannedWeight;
+        if (surplus >= 3) {
+            targetReps = previousSet.actualReps + 2;
+        }
+        else if (surplus >= 0) {
+            targetReps = previousSet.plannedReps + 2;
+        }
+        else if (surplus >= -2) {
+            targetReps = previousSet.plannedReps;
+        }
+        else {
+            targetReps = previousSet.actualReps;
+        }
+        // Clamp to rep range floor (never target below min, even if actual was 0)
+        targetReps = Math.max(targetReps, repRange.min);
+        // Handle rep range ceiling: if target exceeds max, reset and bump weight
+        if (targetReps > repRange.max) {
+            targetReps = repRange.max;
+            const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+            if (nextWeight !== null) {
+                targetWeight = nextWeight;
+            }
+        }
+        // Round weight to equipment
+        const roundedWeight = WorkoutEquipmentTypeService.findNearestWeight(equipment, targetWeight, 'prefer-down');
+        if (roundedWeight !== null) {
+            targetWeight = roundedWeight;
+        }
+        return { targetWeight, targetReps };
+    }
+    /**
+     * Auto-regulated load progression. Reps stay at rep range max, weight adjusts based on surplus.
+     *
+     * | Surplus | Action |
+     * |---:|---|
+     * | >= 2 | Accelerate: increase weight by ~4% |
+     * | 0 to 1 | Normal: increase weight by 2% |
+     * | -1 to -2 | Hold weight (no increase) |
+     * | <= -3 | Reduce weight by minimum equipment increment |
+     */
+    static calculateAutoRegulatedLoadTargets(previousSet, surplus, repRange, equipment) {
+        const targetReps = repRange.max;
+        let targetWeight = previousSet.plannedWeight;
+        if (surplus >= 2) {
+            // Accelerate: increase by ~4%
+            const fourPercentIncrease = targetWeight * 1.04;
+            const nextWeight = WorkoutEquipmentTypeService.findNearestWeight(equipment, fourPercentIncrease, 'up');
+            if (nextWeight !== null) {
+                targetWeight = nextWeight;
+            }
+        }
+        else if (surplus >= 0) {
+            // Normal: increase by 2%
+            const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+            if (nextWeight !== null) {
+                targetWeight = nextWeight;
+            }
+        }
+        else if (surplus >= -2) {
+            // Hold weight - no change
+        }
+        else {
+            // Reduce by minimum equipment increment
+            const reducedWeight = WorkoutEquipmentTypeService.findNearestWeight(equipment, targetWeight - 0.01, 'down');
+            if (reducedWeight !== null) {
+                targetWeight = reducedWeight;
+            }
+        }
+        return { targetWeight, targetReps };
+    }
+    /**
+     * Checks whether a set has all the data needed for autoregulation calculations.
+     */
+    static hasCompleteAutoRegulationData(set) {
+        return (set.actualReps != null &&
+            set.plannedReps != null &&
+            set.rir != null &&
+            set.plannedRir != null &&
+            set.plannedWeight != null);
+    }
+    /**
+     * Calculates targets using the calibration-based formula (original behavior).
+     */
+    static calculateCalibrationBasedTargets(params) {
+        const { exercise, calibration, equipment, microcycleIndex, firstMicrocycleRir, repRange, repRangeMidpoint } = params;
         // For rep progression, calculate weight based on reps at microcycle 0
         // For load progression, use max reps
         let baseRepsForWeight;

package/lib/services/workout/Exercise/WorkoutExerciseService.js.map

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

package/lib/services/workout/Exercise/WorkoutExerciseService.ts

@@ -5,8 +5,10 @@ import {
   ExerciseRepRange
 } from '../../../documents/workout/WorkoutExercise.js';
 import type { WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
+import type { CompletedWorkoutSet, WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
 import WorkoutEquipmentTypeService from '../EquipmentType/WorkoutEquipmentTypeService.js';
 import WorkoutExerciseCalibrationService from '../ExerciseCalibration/WorkoutExerciseCalibrationService.js';
+import WorkoutSessionExerciseService from '../SessionExercise/WorkoutSessionExerciseService.js';
 import WorkoutSFRService from '../util/SFR/WorkoutSFRService.js';
 
 /**
@@ -50,6 +52,10 @@ export default class WorkoutExerciseService {
    * This method applies either rep-based or load-based progression depending on the exercise's
    * preferred progression type, then rounds the weight to available equipment options.
    *
+   * When a `previousFirstSet` is provided, autoregulation adjusts progression based on the
+   * surplus between planned and actual performance. Without it, the calibration-based formula
+   * is used as a baseline.
+   *
    * Rep progression: The weight is calculated based on reps at microcycle 0, and reps increase
    * by 2 per microcycle to reach max reps at the final accumulation microcycle (ideally),
    * or drop back down and increase weight by 2%.
@@ -63,8 +69,16 @@ export default class WorkoutExerciseService {
     equipment: WorkoutEquipmentType;
     microcycleIndex: number;
     firstMicrocycleRir: number;
+    previousFirstSet?: WorkoutSet;
   }): { targetWeight: number; targetReps: number } {
-    const { exercise, calibration, equipment, microcycleIndex, firstMicrocycleRir } = params;
+    const {
+      exercise,
+      calibration,
+      equipment,
+      microcycleIndex,
+      firstMicrocycleRir,
+      previousFirstSet
+    } = params;
 
     // Validate equipment has weight options
     if (!equipment.weightOptions || equipment.weightOptions.length === 0) {
@@ -77,6 +91,195 @@ export default class WorkoutExerciseService {
     const repRange = this.getRepRangeValues(exercise.repRange);
     const repRangeMidpoint = Math.floor((repRange.min + repRange.max) / 2);
 
+    // If we have a previous set with complete data, use autoregulation
+    if (previousFirstSet && this.hasCompleteAutoRegulationData(previousFirstSet)) {
+      return this.calculateAutoRegulatedTargets({
+        exercise,
+        equipment,
+        previousFirstSet,
+        repRange
+      });
+    }
+
+    // Calibration-based formula (no previous set available)
+    return this.calculateCalibrationBasedTargets({
+      exercise,
+      calibration,
+      equipment,
+      microcycleIndex,
+      firstMicrocycleRir,
+      repRange,
+      repRangeMidpoint
+    });
+  }
+
+  /**
+   * Calculates targets using auto-regulation based on actual performance from a previous set.
+   */
+  private static calculateAutoRegulatedTargets(params: {
+    exercise: WorkoutExercise;
+    equipment: WorkoutEquipmentType;
+    previousFirstSet: CompletedWorkoutSet;
+    repRange: { min: number; max: number };
+  }): { targetWeight: number; targetReps: number } {
+    const { exercise, equipment, previousFirstSet, repRange } = params;
+
+    const surplus = WorkoutSessionExerciseService.calculateSetSurplus(
+      previousFirstSet.actualReps,
+      previousFirstSet.plannedReps,
+      previousFirstSet.rir,
+      previousFirstSet.plannedRir
+    );
+
+    if (exercise.preferredProgressionType === ExerciseProgressionType.Rep) {
+      return this.calculateAutoRegulatedRepTargets(previousFirstSet, surplus, repRange, equipment);
+    }
+
+    return this.calculateAutoRegulatedLoadTargets(previousFirstSet, surplus, repRange, equipment);
+  }
+
+  /**
+   * Auto-regulated rep progression. Weight stays the same, reps adjust based on surplus.
+   *
+   * | Surplus | Action |
+   * |---:|---|
+   * | >= 3 | Accelerate: actualReps + 2 (progress from actual, not planned) |
+   * | 0 to 2 | Normal: plannedReps + 2 |
+   * | -1 to -2 | Hold: plannedReps (don't add reps) |
+   * | <= -3 | Regress: actualReps (use actual as new baseline) |
+   */
+  private static calculateAutoRegulatedRepTargets(
+    previousSet: CompletedWorkoutSet,
+    surplus: number,
+    repRange: { min: number; max: number },
+    equipment: WorkoutEquipmentType
+  ): { targetWeight: number; targetReps: number } {
+    let targetReps: number;
+    let targetWeight = previousSet.plannedWeight;
+
+    if (surplus >= 3) {
+      targetReps = previousSet.actualReps + 2;
+    } else if (surplus >= 0) {
+      targetReps = previousSet.plannedReps + 2;
+    } else if (surplus >= -2) {
+      targetReps = previousSet.plannedReps;
+    } else {
+      targetReps = previousSet.actualReps;
+    }
+
+    // Clamp to rep range floor (never target below min, even if actual was 0)
+    targetReps = Math.max(targetReps, repRange.min);
+
+    // Handle rep range ceiling: if target exceeds max, reset and bump weight
+    if (targetReps > repRange.max) {
+      targetReps = repRange.max;
+      const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+      if (nextWeight !== null) {
+        targetWeight = nextWeight;
+      }
+    }
+
+    // Round weight to equipment
+    const roundedWeight = WorkoutEquipmentTypeService.findNearestWeight(
+      equipment,
+      targetWeight,
+      'prefer-down'
+    );
+    if (roundedWeight !== null) {
+      targetWeight = roundedWeight;
+    }
+
+    return { targetWeight, targetReps };
+  }
+
+  /**
+   * Auto-regulated load progression. Reps stay at rep range max, weight adjusts based on surplus.
+   *
+   * | Surplus | Action |
+   * |---:|---|
+   * | >= 2 | Accelerate: increase weight by ~4% |
+   * | 0 to 1 | Normal: increase weight by 2% |
+   * | -1 to -2 | Hold weight (no increase) |
+   * | <= -3 | Reduce weight by minimum equipment increment |
+   */
+  private static calculateAutoRegulatedLoadTargets(
+    previousSet: CompletedWorkoutSet,
+    surplus: number,
+    repRange: { min: number; max: number },
+    equipment: WorkoutEquipmentType
+  ): { targetWeight: number; targetReps: number } {
+    const targetReps = repRange.max;
+    let targetWeight = previousSet.plannedWeight;
+
+    if (surplus >= 2) {
+      // Accelerate: increase by ~4%
+      const fourPercentIncrease = targetWeight * 1.04;
+      const nextWeight = WorkoutEquipmentTypeService.findNearestWeight(
+        equipment,
+        fourPercentIncrease,
+        'up'
+      );
+      if (nextWeight !== null) {
+        targetWeight = nextWeight;
+      }
+    } else if (surplus >= 0) {
+      // Normal: increase by 2%
+      const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
+      if (nextWeight !== null) {
+        targetWeight = nextWeight;
+      }
+    } else if (surplus >= -2) {
+      // Hold weight - no change
+    } else {
+      // Reduce by minimum equipment increment
+      const reducedWeight = WorkoutEquipmentTypeService.findNearestWeight(
+        equipment,
+        targetWeight - 0.01,
+        'down'
+      );
+      if (reducedWeight !== null) {
+        targetWeight = reducedWeight;
+      }
+    }
+
+    return { targetWeight, targetReps };
+  }
+
+  /**
+   * Checks whether a set has all the data needed for autoregulation calculations.
+   */
+  private static hasCompleteAutoRegulationData(set: WorkoutSet): set is CompletedWorkoutSet {
+    return (
+      set.actualReps != null &&
+      set.plannedReps != null &&
+      set.rir != null &&
+      set.plannedRir != null &&
+      set.plannedWeight != null
+    );
+  }
+
+  /**
+   * Calculates targets using the calibration-based formula (original behavior).
+   */
+  private static calculateCalibrationBasedTargets(params: {
+    exercise: WorkoutExercise;
+    calibration: WorkoutExerciseCalibration;
+    equipment: WorkoutEquipmentType;
+    microcycleIndex: number;
+    firstMicrocycleRir: number;
+    repRange: { min: number; max: number };
+    repRangeMidpoint: number;
+  }): { targetWeight: number; targetReps: number } {
+    const {
+      exercise,
+      calibration,
+      equipment,
+      microcycleIndex,
+      firstMicrocycleRir,
+      repRange,
+      repRangeMidpoint
+    } = params;
+
     // For rep progression, calculate weight based on reps at microcycle 0
     // For load progression, use max reps
     let baseRepsForWeight: number;

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

@@ -45,6 +45,21 @@ export default class WorkoutExerciseCalibrationService {
      * @param targetReps The target number of reps.
      */
     static getTargetWeight(calibration: WorkoutExerciseCalibration, targetReps: number): number;
+    /**
+     * 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;
     /**
      * Generates auto-calibrations from exercise CTOs whose best set 1RM exceeds
      * their best calibration 1RM.

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

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseCalibrationService.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/ExerciseCalibration/WorkoutExerciseCalibrationService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAM3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iCAAiC;IACpD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,0BAA0B,GAAG,MAAM;IAI9D;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;IAM7D;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAM3F;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,wBAAwB,CAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,IAAI,GACjB,0BAA0B,EAAE;IA4B/B;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAGnC"}
+{"version":3,"file":"WorkoutExerciseCalibrationService.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/ExerciseCalibration/WorkoutExerciseCalibrationService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAM3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iCAAiC;IACpD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,0BAA0B,GAAG,MAAM;IAI9D;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;;;;;;;IAM7D;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAK3F;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAK/E;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,wBAAwB,CAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,IAAI,GACjB,0BAA0B,EAAE;IA4B/B;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAGnC"}

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

@@ -48,8 +48,25 @@ export default class WorkoutExerciseCalibrationService {
      */
     static getTargetWeight(calibration, targetReps) {
         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, targetReps) {
         const targetPercentage = this.getTargetPercentage(targetReps);
-        return (targetPercentage / 100) * oneRepMax;
+        return (targetPercentage / 100) * effective1RM;
     }
     /**
      * Generates auto-calibrations from exercise CTOs whose best set 1RM exceeds

package/lib/services/workout/ExerciseCalibration/WorkoutExerciseCalibrationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseCalibrationService.js","sourceRoot":"","sources":["../../../../src/services/workout/ExerciseCalibration/WorkoutExerciseCalibrationService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G,mFAAmF;AACnF,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iCAAiC;IACpD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,WAAuC;QACnD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,MAAc,EAAE,IAAY;QAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,gBAAgB,GAAG,MAAM,CAAC;IACrD,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,WAAmB,EAAE,SAAiB;QAC3D,OAAO;YACL,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC;SAC9F,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CAAC,WAAuC,EAAE,UAAkB;QAChF,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAC9D,OAAO,CAAC,gBAAgB,GAAG,GAAG,CAAC,GAAG,SAAS,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,wBAAwB,CAC7B,YAAkC,EAClC,MAAY,EACZ,YAAkB;QAElB,MAAM,eAAe,GAAiC,EAAE,CAAC;QAEzD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC;gBAAE,SAAS;YAEvF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAElE,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;gBACpB,eAAe,CAAC,IAAI,CAClB,gCAAgC,CAAC,KAAK,CAAC;oBACrC,MAAM;oBACN,iBAAiB,EAAE,GAAG,CAAC,GAAG;oBAC1B,MAAM,EAAE,OAAO,CAAC,YAAY;oBAC5B,IAAI,EAAE,OAAO,CAAC,UAAU;oBACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;oBAC9C,YAAY;oBACZ,sBAAsB,EAAE,OAAO,CAAC,GAAG;iBACpC,CAAC,CACH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;;;;;;;OASG;IACK,MAAM,CAAC,mBAAmB,CAAC,UAAkB;QACnD,OAAO,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;IACrC,CAAC;CACF"}
+{"version":3,"file":"WorkoutExerciseCalibrationService.js","sourceRoot":"","sources":["../../../../src/services/workout/ExerciseCalibration/WorkoutExerciseCalibrationService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G,mFAAmF;AACnF,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iCAAiC;IACpD;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,WAAuC;QACnD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,MAAc,EAAE,IAAY;QAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,gBAAgB,GAAG,MAAM,CAAC;IACrD,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,WAAmB,EAAE,SAAiB;QAC3D,OAAO;YACL,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC;SAC9F,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,eAAe,CAAC,WAAuC,EAAE,UAAkB;QAChF,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,sBAAsB,CAAC,YAAoB,EAAE,UAAkB;QACpE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAC9D,OAAO,CAAC,gBAAgB,GAAG,GAAG,CAAC,GAAG,YAAY,CAAC;IACjD,CAAC;IAED;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,wBAAwB,CAC7B,YAAkC,EAClC,MAAY,EACZ,YAAkB;QAElB,MAAM,eAAe,GAAiC,EAAE,CAAC;QAEzD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC;gBAAE,SAAS;YAEvF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAElE,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;gBACpB,eAAe,CAAC,IAAI,CAClB,gCAAgC,CAAC,KAAK,CAAC;oBACrC,MAAM;oBACN,iBAAiB,EAAE,GAAG,CAAC,GAAG;oBAC1B,MAAM,EAAE,OAAO,CAAC,YAAY;oBAC5B,IAAI,EAAE,OAAO,CAAC,UAAU;oBACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;oBAC9C,YAAY;oBACZ,sBAAsB,EAAE,OAAO,CAAC,GAAG;iBACpC,CAAC,CACH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;;;;;;;OASG;IACK,MAAM,CAAC,mBAAmB,CAAC,UAAkB;QACnD,OAAO,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;IACrC,CAAC;CACF"}

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

@@ -56,8 +56,26 @@ 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;
   }
 
   /**

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

@@ -1,5 +1,6 @@
 import type { UUID } from 'crypto';
 import type { WorkoutExerciseCTO } from '../../../ctos/workout/WorkoutExerciseCTO.js';
+import type { WorkoutMuscleGroupVolumeCTO, WorkoutVolumeLandmarkEstimate } from '../../../ctos/workout/WorkoutMuscleGroupVolumeCTO.js';
 import type { WorkoutEquipmentType } from '../../../documents/workout/WorkoutEquipmentType.js';
 import type { WorkoutExercise } from '../../../documents/workout/WorkoutExercise.js';
 import type { WorkoutMesocycle } from '../../../documents/workout/WorkoutMesocycle.js';
@@ -21,14 +22,30 @@ 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 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;
+    /**
+     * Number of accumulation (non-deload) microcycles in this mesocycle.
+     * Equal to the total planned count when deload is skipped, or total minus one otherwise.
+     */
+    readonly accumulationMicrocycleCount: number;
     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.
@@ -53,11 +70,16 @@ export default class WorkoutMesocyclePlanContext {
      * ended up in.
      */
     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, exerciseCTOs: WorkoutExerciseCTO[], 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.
      */
@@ -70,6 +92,10 @@ 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.

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,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AACrF,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;IA2CrC,SAAS,EAAE,gBAAgB;IAE3B,mBAAmB,EAAE,iBAAiB,EAAE;IACxC,gBAAgB,EAAE,cAAc,EAAE;IAClC,wBAAwB,EAAE,sBAAsB,EAAE;IAClD,YAAY,EAAE,UAAU,EAAE;IA/CnC;;;OAGG;IACH,SAAgB,oBAAoB,KAAK;IAEzC,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,0BAA0B,EAAE,kBAAkB,EAAE,EAAE,GAAG,SAAS,CAAC;IACtE;;;;;;OAMG;IACI,4BAA4B,EAAE,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,GAAG,SAAS,CAAC;IAC1E,wBAAwB,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAE/D;;OAEG;gBAEM,SAAS,EAAE,gBAAgB,EAClC,YAAY,EAAE,kBAAkB,EAAE,EAC3B,mBAAmB,GAAE,iBAAiB,EAAO,EAC7C,gBAAgB,GAAE,cAAc,EAAO,EACvC,wBAAwB,GAAE,sBAAsB,EAAO,EACvD,YAAY,GAAE,UAAU,EAAO;IAmBxC;;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,6BAA6B,CAAC,0BAA0B,EAAE,kBAAkB,EAAE,EAAE,GAAG,IAAI;IAK9F;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CA0B5B"}
+{"version":3,"file":"WorkoutMesocyclePlanContext.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Mesocycle/WorkoutMesocyclePlanContext.ts"],"names":[],"mappings":"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"}