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

package/CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 🔖 [5.0.0] (2026-03-13)
+
+### 🏗️ Changed
+
+- _Breaking Change:_ `WorkoutExerciseCTO.lastFirstSet` (nullable `WorkoutSet`) replaced by `lastSessionSets` (array of `WorkoutSet`).
+- _Breaking Change:_ `WorkoutExerciseService.calculateTargetRepsAndWeightForFirstSet` parameter `previousFirstSet?: WorkoutSet` replaced by `previousSets: WorkoutSet[]`.
+- Autoregulation now averages surplus across all sets in a session exercise instead of using only the first set, providing a more representative performance signal.
+- `WorkoutSessionExerciseService.calculateSetSurplus` is now private; the new public `calculateAverageSurplus(sets)` method handles multi-set aggregation.
+- `WorkoutMesocycleService` performance-drop detection now averages surplus across all sets rather than using only the first set.
+- `WorkoutSetService` now retrieves all sets from the previous microcycle for autoregulation instead of only the first set.
+- Rep progression severe underperformance (average surplus < -3) now also reduces weight by one equipment increment.
+
+## 🔖 [4.1.15] (2026-03-12)
+
+### 🏗️ Changed
+
+- `CompletedWorkoutSet` type refined to only require planned and actual performance fields (`plannedReps`, `plannedWeight`, `plannedRir`, `actualReps`, `actualWeight`, `rir`) to be non-nullable, rather than all fields.
+- `WorkoutExerciseService.calculateTargetRepsAndWeightForFirstSet` no longer accepts a `microcycleIndex` parameter; all microcycle-to-microcycle progression is now handled by autoregulation/forecasting from the previous set.
+- Replaced `hasCompleteAutoRegulationData` with `toCompletedSet`, which converts a `WorkoutSet` to a `CompletedWorkoutSet` and forecasts planned-only sets (surplus = 0) so progression continues smoothly even without actual performance data.
+- `calculateCalibrationBasedTargets` now computes initial targets only (no microcycle loops); it is used exclusively when no previous set exists.
+- `WorkoutSetService` no longer passes `microcycleIndex` to `calculateTargetRepsAndWeightForFirstSet`.
+
 ## 🔖 [4.1.14] (2026-03-07)
 
 ### 🏗️ Changed
@@ -374,7 +396,8 @@ Updated dependency: now requires `@aneuhold/core-ts-lib@^2.3.11`.
 - Updated workflow permissions to allow repository write access
 
 <!-- Link References -->
-
+[5.0.0]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v4.1.15...core-ts-db-lib-v5.0.0
+[4.1.15]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v4.1.14...core-ts-db-lib-v4.1.15
 [4.1.14]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v4.1.13...core-ts-db-lib-v4.1.14
 [4.1.13]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v4.1.12...core-ts-db-lib-v4.1.13
 [4.1.12]: https://github.com/aneuhold/ts-libs/compare/core-ts-db-lib-v4.1.11...core-ts-db-lib-v4.1.12

package/lib/ctos/workout/WorkoutExerciseCTO.d.ts

@@ -71,7 +71,7 @@ export declare const WorkoutExerciseCTOSchema: z.ZodObject<{
         _id: z.ZodPipe<z.ZodDefault<z.ZodUUID>, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
         userId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
     }, z.core.$strip>>;
