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

package/lib/services/workout/SessionExercise/WorkoutSessionExerciseService.js.map

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

package/lib/services/workout/SessionExercise/WorkoutSessionExerciseService.ts

@@ -36,8 +36,8 @@ export default class WorkoutSessionExerciseService {
   /**
    * Calculates the performance score (0-3) for an exercise based on its sets.
    *
-   * For each set with complete data, a surplus is computed as
-   * `(actualReps - plannedReps) + (rir - plannedRir)`. The per-set score is:
+   * For each set with complete data, a surplus is computed via
+   * {@link calculateSetSurplus}. The per-set score is:
    * - 0: surplus >= 2 (exceeded expectations)
    * - 1: surplus 0-1 (on target)
    * - 2: surplus < 0 but hit target reps (declining)
@@ -64,7 +64,12 @@ export default class WorkoutSessionExerciseService {
         continue;
       }
 
-      const surplus = set.actualReps - set.plannedReps + (set.rir - set.plannedRir);
+      const surplus = this.calculateSetSurplus(
+        set.actualReps,
+        set.plannedReps,
+        set.rir,
+        set.plannedRir
+      );
 
       if (surplus >= 2) {
         setScores.push(0);
@@ -83,6 +88,26 @@ export default class WorkoutSessionExerciseService {
     return Math.round(average);
   }
 
+  /**
+   * Calculates the surplus for a single set: how much the user exceeded or
+   * fell short of the plan. Positive means exceeded, negative means fell short.
+   *
+   * Formula: `(actualReps - plannedReps) + (rir - plannedRir)`
+   *
+   * @param actualReps The actual reps performed.
+   * @param plannedReps The planned reps.
+   * @param rir The actual RIR (reps in reserve).
+   * @param plannedRir The planned RIR.
+   */
+  static calculateSetSurplus(
+    actualReps: number,
+    plannedReps: number,
+    rir: number,
+    plannedRir: number
+  ): number {
+    return actualReps - plannedReps + (rir - plannedRir);
+  }
+
   /**
    * Uses the soreness/performance table from the workout model notes to recommend whether to add
    * sets next microcycle or employ recovery sessions.

package/lib/services/workout/Set/WorkoutSetService.d.ts

@@ -1,5 +1,4 @@
-import type { WorkoutExercise } from '../../../documents/workout/WorkoutExercise.js';
-import type { WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
+import type { WorkoutExerciseCTO } from '../../../ctos/workout/WorkoutExerciseCTO.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';
@@ -12,11 +11,11 @@ export default class WorkoutSetService {
      * - Calculating the initial target weight/reps based on microcycle progression.
      * - Handling intra-session fatigue (dropping reps/weight across sets).
      * - Applying Deload phase modifications (cutting volume/intensity).
+     * - Using previous performance data to adjust progression via autoregulation.
      */
-    static generateSetsForSessionExercise({ context, exercise, calibration, session, sessionExercise, microcycleIndex, sessionIndex, setCount, targetRir, isDeloadMicrocycle }: {
+    static generateSetsForSessionExercise({ context, exerciseCTO, session, sessionExercise, microcycleIndex, sessionIndex, setCount, targetRir, isDeloadMicrocycle }: {
         context: WorkoutMesocyclePlanContext;
-        exercise: WorkoutExercise;
-        calibration: WorkoutExerciseCalibration;
+        exerciseCTO: WorkoutExerciseCTO;
         session: WorkoutSession;
         sessionExercise: WorkoutSessionExercise;
         microcycleIndex: number;
@@ -31,6 +30,19 @@ export default class WorkoutSetService {
      * and either rir is recorded or no plannedRir was expected (deload sets).
      */
     static isCompleted(set: WorkoutSet): boolean;
+    /**
+     * Finds the previous microcycle's first set for an exercise to use for autoregulation.
+     *
+     * Uses the mesocycle's fixed exercise-to-session mapping to go directly to the
+     * correct session and exercise position rather than iterating all sessions.
+     *
+     * Returns undefined if the previous microcycle doesn't exist or has no sessions
+     * (the context may not have full history). Throws if the structure is present but
+     * inconsistent with the mesocycle plan.
+     *
+     * @throws {Error} If the session/exercise structure doesn't match the plan.
+     */
+    private static findPreviousFirstSet;
     /**
      * Generates the planned reps and weight for a specific set within a session exercise, only
      * taking into account simple -2 reps drop per set logic, and deload modifications.

package/lib/services/workout/Set/WorkoutSetService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutSetService.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Set/WorkoutSetService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAG7F,OAAO,KAAK,2BAA2B,MAAM,6CAA6C,CAAC;AAE3F,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;;;;OAOG;IACH,MAAM,CAAC,8BAA8B,CAAC,EACpC,OAAO,EACP,QAAQ,EACR,WAAW,EACX,OAAO,EACP,eAAe,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,kBAAkB,EACnB,EAAE;QACD,OAAO,EAAE,2BAA2B,CAAC;QACrC,QAAQ,EAAE,eAAe,CAAC;QAC1B,WAAW,EAAE,0BAA0B,CAAC;QACxC,OAAO,EAAE,cAAc,CAAC;QACxB,eAAe,EAAE,sBAAsB,CAAC;QACxC,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,kBAAkB,EAAE,OAAO,CAAC;KAC7B,GAAG,IAAI;IAsDR;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO;IAQ5C;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAuDxC"}
+{"version":3,"file":"WorkoutSetService.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Set/WorkoutSetService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAGtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAG7F,OAAO,KAAK,2BAA2B,MAAM,6CAA6C,CAAC;AAE3F,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;;;;;OAQG;IACH,MAAM,CAAC,8BAA8B,CAAC,EACpC,OAAO,EACP,WAAW,EACX,OAAO,EACP,eAAe,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,kBAAkB,EACnB,EAAE;QACD,OAAO,EAAE,2BAA2B,CAAC;QACrC,WAAW,EAAE,kBAAkB,CAAC;QAChC,OAAO,EAAE,cAAc,CAAC;QACxB,eAAe,EAAE,sBAAsB,CAAC;QACxC,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,kBAAkB,EAAE,OAAO,CAAC;KAC7B,GAAG,IAAI;IA6DR;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO;IAQ5C;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAmEnC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAuDxC"}

package/lib/services/workout/Set/WorkoutSetService.js

@@ -9,44 +9,49 @@ export default class WorkoutSetService {
      * - Calculating the initial target weight/reps based on microcycle progression.
      * - Handling intra-session fatigue (dropping reps/weight across sets).
      * - Applying Deload phase modifications (cutting volume/intensity).
+     * - Using previous performance data to adjust progression via autoregulation.
      */
-    static generateSetsForSessionExercise({ context, exercise, calibration, session, sessionExercise, microcycleIndex, sessionIndex, setCount, targetRir, isDeloadMicrocycle }) {
-        const equipment = context.equipmentMap.get(exercise.workoutEquipmentTypeId);
-        if (!equipment) {
-            throw new Error(`Equipment type not found for exercise ${exercise._id}, ${exercise.exerciseName}`);
+    static generateSetsForSessionExercise({ context, exerciseCTO, session, sessionExercise, microcycleIndex, sessionIndex, setCount, targetRir, isDeloadMicrocycle }) {
+        const { equipmentType, bestCalibration } = exerciseCTO;
+        if (!bestCalibration) {
+            throw new Error(`No calibration found for exercise ${exerciseCTO._id}, ${exerciseCTO.exerciseName}`);
         }
         const sets = [];
+        // For the first microcycle, use the CTO's previous performance data.
+        // For subsequent microcycles, look up the previous microcycle's first set from the context.
+        const previousFirstSet = microcycleIndex === 0
+            ? (exerciseCTO.lastFirstSet ?? undefined)
+            : this.findPreviousFirstSet(context, exerciseCTO._id, microcycleIndex);
         // Calculate progressed targets for the first set.
         // For deload microcycles, use the previous microcycle's index so we base
         // the deload on the last accumulation weight rather than progressing further.
-        const { targetWeight: firstSetWeight, targetReps: firstSetReps } = WorkoutExerciseService.calculateTargetRepsAndWeightForFirstSet({
-            exercise,
-            calibration,
-            equipment,
+        const { targetReps: firstSetReps, targetWeight: firstSetWeight } = WorkoutExerciseService.calculateTargetRepsAndWeightForFirstSet({
+            exercise: exerciseCTO,
+            calibration: bestCalibration,
+            equipment: equipmentType,
             microcycleIndex: isDeloadMicrocycle ? microcycleIndex - 1 : microcycleIndex,
-            firstMicrocycleRir: context.FIRST_MICROCYCLE_RIR
+            firstMicrocycleRir: context.firstMicrocycleRir,
+            previousFirstSet
         });
         for (let setIndex = 0; setIndex < setCount; setIndex++) {
-            const { plannedReps, plannedWeight } = this.generateSetRepsAndWeight(
-            // If there is a previous set, base off that, otherwise use first set targets
-            sets[setIndex - 1]?.plannedReps || firstSetReps, sets[setIndex - 1]?.plannedWeight || firstSetWeight, setIndex, exercise.repRange, equipment, {
+            const { plannedReps, plannedWeight } = this.generateSetRepsAndWeight(sets[setIndex - 1]?.plannedReps || firstSetReps, sets[setIndex - 1]?.plannedWeight || firstSetWeight, setIndex, exerciseCTO.repRange, equipmentType, {
                 isDeloadMicrocycle,
                 sessionIndex,
                 plannedSessionCountPerMicrocycle: context.mesocycle.plannedSessionCountPerMicrocycle
             });
             const workoutSet = WorkoutSetSchema.parse({
-                userId: exercise.userId,
-                workoutExerciseId: exercise._id,
+                userId: exerciseCTO.userId,
+                workoutExerciseId: exerciseCTO._id,
                 workoutSessionId: session._id,
                 workoutSessionExerciseId: sessionExercise._id,
                 plannedReps,
                 plannedWeight,
                 plannedRir: targetRir,
-                exerciseProperties: calibration.exerciseProperties
+                exerciseProperties: bestCalibration.exerciseProperties
             });
             sets.push(workoutSet);
         }
-        context.setsToCreate.push(...sets);
+        context.addSets(sets);
     }
     /**
      * Returns true if the set has been logged (has actual performance data).
@@ -58,6 +63,68 @@ export default class WorkoutSetService {
             set.actualWeight != null &&
             (set.rir != null || set.plannedRir == null));
     }
+    /**
+     * Finds the previous microcycle's first set for an exercise to use for autoregulation.
+     *
+     * Uses the mesocycle's fixed exercise-to-session mapping to go directly to the
+     * correct session and exercise position rather than iterating all sessions.
+     *
+     * Returns undefined if the previous microcycle doesn't exist or has no sessions
+     * (the context may not have full history). Throws if the structure is present but
+     * inconsistent with the mesocycle plan.
+     *
+     * @throws {Error} If the session/exercise structure doesn't match the plan.
+     */
+    static findPreviousFirstSet(context, exerciseId, microcycleIndex) {
+        if (microcycleIndex <= 0) {
+            return undefined;
+        }
+        const previousMicrocycle = context.microcyclesInOrder[microcycleIndex - 1];
+        if (!previousMicrocycle || previousMicrocycle.sessionOrder.length === 0) {
+            return undefined;
+        }
+        // Exercise-to-session mapping is fixed for the mesocycle — look up directly
+        const sessionIndex = context.exerciseIdToSessionIndex?.get(exerciseId);
+        if (sessionIndex == null) {
+            throw new Error(`Exercise ${exerciseId} has no session mapping in the mesocycle plan`);
+        }
+        const sessionId = previousMicrocycle.sessionOrder[sessionIndex];
+        if (!sessionId) {
+            // The previous microcycle may have fewer sessions than the plan (e.g. pruned
+            // during early deload). Treat as missing history rather than a structural error.
+            return undefined;
+        }
+        const session = context.sessionMap.get(sessionId);
+        if (!session) {
+            throw new Error(`Session ${sessionId} not found in context`);
+        }
+        // Exercise order within a session is consistent — find the index from the plan
+        const plannedCTOs = context.plannedSessionExerciseCTOs?.[sessionIndex];
+        if (!plannedCTOs) {
+            throw new Error(`No planned CTOs for session index ${sessionIndex}`);
+        }
+        const exerciseIndex = plannedCTOs.findIndex((cto) => cto._id === exerciseId);
+        if (exerciseIndex === -1) {
+            throw new Error(`Exercise ${exerciseId} not found in planned CTOs for session ${sessionIndex}`);
+        }
+        const seId = session.sessionExerciseOrder[exerciseIndex];
+        if (!seId) {
+            throw new Error(`No session exercise at index ${exerciseIndex} in session ${sessionId}`);
+        }
+        const sessionExercise = context.sessionExerciseMap.get(seId);
+        if (!sessionExercise) {
+            throw new Error(`Session exercise ${seId} not found in context`);
+        }
+        const firstSetId = sessionExercise.setOrder[0];
+        if (!firstSetId) {
+            throw new Error(`Session exercise ${seId} for exercise ${exerciseId} has no sets`);
+        }
+        const set = context.setMap.get(firstSetId);
+        if (!set) {
+            throw new Error(`Set ${firstSetId} not found in context`);
+        }
+        return set;
+    }
     /**
      * Generates the planned reps and weight for a specific set within a session exercise, only
      * taking into account simple -2 reps drop per set logic, and deload modifications.

package/lib/services/workout/Set/WorkoutSetService.js.map

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

package/lib/services/workout/Set/WorkoutSetService.ts

@@ -1,9 +1,7 @@
+import type { UUID } from 'crypto';
+import type { WorkoutExerciseCTO } from '../../../ctos/workout/WorkoutExerciseCTO.js';
 import type { WorkoutEquipmentType } from '../../../documents/workout/WorkoutEquipmentType.js';
-import type {
-  ExerciseRepRange,
-  WorkoutExercise
-} from '../../../documents/workout/WorkoutExercise.js';
-import type { WorkoutExerciseCalibration } from '../../../documents/workout/WorkoutExerciseCalibration.js';
+import type { ExerciseRepRange } from '../../../documents/workout/WorkoutExercise.js';
 import type { WorkoutSession } from '../../../documents/workout/WorkoutSession.js';
 import type { WorkoutSessionExercise } from '../../../documents/workout/WorkoutSessionExercise.js';
 import { WorkoutSetSchema, type WorkoutSet } from '../../../documents/workout/WorkoutSet.js';
@@ -19,11 +17,11 @@ export default class WorkoutSetService {
    * - Calculating the initial target weight/reps based on microcycle progression.
    * - Handling intra-session fatigue (dropping reps/weight across sets).
    * - Applying Deload phase modifications (cutting volume/intensity).
+   * - Using previous performance data to adjust progression via autoregulation.
    */
   static generateSetsForSessionExercise({
     context,
-    exercise,
-    calibration,
+    exerciseCTO,
     session,
     sessionExercise,
     microcycleIndex,
@@ -33,8 +31,7 @@ export default class WorkoutSetService {
     isDeloadMicrocycle
   }: {
     context: WorkoutMesocyclePlanContext;
-    exercise: WorkoutExercise;
-    calibration: WorkoutExerciseCalibration;
+    exerciseCTO: WorkoutExerciseCTO;
     session: WorkoutSession;
     sessionExercise: WorkoutSessionExercise;
     microcycleIndex: number;
@@ -43,35 +40,42 @@ export default class WorkoutSetService {
     targetRir: number | null;
     isDeloadMicrocycle: boolean;
   }): void {
-    const equipment = context.equipmentMap.get(exercise.workoutEquipmentTypeId);
-    if (!equipment) {
+    const { equipmentType, bestCalibration } = exerciseCTO;
+    if (!bestCalibration) {
       throw new Error(
-        `Equipment type not found for exercise ${exercise._id}, ${exercise.exerciseName}`
+        `No calibration found for exercise ${exerciseCTO._id}, ${exerciseCTO.exerciseName}`
       );
     }
 
     const sets: WorkoutSet[] = [];
 
+    // For the first microcycle, use the CTO's previous performance data.
+    // For subsequent microcycles, look up the previous microcycle's first set from the context.
+    const previousFirstSet =
+      microcycleIndex === 0
+        ? (exerciseCTO.lastFirstSet ?? undefined)
+        : this.findPreviousFirstSet(context, exerciseCTO._id, microcycleIndex);
+
     // Calculate progressed targets for the first set.
     // For deload microcycles, use the previous microcycle's index so we base
     // the deload on the last accumulation weight rather than progressing further.
-    const { targetWeight: firstSetWeight, targetReps: firstSetReps } =
+    const { targetReps: firstSetReps, targetWeight: firstSetWeight } =
       WorkoutExerciseService.calculateTargetRepsAndWeightForFirstSet({
-        exercise,
-        calibration,
-        equipment,
+        exercise: exerciseCTO,
+        calibration: bestCalibration,
+        equipment: equipmentType,
         microcycleIndex: isDeloadMicrocycle ? microcycleIndex - 1 : microcycleIndex,
-        firstMicrocycleRir: context.FIRST_MICROCYCLE_RIR
+        firstMicrocycleRir: context.firstMicrocycleRir,
+        previousFirstSet
       });
 
     for (let setIndex = 0; setIndex < setCount; setIndex++) {
       const { plannedReps, plannedWeight } = this.generateSetRepsAndWeight(
-        // If there is a previous set, base off that, otherwise use first set targets
         sets[setIndex - 1]?.plannedReps || firstSetReps,
         sets[setIndex - 1]?.plannedWeight || firstSetWeight,
         setIndex,
-        exercise.repRange,
-        equipment,
+        exerciseCTO.repRange,
+        equipmentType,
         {
           isDeloadMicrocycle,
           sessionIndex,
@@ -80,20 +84,20 @@ export default class WorkoutSetService {
       );
 
       const workoutSet = WorkoutSetSchema.parse({
-        userId: exercise.userId,
-        workoutExerciseId: exercise._id,
+        userId: exerciseCTO.userId,
+        workoutExerciseId: exerciseCTO._id,
         workoutSessionId: session._id,
         workoutSessionExerciseId: sessionExercise._id,
         plannedReps,
         plannedWeight,
         plannedRir: targetRir,
-        exerciseProperties: calibration.exerciseProperties
+        exerciseProperties: bestCalibration.exerciseProperties
       });
 
       sets.push(workoutSet);
     }
 
-    context.setsToCreate.push(...sets);
+    context.addSets(sets);
   }
 
   /**
@@ -109,6 +113,85 @@ export default class WorkoutSetService {
     );
   }
 
+  /**
+   * Finds the previous microcycle's first set for an exercise to use for autoregulation.
+   *
+   * Uses the mesocycle's fixed exercise-to-session mapping to go directly to the
+   * correct session and exercise position rather than iterating all sessions.
+   *
+   * Returns undefined if the previous microcycle doesn't exist or has no sessions
+   * (the context may not have full history). Throws if the structure is present but
+   * inconsistent with the mesocycle plan.
+   *
+   * @throws {Error} If the session/exercise structure doesn't match the plan.
+   */
+  private static findPreviousFirstSet(
+    context: WorkoutMesocyclePlanContext,
+    exerciseId: UUID,
+    microcycleIndex: number
+  ): WorkoutSet | undefined {
+    if (microcycleIndex <= 0) {
+      return undefined;
+    }
+
+    const previousMicrocycle = context.microcyclesInOrder[microcycleIndex - 1];
+    if (!previousMicrocycle || previousMicrocycle.sessionOrder.length === 0) {
+      return undefined;
+    }
+
+    // Exercise-to-session mapping is fixed for the mesocycle — look up directly
+    const sessionIndex = context.exerciseIdToSessionIndex?.get(exerciseId);
+    if (sessionIndex == null) {
+      throw new Error(`Exercise ${exerciseId} has no session mapping in the mesocycle plan`);
+    }
+
+    const sessionId = previousMicrocycle.sessionOrder[sessionIndex];
+    if (!sessionId) {
+      // The previous microcycle may have fewer sessions than the plan (e.g. pruned
+      // during early deload). Treat as missing history rather than a structural error.
+      return undefined;
+    }
+
+    const session = context.sessionMap.get(sessionId);
+    if (!session) {
+      throw new Error(`Session ${sessionId} not found in context`);
+    }
+
+    // Exercise order within a session is consistent — find the index from the plan
+    const plannedCTOs = context.plannedSessionExerciseCTOs?.[sessionIndex];
+    if (!plannedCTOs) {
+      throw new Error(`No planned CTOs for session index ${sessionIndex}`);
+    }
+
+    const exerciseIndex = plannedCTOs.findIndex((cto) => cto._id === exerciseId);
+    if (exerciseIndex === -1) {
+      throw new Error(
+        `Exercise ${exerciseId} not found in planned CTOs for session ${sessionIndex}`
+      );
+    }
+
+    const seId = session.sessionExerciseOrder[exerciseIndex];
+    if (!seId) {
+      throw new Error(`No session exercise at index ${exerciseIndex} in session ${sessionId}`);
+    }
+
+    const sessionExercise = context.sessionExerciseMap.get(seId);
+    if (!sessionExercise) {
+      throw new Error(`Session exercise ${seId} not found in context`);
+    }
+
+    const firstSetId = sessionExercise.setOrder[0];
+    if (!firstSetId) {
+      throw new Error(`Session exercise ${seId} for exercise ${exerciseId} has no sets`);
+    }
+
+    const set = context.setMap.get(firstSetId);
+    if (!set) {
+      throw new Error(`Set ${firstSetId} not found in context`);
+    }
+    return set;
+  }
+
   /**
    * Generates the planned reps and weight for a specific set within a session exercise, only
    * taking into account simple -2 reps drop per set logic, and deload modifications.

package/lib/services/workout/util/VolumePlanning/WorkoutVolumePlanningService.d.ts

@@ -1,4 +1,5 @@
 import type { UUID } from 'crypto';
+import type { WorkoutMuscleGroupVolumeCTO, WorkoutVolumeLandmarkEstimate } from '../../../../ctos/workout/WorkoutMuscleGroupVolumeCTO.js';
 import type WorkoutMesocyclePlanContext from '../../Mesocycle/WorkoutMesocyclePlanContext.js';
 /**
  * A service for handling volume planning operations across microcycles.
@@ -19,6 +20,28 @@ import type WorkoutMesocyclePlanContext from '../../Mesocycle/WorkoutMesocyclePl
 export default class WorkoutVolumePlanningService {
     private static readonly MAX_SETS_PER_EXERCISE;
     private static readonly MAX_SETS_PER_MUSCLE_GROUP_PER_SESSION;
+    /** Minimum average RSM required for a mesocycle to count toward MEV estimation. */
+    private static readonly MEV_RSM_THRESHOLD;
+    /** Default estimated MEV when no qualifying mesocycle history exists. */
+    private static readonly DEFAULT_MEV;
+    /** Minimum average performance score (or recovery presence) to count a mesocycle toward MRV estimation. */
+    private static readonly MRV_PERFORMANCE_THRESHOLD;
+    /** Extra sets added above the historical peak when no stressed mesocycles exist, to estimate MRV. */
+    private static readonly MRV_HEADROOM;
+    /** Default estimated MRV when no mesocycle history exists at all. */
+    private static readonly DEFAULT_MRV;
+    /** RSM bracket upper bound for "below MEV" proximity (0 to this value inclusive). */
+    private static readonly MEV_PROXIMITY_BELOW_THRESHOLD;
+    /** RSM bracket upper bound for "at MEV" proximity (above BELOW threshold up to this value inclusive). */
+    private static readonly MEV_PROXIMITY_AT_THRESHOLD;
+    /** Recommended set adjustment when volume is below MEV. */
+    private static readonly MEV_BELOW_SET_ADJUSTMENT;
+    /** Recommended set adjustment when volume is above MEV. */
+    private static readonly MEV_ABOVE_SET_ADJUSTMENT;
+    /** Maximum sets that can be added to a single exercise in one progression step. */
+    private static readonly MAX_SET_ADDITION_PER_EXERCISE;
+    /** Maximum total sets to distribute across a muscle group in one progression step. */
+    private static readonly MAX_TOTAL_SET_ADDITIONS;
     /**
      * Calculates the set plan for an entire microcycle.
      */
@@ -26,6 +49,42 @@ export default class WorkoutVolumePlanningService {
         exerciseIdToSetCount: Map<UUID, number>;
         recoveryExerciseIds: Set<UUID>;
     };
+    /**
+     * Estimates MEV, MRV, and MAV for a muscle group based on historical data
+     * across completed mesocycles.
+     *
+     * @param volumeCTO The WorkoutMuscleGroupVolumeCTO containing mesocycle
+     *   history for this muscle group.
+     */
+    static estimateVolumeLandmarks(volumeCTO: WorkoutMuscleGroupVolumeCTO): WorkoutVolumeLandmarkEstimate;
+    /**
+     * Evaluates MEV (Minimum Effective Volume) proximity for a muscle group based on
+     * RSM scores from the first microcycle. Called when generating the second microcycle to adjust
+     * the volume baseline.
+     *
+     * Returns `null` when the first microcycle is incomplete or has no RSM data for the muscle group.
+     *
+     * @param context The mesocycle planning context containing microcycle/session/exercise data.
+     * @param muscleGroupId The muscle group to evaluate.
+     */
+    static evaluateMevProximity(context: WorkoutMesocyclePlanContext, muscleGroupId: UUID): {
+        /** 'below' = RSM 0-3, 'at' = RSM 4-6, 'above' = RSM 7-9 */
+        proximity: 'below' | 'at' | 'above';
+        /**
+         * Recommended total set adjustment for this muscle group.
+         * Positive = add sets, negative = remove sets, 0 = no change.
+         * Range: -2 to +3
+         */
+        recommendedSetAdjustment: number;
+        /** The average RSM across session exercises targeting this muscle group. */
+        averageRsm: number;
+    } | null;
+    /**
+     * Applies MEV proximity adjustments based on RSM data from the first microcycle.
+     * Adjusts set counts per muscle group when the first microcycle indicates volume
+     * was below or above MEV.
+     */
+    private static applyMevProximityAdjustments;
     /**
      * Calculates the set count for each exercise in a particular muscle group for this microcycle.
      *
@@ -40,8 +99,19 @@ export default class WorkoutVolumePlanningService {
      * for the entire microcycle, regardless of which session those exercises are in.
      *
      * Baseline: 2 sets per exercise in the muscle group.
-     * Progression: add 1 total set per microcycle per muscle group (distributed to earlier exercises
-     * in the muscle-group-wide ordering).
+     * Progression: add 1 set per muscle group every `progressionInterval` microcycles.
+     * - MuscleGain (interval 1): every microcycle
+     * - Cut (interval 2): every other microcycle
+     * - Resensitization (interval 0): no progression (flat 2 sets per exercise)
+     *
+     * @param microcycleIndex The index of the current microcycle.
+     * @param totalExercisesInMuscleGroupForMicrocycle Total exercises in the muscle group for
+     * this microcycle.
+     * @param exerciseIndexInMuscleGroupForMicrocycle Index of the current exercise within the
+     * muscle group.
+     * @param isDeloadMicrocycle Whether this is a deload microcycle.
+     * @param progressionInterval Number of microcycles between each set addition. 0 means no
+     * progression.
      */
     private static calculateBaselineSetCount;
 }

package/lib/services/workout/util/VolumePlanning/WorkoutVolumePlanningService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutVolumePlanningService.d.ts","sourceRoot":"","sources":["../../../../../src/services/workout/util/VolumePlanning/WorkoutVolumePlanningService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,2BAA2B,MAAM,gDAAgD,CAAC;AAG9F;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA4B;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAK;IAClD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC,CAAM;IAEnE;;OAEG;IACH,MAAM,CAAC,6BAA6B,CAClC,OAAO,EAAE,2BAA2B,EACpC,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,OAAO,GAC1B;QAAE,oBAAoB,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAAC,mBAAmB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;KAAE;IA4B9E;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,6CAA6C;IAoP5D;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,yBAAyB;CA6BzC"}
+{"version":3,"file":"WorkoutVolumePlanningService.d.ts","sourceRoot":"","sources":["../../../../../src/services/workout/util/VolumePlanning/WorkoutVolumePlanningService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,KAAK,EACV,2BAA2B,EAC3B,6BAA6B,EAC9B,MAAM,yDAAyD,CAAC;AAEjE,OAAO,KAAK,2BAA2B,MAAM,gDAAgD,CAAC;AAI9F;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA4B;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAK;IAClD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC,CAAM;IAEnE,mFAAmF;IACnF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAK;IAE9C,yEAAyE;IACzE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IAExC,2GAA2G;IAC3G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAO;IAExD,qGAAqG;IACrG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAK;IAEzC,qEAAqE;IACrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IAExC,qFAAqF;IACrF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAK;IAE1D,yGAAyG;IACzG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAK;IAEvD,2DAA2D;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAK;IAErD,2DAA2D;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAM;IAEtD,mFAAmF;IACnF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAK;IAE1D,sFAAsF;IACtF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAK;IAEpD;;OAEG;IACH,MAAM,CAAC,6BAA6B,CAClC,OAAO,EAAE,2BAA2B,EACpC,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,OAAO,GAC1B;QAAE,oBAAoB,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAAC,mBAAmB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;KAAE;IAuC9E;;;;;;OAMG;IACH,MAAM,CAAC,uBAAuB,CAC5B,SAAS,EAAE,2BAA2B,GACrC,6BAA6B;IAkDhC;;;;;;;;;OASG;IACH,MAAM,CAAC,oBAAoB,CACzB,OAAO,EAAE,2BAA2B,EACpC,aAAa,EAAE,IAAI,GAClB;QACD,2DAA2D;QAC3D,SAAS,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC;QAEpC;;;;WAIG;QACH,wBAAwB,EAAE,MAAM,CAAC;QAEjC,4EAA4E;QAC5E,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI;IA+CR;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,4BAA4B;IA4B3C;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,6CAA6C;IA0Q5D;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,OAAO,CAAC,MAAM,CAAC,yBAAyB;CAgCzC"}