hevy-shared 1.0.1047 → 1.0.1049

package/built/index.d.ts

@@ -1,5 +1,5 @@
 import { InstructionsLanguage } from './exerciseLocaleUtils';
-import { WorkoutDurationMinutes } from './hevyTrainer';
+import { TrainerWorkoutTemplateName, WorkoutDurationMinutes } from './hevyTrainer';
 import { BugReportQuestionSchema, CreateBugReportRequestBodySchema, postEmailBackofficeSchema } from './schemas';
 import { Language } from './translations';
 import { Lookup } from './typeUtils';
@@ -29,6 +29,7 @@ export * from './hevyTrainer';
 export * from './translations';
 export * from './exerciseLocaleUtils';
 export * from './getVolumeComparison';
+export * from './geography';
 export type WeightUnit = 'kg' | 'lbs';
 export declare const isWeightUnit: (x: string) => x is WeightUnit;
 export type DistanceUnit = 'kilometers' | 'miles';
@@ -302,8 +303,7 @@ export interface BackofficeExistingUserResponse {
     public_api_key: string | null;
     limited_discovery: boolean;
     coach_trial_expire_date?: string;
-    hevy_trainer_program: HevyTrainerProgram | null;
-    email_consent: boolean;
+    hevy_trainer_program: TrainerProgramV3 | null;
 }
 export interface BackofficeDeletedUserResponse {
     state: 'deleted-account';
@@ -748,6 +748,10 @@ export interface RepRange {
     start: number | null;
     end: number | null;
 }
+export interface StrictRepRange extends RepRange {
+    start: number;
+    end: number;
+}
 export interface WorkoutComment {
     id: number;
     username: string;
@@ -876,12 +880,14 @@ export interface Routine extends BaseRoutine {
     username: string;
     coach_id: null;
 }
+/** @deprecated Use TrainerWorkoutTemplate instead */
 export interface HevyTrainerRoutine extends Routine {
     hevy_trainer_program_id: string;
     program_id: null;
     coach_force_rpe_enabled: false;
     folder_id: null;
 }
+/** @deprecated Use TrainerWorkoutTemplate instead */
 export declare const isHevyTrainerRoutine: (routine: BaseRoutine) => routine is HevyTrainerRoutine;
 export type CoachsShallowLibraryRoutine = Omit<BaseRoutine, 'exercises' | 'profile_pic' | 'hevy_trainer_program_id' | 'username'>;
 export interface CoachesRoutine extends BaseRoutine {
@@ -1050,6 +1056,105 @@ export interface GetTeamInviteResponse {
 export interface OutstandingInvitesForCoachTeamResponse {
     invites: CoachTeamInvite[];
 }
+export interface TrainerWorkoutTemplateResistanceExercise {
+    kind: 'resistance';
+    id: string;
+    exercise_template_id: string;
+    index: number;
+    set_count: number;
+    warmup_set_count: number;
+    rep_range: StrictRepRange;
+    rest_seconds: number;
+}
+export interface TrainerWorkoutTemplateCardioExercise {
+    kind: 'cardio';
+    id: string;
+    exercise_template_id: string;
+    index: number;
+    set_count: 1;
+    duration_seconds: number;
+}
+export interface TrainerWorkoutTemplateOtherExercise {
+    kind: 'other';
+    id: string;
+    exercise_template_id: string;
+    index: number;
+    set_count: number;
+}
+export type TrainerWorkoutTemplateExercise = TrainerWorkoutTemplateResistanceExercise | TrainerWorkoutTemplateCardioExercise | TrainerWorkoutTemplateOtherExercise;
+export interface TrainerWorkoutTemplate {
+    id: string;
+    hevy_trainer_program_id: string;
+    index: number;
+    name: TrainerWorkoutTemplateName;
+    exercises: TrainerWorkoutTemplateExercise[];
+}
+export interface TrainerProgramV3 {
+    id: string;
+    schema_version: 'v3';
+    created_at: string;
+    updated_at: string;
+    level: TrainingLevel;
+    goal: TrainingGoal;
+    equipments: GranularEquipment[];
+    weekly_frequency: WeeklyTrainingFrequency;
+    templates: TrainerWorkoutTemplate[];
+    focus_muscle?: SimplifiedMuscleGroup;
+    next_workout_index: number;
+    workout_duration_minutes: WorkoutDurationMinutes;
+    rest_timer_length: RestTimerLength;
+    cardio_preference: CardioPreference;
+}
+export type TrainerWorkoutTemplateExerciseInput = Omit<TrainerWorkoutTemplateResistanceExercise, 'id'> | Omit<TrainerWorkoutTemplateCardioExercise, 'id'> | Omit<TrainerWorkoutTemplateOtherExercise, 'id'>;
+export interface PostTrainerWorkoutTemplate {
+    name: TrainerWorkoutTemplateName;
+    index: number;
+    exercises: TrainerWorkoutTemplateExerciseInput[];
+}
+export interface UpdateTrainerWorkoutTemplate extends PostTrainerWorkoutTemplate {
+    id: string;
+}
+export interface PostTrainerProgramV3RequestBody {
+    program: {
+        version: 3;
+        title: string;
+        level: TrainingLevel;
+        goal: TrainingGoal;
+        equipments: GranularEquipment[];
+        weekly_frequency: WeeklyTrainingFrequency;
+        focus_muscle?: SimplifiedMuscleGroup;
+        next_workout_index?: number;
+        workout_duration_minutes: WorkoutDurationMinutes;
+        rest_timer_length: RestTimerLength;
+        cardio_preference: CardioPreference;
+        templates: PostTrainerWorkoutTemplate[];
+    };
+    /**
+     * Whether to delete (archive) the caller's currently active Hevy Trainer
+     * program before creating the new one. Creating a program implicitly
+     * replaces any active program, so this must be set explicitly:
+     * - `false` — fail with `ActiveProgramExists` (409) if one already exists.
+     * - `true` — archive the existing active program, then create the new one.
+     */
+    deleteActiveProgram: boolean;
+}
+export interface UpdateTrainerProgramV3RequestBody {
+    program: {
+        version: 3;
+        programId: string;
+        level: TrainingLevel;
+        goal: TrainingGoal;
+        equipments: GranularEquipment[];
+        weekly_frequency: WeeklyTrainingFrequency;
+        focus_muscle?: SimplifiedMuscleGroup;
+        next_workout_index?: number;
+        workout_duration_minutes: WorkoutDurationMinutes;
+        rest_timer_length: RestTimerLength;
+        cardio_preference: CardioPreference;
+        templates: UpdateTrainerWorkoutTemplate[];
+    };
+}
+/** @deprecated Use TrainerProgramV3 instead */
 export interface HevyTrainerProgram {
     id: string;
     created_at: string;
@@ -1066,6 +1171,7 @@ export interface HevyTrainerProgram {
     rest_timer_length: RestTimerLength;
     cardio_preference: CardioPreference;
 }
+/** @deprecated Use PostTrainerProgramV3RequestBody instead */
 export interface PostHevyTrainerProgramRequestBody {
     program: {
         version: 1;
@@ -1082,6 +1188,7 @@ export interface PostHevyTrainerProgramRequestBody {
         cardio_preference: CardioPreference;
     };
 }
+/** @deprecated Use UpdateTrainerProgramV3RequestBody instead */
 export interface UpdateHevyTrainerProgramRequestBody {
     program: {
         version: 1;
@@ -1104,7 +1211,7 @@ export interface UpdateHevyTrainerProgramRequestBody {
         }[];
     };
 }
-/** @deprecated Use HevyTrainerProgram instead */
+/** @deprecated Use TrainerProgramV3 instead */
 export interface HevyTrainerProgramOld {
     id: string;
     created_at: string;
@@ -1119,7 +1226,7 @@ export interface HevyTrainerProgramOld {
     next_workout_index: number;
     workout_duration_minutes?: WorkoutDurationMinutes;
 }
-/** @deprecated Use PostHevyTrainerProgramRequestBody instead */
+/** @deprecated Use PostTrainerProgramV3RequestBody instead */
 export interface PostHevyTrainerProgramOldRequestBody {
     program: {
         title: string;
@@ -1133,7 +1240,7 @@ export interface PostHevyTrainerProgramOldRequestBody {
         workout_duration_minutes?: WorkoutDurationMinutes;
     };
 }
-/** @deprecated Use UpdateHevyTrainerProgramRequestBody instead */
+/** @deprecated Use UpdateTrainerProgramV3RequestBody instead */
 export interface UpdateHevyTrainerProgramOldRequestBody {
     program: {
         programId: string;
@@ -1407,7 +1514,8 @@ type CommercialGym = {
     name: string;
     fullAddress: string;
     city: string;
-    distanceM: number;
+    latitude: number;
+    longitude: number;
 };
 export type Gym = CommercialGym;
 export interface StripePrice {

package/built/index.js

@@ -41,6 +41,7 @@ __exportStar(require("./hevyTrainer"), exports);
 __exportStar(require("./translations"), exports);
 __exportStar(require("./exerciseLocaleUtils"), exports);
 __exportStar(require("./getVolumeComparison"), exports);
+__exportStar(require("./geography"), exports);
 const isWeightUnit = (x) => {
     return x === 'kg' || x === 'lbs';
 };
@@ -321,6 +322,7 @@ const isWorkoutBiometrics = (x) => {
     return caloriesAreValid && heartSamplesAreValid;
 };
 exports.isWorkoutBiometrics = isWorkoutBiometrics;
+/** @deprecated Use TrainerWorkoutTemplate instead */
 const isHevyTrainerRoutine = (routine) => routine.hevy_trainer_program_id !== null;
 exports.isHevyTrainerRoutine = isHevyTrainerRoutine;
 exports.measurementsList = [

package/built/tests/geography.test.d.ts

@@ -0,0 +1 @@
+export {};

package/built/tests/geography.test.js

@@ -0,0 +1,25 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const geography_1 = require("../geography");
+describe('Geography utils', () => {
+    describe('distanceMBetween', () => {
+        it('Calculates the distance between two sets of coordinates', () => __awaiter(void 0, void 0, void 0, function* () {
+            expect((0, geography_1.distanceMBetween)(51.001, 52, 51, 52)).toBe(111);
+            expect((0, geography_1.distanceMBetween)(51.002, 52, 51, 52)).toBe(222);
+            expect((0, geography_1.distanceMBetween)(50.999, 52, 51, 52)).toBe(111);
+            expect((0, geography_1.distanceMBetween)(51.01, 52, 51, 52)).toBe(1112);
+            expect((0, geography_1.distanceMBetween)(51.04, 52, 51, 52)).toBe(4448);
+            expect((0, geography_1.distanceMBetween)(51.035, 52.035, 51, 52)).toBe(4598);
+            expect((0, geography_1.distanceMBetween)(50.965, 51.965, 51, 52)).toBe(4599);
+        }));
+    });
+});

package/built/tests/hevyTrainer.test.js

@@ -236,7 +236,7 @@ const makeSettings = (overrides = {}) => {
         };
         return acc;
     }, {});
-    const templates = hevyTrainer_1.routineNames.reduce((acc, name) => {
+    const templates = hevyTrainer_1.workoutTemplateNames.reduce((acc, name) => {
         acc[name] = { exercises: [] };
         return acc;
     }, {});
@@ -372,7 +372,7 @@ describe('getPrioritySortedExercises', () => {
         expect(result.quadriceps.map((e) => e.id)).toEqual(['leg-ex']);
     });
 });
-const baseCriteria = (overrides = {}) => (Object.assign({ exerciseCategory: 'compound', equipments: [], routineBarbellExerciseCount: 0, level: 'beginner', goal: 'strength', muscleGroup: 'chest', frequency: 3 }, overrides));
+const baseCriteria = (overrides = {}) => (Object.assign({ exerciseCategory: 'compound', equipments: [], workoutBarbellExerciseCount: 0, level: 'beginner', goal: 'strength', muscleGroup: 'chest', frequency: 3 }, overrides));
 /** Produces a `sortedExercises` record where only `chest` is populated. */
 const chestOnlySorted = (exercises) => {
     const empty = __1.muscleGroups.reduce((acc, mg) => {
@@ -394,7 +394,7 @@ describe('pickTrainerExercise', () => {
         });
         expect(result === null || result === void 0 ? void 0 : result.id).toBe('fresh');
     });
-    it('pass 2: falls back to exercises not used in the current routine when all are used in the program', () => {
+    it('pass 2: falls back to exercises not used in the current workout when all are used in the program', () => {
         const onlyExercise = makeExercise({ id: 'only' });
         const result = (0, hevyTrainer_1.pickTrainerExercise)({
             sortedExercises: chestOnlySorted([onlyExercise]),
@@ -402,8 +402,8 @@ describe('pickTrainerExercise', () => {
             context: {
                 // Marked as used in the whole program already.
                 programUsedExerciseIds: new Set(['only']),
-                // But not used in this routine, so pass 2 should succeed.
-                routineUsedExerciseIds: new Set(),
+                // But not used in this workout, so pass 2 should succeed.
+                workoutUsedExerciseIds: new Set(),
             },
         });
         expect(result === null || result === void 0 ? void 0 : result.id).toBe('only');
@@ -506,7 +506,7 @@ describe('pickTrainerExercise', () => {
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 3,
-                    routineBarbellExerciseCount: 10,
+                    workoutBarbellExerciseCount: 10,
                     equipments: ['dumbbell'],
                 }),
                 context: {},
@@ -519,7 +519,7 @@ describe('pickTrainerExercise', () => {
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 1,
-                    routineBarbellExerciseCount: 2,
+                    workoutBarbellExerciseCount: 2,
                     equipments: ['dumbbell'],
                 }),
                 context: {},
@@ -532,7 +532,7 @@ describe('pickTrainerExercise', () => {
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 1,
-                    routineBarbellExerciseCount: 3,
+                    workoutBarbellExerciseCount: 3,
                     // Dumbbell is listed as a barbell substitute, so the cap applies.
                     equipments: ['dumbbell'],
                 }),
@@ -546,7 +546,7 @@ describe('pickTrainerExercise', () => {
                 sortedExercises: chestOnlySorted([ex]),
                 criteria: baseCriteria({
                     frequency: 1,
-                    routineBarbellExerciseCount: 5,
+                    workoutBarbellExerciseCount: 5,
                     // No substitutes → avoid dead-ends by allowing the barbell.
                     equipments: [],
                 }),
@@ -587,7 +587,7 @@ describe('pickTrainerExercise', () => {
 describe('generateProgram', () => {
     const buildSettingsForChestProgram = () => {
         const settings = makeSettings();
-        // Put a single chest compound prescription into the 1-day full body routine.
+        // Put a single chest compound prescription into the 1-day full body workout.
         settings.templates.full_body_1 = {
             exercises: [
                 { muscle_group: 'chest', category: 'compound', warmup_set_count: 2 },
@@ -596,7 +596,7 @@ describe('generateProgram', () => {
         };
         return settings;
     };
-    it('produces one routine per programSplit and populates exercise fields from the settings', () => {
+    it('produces one workout per programSplit and populates exercise fields from the settings', () => {
         const settings = buildSettingsForChestProgram();
         const chestExercise = makeExercise({ id: 'bench', muscle_group: 'chest' });
         const result = (0, hevyTrainer_1.generateProgram)({
@@ -613,27 +613,19 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        expect(result.program.name).toBe(1);
-        expect(result.program.routines).toHaveLength(hevyTrainer_1.programSplits[1].length);
-        const [routine] = result.program.routines;
-        expect(routine.name).toBe('full_body_1');
-        expect(routine.notes).toBe('Hit the chest hard.');
-        expect(routine.exercises).toHaveLength(1);
-        const [exercise] = routine.exercises;
-        expect(exercise.kind).toBe('resistance');
-        if (exercise.kind !== 'resistance')
+        expect(result.program.workoutTemplates).toHaveLength(hevyTrainer_1.programSplits[1].length);
+        const [workoutTemplate] = result.program.workoutTemplates;
+        expect(workoutTemplate.name).toBe('full_body_1');
+        expect(workoutTemplate.exercises).toHaveLength(1);
+        const [exercise] = workoutTemplate.exercises;
+        if (!(0, hevyTrainer_1.isTrainerProgramResistanceExercise)(exercise))
             return;
-        expect(exercise.exerciseTemplate.id).toBe('bench');
-        expect(exercise.category).toBe('compound');
-        expect(exercise.muscleGroup).toBe('chest');
-        expect(exercise.warmupSetCount).toBe(2);
-        // strength + one_day -> 1 (see `makeSettings`)
-        expect(exercise.sets).toBe(1);
-        // strength + compound -> 1..5
-        expect(exercise.repRangeStart).toBe(1);
-        expect(exercise.repRangeEnd).toBe(5);
-        // strength + medium + compound -> 60
-        expect(exercise.restTimerSeconds).toBe(60);
+        expect(exercise.kind).toBe('resistance');
+        expect(exercise.exercise_template.id).toBe('bench');
+        expect(exercise.warmup_set_count).toBe(2);
+        expect(exercise.set_count).toBe(1);
+        expect(exercise.rep_range).toEqual({ start: 1, end: 5 });
+        expect(exercise.rest_seconds).toBe(60);
     });
     it('returns a partial program and errors when no matching exercise can be found', () => {
         const settings = buildSettingsForChestProgram();
@@ -656,14 +648,14 @@ describe('generateProgram', () => {
             type: 'exercise_not_found',
             muscleGroup: 'chest',
         });
-        // The routine structure still exists in the partial program, just without
+        // The workout template structure still exists in the partial program, just without
         // any resolved exercises.
-        expect(result.partialProgram.routines).toHaveLength(1);
-        expect(result.partialProgram.routines[0].exercises).toEqual([]);
+        expect(result.partialProgram.workoutTemplates).toHaveLength(1);
+        expect(result.partialProgram.workoutTemplates[0].exercises).toEqual([]);
     });
     describe('min_workout_duration_limit filtering', () => {
         /**
-         * Runs a 1-day program containing a single chest compound prescription
+         * Runs a 1-day workout program containing a single chest compound prescription
          * with the provided `min_workout_duration_limit` against the provided
          * `workoutDurationMinutes`, and returns whether the prescription was
          * placed.
@@ -690,9 +682,8 @@ describe('generateProgram', () => {
                 exerciseStore: [makeExercise({ id: 'bench' })],
                 cardioPreference: 'no-cardio',
             });
-            const routine = (result.success ? result.program : result.partialProgram)
-                .routines[0];
-            return routine.exercises.length === 1;
+            const workoutTemplate = (result.success ? result.program : result.partialProgram).workoutTemplates[0];
+            return workoutTemplate.exercises.length === 1;
         };
         it('skips prescriptions whose limit is strictly greater than the selected duration', () => {
             expect(runDurationProbe({ limit: 80, workoutDurationMinutes: 40 })).toBe(false);
@@ -764,11 +755,11 @@ describe('generateProgram', () => {
                 return;
             // Only the 40- and 60-minute prescriptions survive; the 80-minute one
             // is filtered out. Order is preserved.
-            const placed = result.program.routines[0].exercises;
+            const placed = result.program.workoutTemplates[0].exercises;
             expect(placed.every((e) => e.kind === 'resistance')).toBe(true);
             expect(placed
                 .filter(hevyTrainer_1.isTrainerProgramResistanceExercise)
-                .map((e) => e.warmupSetCount)).toEqual([1, 2]);
+                .map((e) => e.warmup_set_count)).toEqual([1, 2]);
         });
     });
     it('skips focus_muscle prescriptions when no focusMuscle is provided', () => {
@@ -792,7 +783,7 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        expect(result.program.routines[0].exercises).toEqual([]);
+        expect(result.program.workoutTemplates[0].exercises).toEqual([]);
     });
     it('routes focus_muscle prescriptions to the requested SimplifiedMuscleGroup', () => {
         const settings = makeSettings();
@@ -819,12 +810,11 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        const [exercise] = result.program.routines[0].exercises;
+        const [exercise] = result.program.workoutTemplates[0].exercises;
         expect(exercise.kind).toBe('resistance');
         if (exercise.kind !== 'resistance')
             return;
-        expect(exercise.exerciseTemplate.id).toBe('biceps-curl');
-        expect(exercise.muscleGroup).toBe('focus_muscle');
+        expect(exercise.exercise_template.id).toBe('biceps-curl');
     });
     it('excludes exercises listed in `excludedExerciseIds`', () => {
         const settings = buildSettingsForChestProgram();
@@ -845,7 +835,7 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        expect(result.program.routines[0].exercises[0].exerciseTemplate.id).toBe('alt');
+        expect(result.program.workoutTemplates[0].exercises[0].exercise_template.id).toBe('alt');
     });
     it('attaches exercise selection traces when debugExerciseSelectionTrace is true', () => {
         const settings = buildSettingsForChestProgram();
@@ -866,7 +856,7 @@ describe('generateProgram', () => {
         expect(result.exerciseSelectionTraces).toHaveLength(1);
         const [trace] = result.exerciseSelectionTraces;
         expect(trace.traceKind).toBe('template');
-        expect(trace.routine).toBe('full_body_1');
+        expect(trace.workoutTemplate).toBe('full_body_1');
         expect(trace.selectedExerciseId).toBe('bench');
         expect(trace.trace.selectedPass).toBe(1);
     });
@@ -938,7 +928,7 @@ describe('generateProgram', () => {
         expect(cardioTrace.equipments).toEqual([]);
         expect(cardioTrace.level).toBe('beginner');
     });
-    it('uses the same prioritized cardio exercise on every routine (not blocked by program reuse)', () => {
+    it('uses the same prioritized cardio exercise on every workout (not blocked by program reuse)', () => {
         const settings = makeSettings();
         settings.templates.full_body_2_a = {
             exercises: [{ muscle_group: 'chest', category: 'compound' }],
@@ -971,13 +961,13 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        expect(result.program.routines[0].exercises[0]).toMatchObject({
+        expect(result.program.workoutTemplates[0].exercises[0]).toMatchObject({
             kind: 'cardio',
-            exerciseTemplate: { id: 'run' },
+            exercise_template: { id: 'run' },
         });
-        expect(result.program.routines[1].exercises[0]).toMatchObject({
+        expect(result.program.workoutTemplates[1].exercises[0]).toMatchObject({
             kind: 'cardio',
-            exerciseTemplate: { id: 'run' },
+            exercise_template: { id: 'run' },
         });
     });
     it('skips cardio exercises that need equipment the user does not have', () => {
@@ -1016,9 +1006,9 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        expect(result.program.routines[0].exercises[0]).toMatchObject({
+        expect(result.program.workoutTemplates[0].exercises[0]).toMatchObject({
             kind: 'cardio',
-            exerciseTemplate: { id: 'body-run' },
+            exercise_template: { id: 'body-run' },
         });
     });
     it('skips globally excluded cardio and uses the next priority exercise', () => {
@@ -1057,12 +1047,12 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        expect(result.program.routines[0].exercises[0]).toMatchObject({
+        expect(result.program.workoutTemplates[0].exercises[0]).toMatchObject({
             kind: 'cardio',
-            exerciseTemplate: { id: 'run-b' },
+            exercise_template: { id: 'run-b' },
         });
     });
-    it('keeps global trace order aligned with routine generation (no cross-routine unshift)', () => {
+    it('keeps global trace order aligned with workout generation (no cross-workout unshift)', () => {
         const settings = makeSettings();
         settings.templates.full_body_2_a = {
             exercises: [{ muscle_group: 'chest', category: 'compound' }],
@@ -1096,15 +1086,15 @@ describe('generateProgram', () => {
         expect(result.success).toBe(true);
         if (!result.success)
             return;
-        const idxA = result.exerciseSelectionTraces.findIndex((t) => t.routine === 'full_body_2_a');
-        const idxB = result.exerciseSelectionTraces.findIndex((t) => t.routine === 'full_body_2_b');
+        const idxA = result.exerciseSelectionTraces.findIndex((t) => t.workoutTemplate === 'full_body_2_a');
+        const idxB = result.exerciseSelectionTraces.findIndex((t) => t.workoutTemplate === 'full_body_2_b');
         expect(idxA).toBeGreaterThanOrEqual(0);
         expect(idxB).toBeGreaterThan(idxA);
     });
     describe('barbell cap at frequency === 1 (end-to-end)', () => {
         it('drops the 4th+ barbell prescription when the user has a substitute', () => {
             const settings = makeSettings();
-            // 4 identical barbell compound prescriptions in the 1-day routine.
+            // 4 identical barbell compound prescriptions in the 1-day workout.
             settings.templates.full_body_1 = {
                 exercises: Array.from({ length: 4 }, () => ({
                     muscle_group: 'chest',
@@ -1133,7 +1123,7 @@ describe('generateProgram', () => {
             expect(result.success).toBe(false);
             if (result.success)
                 return;
-            expect(result.partialProgram.routines[0].exercises).toHaveLength(3);
+            expect(result.partialProgram.workoutTemplates[0].exercises).toHaveLength(3);
             expect(result.errors).toHaveLength(1);
         });
         it('allows 4+ barbell prescriptions at frequency 1 when no substitute is present', () => {
@@ -1164,19 +1154,19 @@ describe('generateProgram', () => {
             expect(result.success).toBe(true);
             if (!result.success)
                 return;
-            expect(result.program.routines[0].exercises).toHaveLength(4);
+            expect(result.program.workoutTemplates[0].exercises).toHaveLength(4);
         });
     });
     describe('focus_muscle cycling', () => {
         it('cycles through simplifiedMuscleGroupToMuscleGroups as focus_muscle prescriptions are placed', () => {
             // Use a 2-day split so we can place 4 focus_muscle exercises across two
-            // routines and confirm the counter survives between routines.
+            // workouts and confirm the counter survives between workouts.
             const settings = makeSettings();
             const focusPrescription = {
                 muscle_group: 'focus_muscle',
                 category: 'isolation',
             };
-            // full_body routines allow any focus muscle. Place 2 per routine so the
+            // full_body workouts allow any focus muscle. Place 2 per workout so the
             // combined count across the program is 4.
             settings.templates.full_body_2_a = {
                 exercises: [focusPrescription, focusPrescription],
@@ -1246,7 +1236,7 @@ describe('generateProgram', () => {
             settings.templates.upper_2 = { exercises: [focusPrescription] };
             settings.templates.lower_2 = { exercises: [focusPrescription] };
             // `legs` cycles through ['quadriceps', 'hamstrings', 'calves', 'glutes',
-            // 'abductors', 'adductors']. The first two allowed routines (legs_1 and
+            // 'abductors', 'adductors']. The first two allowed workouts (legs_1 and
             // lower_2) should land on quadriceps and hamstrings respectively.
             const exercises = [
                 makeExercise({
@@ -1279,10 +1269,7 @@ describe('generateProgram', () => {
             // Only legs_1 and lower_2 run the focus_muscle prescription. Both
             // succeed and should have selected quadriceps then hamstrings in order.
             expect(result.exerciseSelectionTraces).toHaveLength(2);
-            expect(result.exerciseSelectionTraces.map((t) => t.routine)).toEqual([
-                'legs_1',
-                'lower_2',
-            ]);
+            expect(result.exerciseSelectionTraces.map((t) => t.workoutTemplate)).toEqual(['legs_1', 'lower_2']);
             expect(result.exerciseSelectionTraces
                 .filter((t) => t.traceKind === 'template')
                 .map((t) => t.resolvedMuscleGroup)).toEqual(['quadriceps', 'hamstrings']);
@@ -1290,14 +1277,14 @@ describe('generateProgram', () => {
     });
     describe('isFocusMuscleExtraExerciseAllowed template compatibility', () => {
         /**
-         * Runs a single-routine program that places one focus_muscle
+         * Runs a single-workout template program that places one focus_muscle
          * prescription into the requested template and returns whether the
          * prescription produced an exercise or was skipped.
          */
-        const runFocusMuscleProbe = (routineName, focusMuscle, frequency, candidateExercise) => {
+        const runFocusMuscleProbe = (workoutTemplateName, focusMuscle, frequency, candidateExercise) => {
             var _a;
             const settings = makeSettings();
-            settings.templates[routineName] = {
+            settings.templates[workoutTemplateName] = {
                 exercises: [{ muscle_group: 'focus_muscle', category: 'isolation' }],
             };
             const result = (0, hevyTrainer_1.generateProgram)({
@@ -1313,13 +1300,13 @@ describe('generateProgram', () => {
                 debugExerciseSelectionTrace: true,
                 cardioPreference: 'no-cardio',
             });
-            // Find the routine we targeted (it may not be first in the split).
-            const routine = (result.success ? result.program : result.partialProgram).routines.find((r) => r.name === routineName);
+            // Find the workout template we targeted (it may not be first in the split).
+            const workoutTemplate = (result.success ? result.program : result.partialProgram).workoutTemplates.find((w) => w.name === workoutTemplateName);
             return {
-                placed: ((_a = routine === null || routine === void 0 ? void 0 : routine.exercises.length) !== null && _a !== void 0 ? _a : 0) > 0,
+                placed: ((_a = workoutTemplate === null || workoutTemplate === void 0 ? void 0 : workoutTemplate.exercises.length) !== null && _a !== void 0 ? _a : 0) > 0,
             };
         };
-        it('allows every focus muscle on full_body routines', () => {
+        it('allows every focus muscle on full_body workouts', () => {
             const muscles = ['chest', 'shoulders', 'arms', 'legs', 'back'];
             muscles.forEach((focusMuscle) => {
                 // Use a muscle that's in the simplified group: biceps for arms, chest

package/built/tests/testUtils.js

@@ -155,6 +155,7 @@ class WorkoutBuilder {
             workoutVisibility: 'public',
             isWorkoutBiometricsPublic: true,
             trainerProgramId: undefined,
+            trainerWorkoutTemplateId: undefined,
             shareTo: {
                 strava: false,
                 appleHealth: false,

package/built/workout/index.d.ts

@@ -11,7 +11,7 @@ export interface WorkoutSync {
     isMore: boolean;
     updated_at?: string;
 }
-export type Workout = OwnedWorkout & Partial<UserWorkout>;
-export type WorkoutExercise = OwnedWorkoutExercise & Partial<UserWorkoutExercise>;
-export type WorkoutExerciseSet = OwnedWorkoutExerciseSet & Partial<UserWorkoutExerciseSet>;
+export type Workout = OwnedWorkout | UserWorkout;
+export type WorkoutExercise = OwnedWorkoutExercise | UserWorkoutExercise;
+export type WorkoutExerciseSet = OwnedWorkoutExerciseSet | UserWorkoutExerciseSet;
 export declare function isOwnedWorkout(workout: OwnedWorkout | UserWorkout): workout is OwnedWorkout;

package/built/workout/index.js

@@ -20,8 +20,7 @@ __exportStar(require("./userWorkout"), exports);
 __exportStar(require("./publicWorkout"), exports);
 __exportStar(require("./normalizedWorkout"), exports);
 __exportStar(require("./postWorkoutRequest"), exports);
-// Stub
+// Placeholder, will be done better but this works for now
 function isOwnedWorkout(workout) {
-    void workout;
-    return true;
+    return !('gym' in workout);
 }