-    lastFirstSet: z.ZodNullable<z.ZodObject<{
+    lastSessionSets: z.ZodDefault<z.ZodArray<z.ZodObject<{
         docType: z.ZodDefault<z.ZodLiteral<"workoutSet">>;
         workoutExerciseId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
         workoutSessionId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
@@ -87,7 +87,7 @@ export declare const WorkoutExerciseCTOSchema: z.ZodObject<{
         lastUpdatedDate: z.ZodDefault<z.ZodDate>;
         _id: z.ZodPipe<z.ZodDefault<z.ZodUUID>, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
         userId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;
-    }, z.core.$strip>>;
+    }, z.core.$strip>>>;
     docType: z.ZodDefault<z.ZodLiteral<"workoutExercise">>;
     exerciseName: z.ZodString;
     workoutEquipmentTypeId: z.ZodPipe<z.ZodUUID, z.ZodTransform<`${string}-${string}-${string}-${string}-${string}`, string>>;

package/lib/ctos/workout/WorkoutExerciseCTO.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseCTO.d.ts","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA+CnC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"WorkoutExerciseCTO.d.ts","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8CnC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}

package/lib/ctos/workout/WorkoutExerciseCTO.js

@@ -46,13 +46,12 @@ export const WorkoutExerciseCTOSchema = z.object({
      */
     lastSessionExercise: WorkoutSessionExerciseSchema.nullable(),
     /**
-     * The first WorkoutSet from the lastSessionExercise's setOrder.
-     * This is the "anchor" set that progression calculations use since
-     * subsequent sets are derived from the first via intra-session fatigue
-     * drops.
+     * All WorkoutSets from the lastSessionExercise's setOrder. Surplus is
+     * averaged across all sets for a holistic performance signal during
+     * autoregulation (the first set alone can mask poor later-set performance).
      *
-     * Null if no previous accumulation performance exists.
+     * Empty array if no previous accumulation performance exists.
      */
-    lastFirstSet: WorkoutSetSchema.nullable()
+    lastSessionSets: z.array(WorkoutSetSchema).default([])
 });
 //# sourceMappingURL=WorkoutExerciseCTO.js.map

package/lib/ctos/workout/WorkoutExerciseCTO.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseCTO.js","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C,GAAG,qBAAqB,CAAC,KAAK;IAE9B;;;OAGG;IACH,aAAa,EAAE,0BAA0B;IAEzC;;;;OAIG;IACH,eAAe,EAAE,gCAAgC,CAAC,QAAQ,EAAE;IAE5D;;;;;;;OAOG;IACH,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAEpC;;;;;;;;;OASG;IACH,mBAAmB,EAAE,4BAA4B,CAAC,QAAQ,EAAE;IAE5D;;;;;;;OAOG;IACH,YAAY,EAAE,gBAAgB,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC"}
+{"version":3,"file":"WorkoutExerciseCTO.js","sourceRoot":"","sources":["../../../src/ctos/workout/WorkoutExerciseCTO.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,gCAAgC,EAAE,MAAM,uDAAuD,CAAC;AACzG,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C,GAAG,qBAAqB,CAAC,KAAK;IAE9B;;;OAGG;IACH,aAAa,EAAE,0BAA0B;IAEzC;;;;OAIG;IACH,eAAe,EAAE,gCAAgC,CAAC,QAAQ,EAAE;IAE5D;;;;;;;OAOG;IACH,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAEpC;;;;;;;;;OASG;IACH,mBAAmB,EAAE,4BAA4B,CAAC,QAAQ,EAAE;IAE5D;;;;;;OAMG;IACH,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CACvD,CAAC,CAAC"}

package/lib/ctos/workout/WorkoutExerciseCTO.ts

@@ -52,14 +52,13 @@ export const WorkoutExerciseCTOSchema = z.object({
   lastSessionExercise: WorkoutSessionExerciseSchema.nullable(),
 
   /**
-   * The first WorkoutSet from the lastSessionExercise's setOrder.
-   * This is the "anchor" set that progression calculations use since
-   * subsequent sets are derived from the first via intra-session fatigue
-   * drops.
+   * All WorkoutSets from the lastSessionExercise's setOrder. Surplus is
+   * averaged across all sets for a holistic performance signal during
+   * autoregulation (the first set alone can mask poor later-set performance).
    *
-   * Null if no previous accumulation performance exists.
+   * Empty array if no previous accumulation performance exists.
    */
-  lastFirstSet: WorkoutSetSchema.nullable()
+  lastSessionSets: z.array(WorkoutSetSchema).default([])
 });
 
 /**

package/lib/documents/workout/WorkoutSet.d.ts

@@ -39,11 +39,14 @@ export declare const WorkoutSetSchema: z.ZodObject<{
  */
 export type WorkoutSet = z.infer<typeof WorkoutSetSchema>;
 /**
- * A {@link WorkoutSet} with all nullable fields guaranteed to be defined.
- * Zod's `.nullish()` produces `T | null | undefined`, so `Required` alone
- * only strips the optional `?` — `NonNullable` is needed to also strip `null`.
+ * A {@link WorkoutSet} with all planned and actual performance fields guaranteed non-nullable.
  */
-export type CompletedWorkoutSet = Required<{
-    [K in keyof WorkoutSet]: NonNullable<WorkoutSet[K]>;
-}>;
+export type CompletedWorkoutSet = WorkoutSet & {
+    plannedReps: NonNullable<WorkoutSet['plannedReps']>;
+    plannedWeight: NonNullable<WorkoutSet['plannedWeight']>;
+    plannedRir: NonNullable<WorkoutSet['plannedRir']>;
+    actualReps: NonNullable<WorkoutSet['actualReps']>;
+    actualWeight: NonNullable<WorkoutSet['actualWeight']>;
+    rir: NonNullable<WorkoutSet['rir']>;
+};
 //# sourceMappingURL=WorkoutSet.d.ts.map

package/lib/documents/workout/WorkoutSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutSet.d.ts","sourceRoot":"","sources":["../../../src/documents/workout/WorkoutSet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;GAEG;AACH,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;iBAyD3B,CAAC;AAEH;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;KACxC,CAAC,IAAI,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACpD,CAAC,CAAC"}
+{"version":3,"file":"WorkoutSet.d.ts","sourceRoot":"","sources":["../../../src/documents/workout/WorkoutSet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;GAEG;AACH,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;iBAyD3B,CAAC;AAEH;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG;IAC7C,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;IACpD,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;IAClD,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;IAClD,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;IACtD,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;CACrC,CAAC"}

package/lib/documents/workout/WorkoutSet.ts

@@ -90,10 +90,13 @@ export const WorkoutSetSchema = z.object({
 export type WorkoutSet = z.infer<typeof WorkoutSetSchema>;
 
 /**
- * A {@link WorkoutSet} with all nullable fields guaranteed to be defined.
- * Zod's `.nullish()` produces `T | null | undefined`, so `Required` alone
- * only strips the optional `?` — `NonNullable` is needed to also strip `null`.
+ * A {@link WorkoutSet} with all planned and actual performance fields guaranteed non-nullable.
  */
-export type CompletedWorkoutSet = Required<{
-  [K in keyof WorkoutSet]: NonNullable<WorkoutSet[K]>;
-}>;
+export type CompletedWorkoutSet = WorkoutSet & {
+  plannedReps: NonNullable<WorkoutSet['plannedReps']>;
+  plannedWeight: NonNullable<WorkoutSet['plannedWeight']>;
+  plannedRir: NonNullable<WorkoutSet['plannedRir']>;
+  actualReps: NonNullable<WorkoutSet['actualReps']>;
+  actualWeight: NonNullable<WorkoutSet['actualWeight']>;
+  rir: NonNullable<WorkoutSet['rir']>;
+};

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

@@ -27,48 +27,44 @@ export default class WorkoutExerciseService {
      */
     static getFatigueScore(exercise: WorkoutExercise): number;
     /**
-     * Calculates the progressed target weight and reps for an exercise based on microcycle progression.
-     * This returns the target weight and reps for the FIRST set of the exercise in the given microcycle,
-     * assuming it is an accumulation phase (i.e., not a deload).
+     * Calculates the target weight and reps for the FIRST set of an exercise.
      *
-     * 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 `previousSets` are provided (completed or planned-only), autoregulation
+     * computes an average surplus across all sets and applies progression. Planned-only
+     * sets are forecasted with surplus = 0 so the plan progresses smoothly without
+     * falling back to calibration.
      *
-     * 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%.
-     *
-     * Load progression: Increases weight by at least 2% per microcycle.
-     * If weight can't be increased, adds 2 reps instead.
+     * When no previous sets exist (first mesocycle or new exercise), the calibration-based
+     * formula computes initial targets from the exercise's 1RM and rep range.
      */
     static calculateTargetRepsAndWeightForFirstSet(params: {
         exercise: WorkoutExercise;
         calibration: WorkoutExerciseCalibration;
         equipment: WorkoutEquipmentType;
-        microcycleIndex: number;
         firstMicrocycleRir: number;
-        previousFirstSet?: WorkoutSet;
+        previousSets: WorkoutSet[];
     }): {
         targetWeight: number;
         targetReps: number;
     };
     /**
-     * Calculates targets using auto-regulation based on actual performance from a previous set.
+     * Calculates targets using auto-regulation based on actual performance from previous sets.
+     * Surplus is averaged across all sets for a more representative performance signal.
+     * Previously only the first set's surplus was used, which masked poor performance
+     * on later sets (e.g., first set hits target but second set falls far short).
      */
     private static calculateAutoRegulatedTargets;
     /**
-     * Auto-regulated rep progression. Weight stays the same, reps adjust based on surplus.
+     * Auto-regulated rep progression. Attempts to increase reps until hitting rep range max,
+     * then resets reps and increases weight.
      *
      * | 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) |
+     * | -3 | Regress: actualReps (use actual as new baseline) |
+     * | < -3 | Severe regress: actualReps + reduce weight (weight is too heavy for rep range) |
      */
     private static calculateAutoRegulatedRepTargets;
     /**
@@ -83,11 +79,19 @@ export default class WorkoutExerciseService {
      */
     private static calculateAutoRegulatedLoadTargets;
     /**
-     * Checks whether a set has all the data needed for autoregulation calculations.
+     * Converts a {@link WorkoutSet} into a {@link CompletedWorkoutSet} for autoregulation.
+     *
+     * If actual performance data exists, returns the set with those values. Otherwise,
+     * forecasts by copying planned values into the actual fields (producing surplus = 0)
+     * so that autoregulation applies normal progression from the planned baseline.
+     *
+     * Returns null if the set lacks the minimum planned data needed.
      */
-    private static hasCompleteAutoRegulationData;
+    private static toCompletedSet;
     /**
-     * Calculates targets using the calibration-based formula (original behavior).
+     * Calculates initial targets from calibration data. Used only when no previous
+     * set exists (first microcycle of the first mesocycle, or brand-new exercise).
+     * All subsequent microcycle progression is handled by autoregulation/forecasting.
      */
     private static calculateCalibrationBasedTargets;
     private static findNextTwoPercentWeight;

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

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseService.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Exercise/WorkoutExerciseService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAEL,gBAAgB,EACjB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,KAAK,EAAuB,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAMhG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC;;;;;;;;OAQG;IACH,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;IAWlF;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM;IAIzD;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,CAAC,uCAAuC,CAAC,MAAM,EAAE;QACrD,QAAQ,EAAE,eAAe,CAAC;QAC1B,WAAW,EAAE,0BAA0B,CAAC;QACxC,SAAS,EAAE,oBAAoB,CAAC;QAChC,eAAe,EAAE,MAAM,CAAC;QACxB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,gBAAgB,CAAC,EAAE,UAAU,CAAC;KAC/B,GAAG;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;IA2ChD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,6BAA6B;IAsB5C;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,gCAAgC;IA4C/C;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,iCAAiC;IA2ChD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,6BAA6B;IAU5C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,gCAAgC;IAgG/C,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAgBxC"}
+{"version":3,"file":"WorkoutExerciseService.d.ts","sourceRoot":"","sources":["../../../../src/services/workout/Exercise/WorkoutExerciseService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAEL,gBAAgB,EACjB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AAC3G,OAAO,KAAK,EAAuB,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAMhG;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC;;;;;;;;OAQG;IACH,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;IAWlF;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM;IAIzD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,uCAAuC,CAAC,MAAM,EAAE;QACrD,QAAQ,EAAE,eAAe,CAAC;QAC1B,WAAW,EAAE,0BAA0B,CAAC;QACxC,SAAS,EAAE,oBAAoB,CAAC;QAChC,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,UAAU,EAAE,CAAC;KAC5B,GAAG;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;IA0ChD;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,6BAA6B;IAuB5C;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,MAAM,CAAC,gCAAgC;IAyD/C;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,iCAAiC;IA2ChD;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAmB7B;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,gCAAgC;IA2C/C,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAgBxC"}

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

@@ -35,26 +35,18 @@ export default class WorkoutExerciseService {
         return WorkoutSFRService.getFatigueTotal(exercise.initialFatigueGuess) || 0;
     }
     /**
-     * Calculates the progressed target weight and reps for an exercise based on microcycle progression.
-     * This returns the target weight and reps for the FIRST set of the exercise in the given microcycle,
-     * assuming it is an accumulation phase (i.e., not a deload).
+     * Calculates the target weight and reps for the FIRST set of an exercise.
      *
-     * 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 `previousSets` are provided (completed or planned-only), autoregulation
+     * computes an average surplus across all sets and applies progression. Planned-only
+     * sets are forecasted with surplus = 0 so the plan progresses smoothly without
+     * falling back to calibration.
      *
-     * 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%.
-     *
-     * Load progression: Increases weight by at least 2% per microcycle.
-     * If weight can't be increased, adds 2 reps instead.
+     * When no previous sets exist (first mesocycle or new exercise), the calibration-based
+     * formula computes initial targets from the exercise's 1RM and rep range.
      */
     static calculateTargetRepsAndWeightForFirstSet(params) {
-        const { exercise, calibration, equipment, microcycleIndex, firstMicrocycleRir, previousFirstSet } = params;
+        const { exercise, calibration, equipment, firstMicrocycleRir, previousSets } = 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}`);
@@ -62,12 +54,18 @@ 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)) {
+        // Convert all previous sets to completed sets (forecasting planned → actual if needed).
+        // toCompletedSet returns the real data when actual performance exists, or
+        // forecasts by copying planned values into actuals (surplus = 0) so the
+        // plan progresses smoothly from the planned baseline.
+        const completedSets = previousSets
+            .map((set) => this.toCompletedSet(set))
+            .filter((set) => set !== null);
+        if (completedSets.length > 0) {
             return this.calculateAutoRegulatedTargets({
                 exercise,
                 equipment,
-                previousFirstSet,
+                previousSets: completedSets,
                 repRange
             });
         }
@@ -76,32 +74,41 @@ export default class WorkoutExerciseService {
             exercise,
             calibration,
             equipment,
-            microcycleIndex,
             firstMicrocycleRir,
             repRange,
             repRangeMidpoint
         });
     }
     /**
-     * Calculates targets using auto-regulation based on actual performance from a previous set.
+     * Calculates targets using auto-regulation based on actual performance from previous sets.
+     * Surplus is averaged across all sets for a more representative performance signal.
+     * Previously only the first set's surplus was used, which masked poor performance
+     * on later sets (e.g., first set hits target but second set falls far short).
      */
     static calculateAutoRegulatedTargets(params) {
-        const { exercise, equipment, previousFirstSet, repRange } = params;
-        const surplus = WorkoutSessionExerciseService.calculateSetSurplus(previousFirstSet.actualReps, previousFirstSet.plannedReps, previousFirstSet.rir, previousFirstSet.plannedRir);
+        const { exercise, equipment, previousSets, repRange } = params;
+        // The first set is the reference for rep/weight targets (subsequent sets are
+        // derived from the first via intra-session fatigue drops).
+        const previousFirstSet = previousSets[0];
+        // Average surplus across all sets for a holistic performance signal.
+        // previousSets are CompletedWorkoutSets (all fields non-null), so this always returns a number.
+        const surplus = WorkoutSessionExerciseService.calculateAverageSurplus(previousSets) ?? 0;
         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.
+     * Auto-regulated rep progression. Attempts to increase reps until hitting rep range max,
+     * then resets reps and increases weight.
      *
      * | 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) |
+     * | -3 | Regress: actualReps (use actual as new baseline) |
+     * | < -3 | Severe regress: actualReps + reduce weight (weight is too heavy for rep range) |
      */
     static calculateAutoRegulatedRepTargets(previousSet, surplus, repRange, equipment) {
         let targetReps;
@@ -115,14 +122,24 @@ export default class WorkoutExerciseService {
         else if (surplus >= -2) {
             targetReps = previousSet.plannedReps;
         }
+        else if (surplus >= -3) {
+            targetReps = previousSet.actualReps;
+        }
         else {
+            // Severe underperformance: the weight is too heavy for this rep range.
+            // Reduce weight by one equipment increment so the user can actually
+            // train in the target rep range.
             targetReps = previousSet.actualReps;
+            const reducedWeight = WorkoutEquipmentTypeService.findNearestWeight(equipment, targetWeight - 0.01, 'down');
+            if (reducedWeight !== null) {
+                targetWeight = reducedWeight;
+            }
         }
         // 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;
+            targetReps = Math.floor((repRange.min + repRange.max) / 2);
             const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
             if (nextWeight !== null) {
                 targetWeight = nextWeight;
@@ -176,82 +193,54 @@ export default class WorkoutExerciseService {
         return { targetWeight, targetReps };
     }
     /**
-     * Checks whether a set has all the data needed for autoregulation calculations.
+     * Converts a {@link WorkoutSet} into a {@link CompletedWorkoutSet} for autoregulation.
+     *
+     * If actual performance data exists, returns the set with those values. Otherwise,
+     * forecasts by copying planned values into the actual fields (producing surplus = 0)
+     * so that autoregulation applies normal progression from the planned baseline.
+     *
+     * Returns null if the set lacks the minimum planned data needed.
      */
-    static hasCompleteAutoRegulationData(set) {
-        return (set.actualReps != null &&
-            set.plannedReps != null &&
-            set.rir != null &&
-            set.plannedRir != null &&
-            set.plannedWeight != null);
+    static toCompletedSet(set) {
+        if (!set) {
+            return null;
+        }
+        const { plannedReps, plannedWeight, plannedRir } = set;
+        if (plannedReps == null || plannedWeight == null || plannedRir == null) {
+            return null;
+        }
+        return {
+            ...set,
+            plannedReps,
+            plannedWeight,
+            plannedRir,
+            actualReps: set.actualReps ?? plannedReps,
+            actualWeight: set.actualWeight ?? plannedWeight,
+            rir: set.rir ?? plannedRir
+        };
     }
     /**
-     * Calculates targets using the calibration-based formula (original behavior).
+     * Calculates initial targets from calibration data. Used only when no previous
+     * set exists (first microcycle of the first mesocycle, or brand-new exercise).
+     * All subsequent microcycle progression is handled by autoregulation/forecasting.
      */
     static calculateCalibrationBasedTargets(params) {
-        const { exercise, calibration, equipment, microcycleIndex, firstMicrocycleRir, repRange, repRangeMidpoint } = params;
-        // For rep progression, calculate weight based on reps at microcycle 0
+        const { exercise, calibration, equipment, firstMicrocycleRir, repRange, repRangeMidpoint } = params;
+        // For rep progression, calculate weight based on midpoint + RIR reps
         // For load progression, use max reps
-        let baseRepsForWeight;
-        if (exercise.preferredProgressionType === ExerciseProgressionType.Rep) {
-            baseRepsForWeight = repRangeMidpoint + firstMicrocycleRir;
-        }
-        else {
-            // Load progression uses max reps for initial weight calculation
-            baseRepsForWeight = repRange.max;
-        }
+        const baseRepsForWeight = exercise.preferredProgressionType === ExerciseProgressionType.Rep
+            ? repRangeMidpoint + firstMicrocycleRir
+            : repRange.max;
         // Calculate base weight
-        let targetWeight = WorkoutExerciseCalibrationService.getTargetWeight(calibration, baseRepsForWeight);
-        // Round to nearest available weight, preferring lower
-        const roundedWeight = WorkoutEquipmentTypeService.findNearestWeight(equipment, targetWeight, 'prefer-down');
-        if (roundedWeight === null) {
+        const rawWeight = WorkoutExerciseCalibrationService.getTargetWeight(calibration, baseRepsForWeight);
+        const targetWeight = WorkoutEquipmentTypeService.findNearestWeight(equipment, rawWeight, 'prefer-down');
+        if (targetWeight === null) {
             throw new Error(`No available weight options found for equipment type ${equipment._id}, ${equipment.title}`);
         }
-        targetWeight = roundedWeight;
-        // Calculate target reps based on progression type
-        let targetReps;
-        if (exercise.preferredProgressionType === ExerciseProgressionType.Rep) {
-            // Rep progression: Add up to max reps, then loop back if needed
-            let currentMicrocycleIndex = 0;
-            targetReps = repRangeMidpoint;
-            while (currentMicrocycleIndex < microcycleIndex) {
-                targetReps += 2;
-                if (targetReps > repRange.max) {
-                    // Different reset amounts based on the rep range
-                    switch (exercise.repRange) {
-                        case ExerciseRepRange.Heavy:
-                            targetReps = targetReps - 4;
-                            break;
-                        case ExerciseRepRange.Medium:
-                            targetReps = targetReps - 6;
-                            break;
-                        case ExerciseRepRange.Light:
-                            targetReps = targetReps - 8;
-                            break;
-                    }
-                    const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
-                    if (nextWeight !== null) {
-                        targetWeight = nextWeight;
-                    }
-                }
-                currentMicrocycleIndex++;
-            }
-        }
-        else {
-            // Load progression: Start at max reps
-            targetReps = repRange.max;
-        }
-        // Apply load progression if applicable for the weight
-        if (exercise.preferredProgressionType === ExerciseProgressionType.Load && microcycleIndex > 0) {
-            const nextWeight = this.findNextTwoPercentWeight(targetWeight, equipment);
-            if (nextWeight !== null) {
-                targetWeight = nextWeight;
-            }
-            else {
-                // Increase reps if we can't increase weight
-                targetReps = targetReps + 2;
-            }
-        }
+        // Rep progression starts at midpoint; load progression starts at max reps
+        const targetReps = exercise.preferredProgressionType === ExerciseProgressionType.Rep
+            ? repRangeMidpoint
+            : repRange.max;
         return { targetWeight, targetReps };
     }
     static findNextTwoPercentWeight(currentWeight, equipment) {

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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"}