@dgpholdings/greatoak-shared 1.2.79 → 1.2.82

package/README.md

@@ -39,7 +39,7 @@ import { calculateExerciseScoreV2, calculateTotalVolume, isDefined, toError } fr
 | `commonTypes.ts` | `TRecord`, `TExerciseConfig`, `TTemplateExercise`, `TGdprData`, `TDayKey` |
 | `TApiExercise.ts` | `TExercise`, `TBodyPart`, `EBodyParts`, `TTrainingType`, `TTimingGuardrails` |
 | `TApiUser.ts` | `TUserMetric`, `TFitnessGoal`, `TUserType`, `TSubscriptionStatus`, `TGender` |
-| `TApiAuth.ts` | `TOnboardingData`, signup/signin request & response types |
+| `TApiAuth.ts` | Signup/signin request & response types (`TApiSignupAnonymousReq`, `TSignInRes`, etc.) |
 | `TApiExerciseRecord.ts` | Record save/fetch request & response types |
 | `TApiTemplateData.ts` | `TTemplate`, `TTemplateDb`, `TTemplateData`, `TExerciseLatestRecord` |
 | `TApiProPlan.ts` | `TProPlan`, pro plan CRUD request & response types |

package/dist/__mocks__/user.mock.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mockUser = void 0;
 exports.mockUser = {
     // TUserPreferences fields (flat in TUserMetric)
-    trainingLocation: "gym",
     preferredDurationMinutes: 45,
     fitnessGoals: ["hypertrophy"],
-    preferredEquipment: ["weights"],
+    preferredEquipment: ["dumbbell", "barbell"],
     preferCompoundMovements: true,
     includeWarmup: "ai_decide",
     includeCooldown: "ai_decide",

package/dist/constants/AiExerciseVocabulary.d.ts

@@ -3,6 +3,9 @@ export type TAiFitnessGoal = (typeof AI_FITNESS_GOALS)[number];
 export declare const AI_EQUIPMENT_TYPES: readonly ["none", "dumbbell", "barbell", "resistance_band", "cable_machine", "standard_machine", "suspension_trainer", "pull_up_bar", "bench", "kettlebell", "niche_machine", "exercise_ball", "ez_bar", "cardio_machine", "smith_machine", "weight_plate", "jump_rope", "battle_ropes", "medicine_ball", "ab_wheel", "plyo_box", "parallel_bars"];
 export type TAiEquipmentType = (typeof AI_EQUIPMENT_TYPES)[number];
 export declare const AI_HOME_EQUIPMENT: TAiEquipmentType[];
+export declare const AI_QUICKSTART_EQUIPMENT_GROUPS_LIST: readonly ["gym_machines", "gym_equipment", "home_equipment", "no_equipment"];
+export type TQuickStartEquipmentGroupExplicit = (typeof AI_QUICKSTART_EQUIPMENT_GROUPS_LIST)[number];
+export declare const AI_QUICKSTART_EQUIPMENT_GROUPS: Record<TQuickStartEquipmentGroupExplicit, TAiEquipmentType[]>;
 export declare const AI_MOVEMENT_PATTERNS: readonly ["push_horizontal", "push_vertical", "pull_horizontal", "pull_vertical", "squat", "hinge", "lunge", "rotation", "carry", "isolation", "plyo", "cardio", "mobility", "balance", "core_stability"];
 export type TAiMovementPattern = (typeof AI_MOVEMENT_PATTERNS)[number];
 export declare const AI_PUSH_PATTERNS: TAiMovementPattern[];

package/dist/constants/AiExerciseVocabulary.js

@@ -7,7 +7,7 @@
 // Verified against 701 active exercises from exercises-v2_3_PURE.json
 // Do not add values here without also ensuring they exist in the data.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AI_INTENT_CHIPS = exports.AI_ENERGY_LEVEL_OPTIONS = exports.AI_INJURY_DURATION_LABELS = exports.AI_INJURY_DURATION = exports.AI_INJURY_SEVERITY = exports.AI_POPULAR_THRESHOLD = exports.AI_BODY_ISSUE_TYPES = exports.AI_BODY_AREAS = exports.AI_MET_THRESHOLDS = exports.AI_SLEEP_TO_MAX_CNS = exports.AI_INTENSITY_LEVELS = exports.AI_DIFFICULTY_FILTER = exports.AI_FITNESS_LEVELS = exports.AI_SESSION_ORDER = exports.AI_WORKOUT_PLACEMENTS = exports.AI_CORE_PATTERNS = exports.AI_LEG_PATTERNS = exports.AI_PULL_PATTERNS = exports.AI_PUSH_PATTERNS = exports.AI_MOVEMENT_PATTERNS = exports.AI_HOME_EQUIPMENT = exports.AI_EQUIPMENT_TYPES = exports.AI_FITNESS_GOALS = void 0;
+exports.AI_INTENT_CHIPS = exports.AI_ENERGY_LEVEL_OPTIONS = exports.AI_INJURY_DURATION_LABELS = exports.AI_INJURY_DURATION = exports.AI_INJURY_SEVERITY = exports.AI_POPULAR_THRESHOLD = exports.AI_BODY_ISSUE_TYPES = exports.AI_BODY_AREAS = exports.AI_MET_THRESHOLDS = exports.AI_SLEEP_TO_MAX_CNS = exports.AI_INTENSITY_LEVELS = exports.AI_DIFFICULTY_FILTER = exports.AI_FITNESS_LEVELS = exports.AI_SESSION_ORDER = exports.AI_WORKOUT_PLACEMENTS = exports.AI_CORE_PATTERNS = exports.AI_LEG_PATTERNS = exports.AI_PULL_PATTERNS = exports.AI_PUSH_PATTERNS = exports.AI_MOVEMENT_PATTERNS = exports.AI_QUICKSTART_EQUIPMENT_GROUPS = exports.AI_QUICKSTART_EQUIPMENT_GROUPS_LIST = exports.AI_HOME_EQUIPMENT = exports.AI_EQUIPMENT_TYPES = exports.AI_FITNESS_GOALS = void 0;
 exports.AI_FITNESS_GOALS = [
     "strength",
     "hypertrophy",
@@ -53,6 +53,36 @@ exports.AI_HOME_EQUIPMENT = [
     "exercise_ball",
     "jump_rope",
 ];
+// Quick Start equipment groups
+// Coarse buckets exposed in the Quick Start UI. Each maps to a set of
+// TAiEquipmentType values that match Qdrant payload `equipment.primary`.
+// "preferences" is modelled separately as the discriminated alternative
+// (defer to user's saved preferredEquipment), so it is NOT in this map.
+exports.AI_QUICKSTART_EQUIPMENT_GROUPS_LIST = [
+    "gym_machines",
+    "gym_equipment",
+    "home_equipment",
+    "no_equipment",
+];
+exports.AI_QUICKSTART_EQUIPMENT_GROUPS = {
+    gym_machines: [
+        "cable_machine",
+        "standard_machine",
+        "smith_machine",
+        "niche_machine",
+        "cardio_machine",
+    ],
+    gym_equipment: [
+        "barbell",
+        "ez_bar",
+        "dumbbell",
+        "kettlebell",
+        "weight_plate",
+        "bench",
+    ],
+    home_equipment: ["dumbbell", "kettlebell", "resistance_band", "bench"],
+    no_equipment: ["none"],
+};
 exports.AI_MOVEMENT_PATTERNS = [
     "push_horizontal",
     "push_vertical",

package/dist/types/TApiAiQuickStartWorkout.d.ts

@@ -1,4 +1,4 @@
-import { TAiEnergyLevel, TAiUserInjury } from "../constants/AiExerciseVocabulary";
+import { TAiEnergyLevel, TAiUserInjury, TQuickStartEquipmentGroupExplicit } from "../constants/AiExerciseVocabulary";
 import { TTemplate } from "./TApiTemplateData";
 export type TApiAiQuickStartWorkoutReq = {
     /**
@@ -21,11 +21,6 @@ export type TApiAiQuickStartWorkoutReq = {
      * Crucial for correctly fetching "yesterday's" workout history from DynamoDB.
      */
     timezone: string;
-    /**
-     * Whether the user intends to work out at home or at the gym today.
-     * If not provided, defaults to user's saved trainingLocation preference.
-     */
-    workoutLocation: "home" | "gym";
     /**
      * The general time of day the user is working out.
      * Can influence warm-up duration and intensity (e.g., morning stiffness vs. evening fatigue, Afternoon: (Peak Performance)).
@@ -47,6 +42,32 @@ export type TApiAiQuickStartWorkoutReq = {
      * but the job creation and processing are not dependent on this sync succeeding.
      */
     isOnPeriod?: boolean;
+    /**
+     * Equipment selection for this workout session.
+     *
+     * Two mutually-exclusive modes (enforced by the discriminated union):
+     *
+     * 1. `{ type: "preferences" }`
+     *    Defer to the user's saved `preferredEquipment` on their profile.
+     *    Default selection in the frontend.
+     *
+     * 2. `{ type: "groups", groups: [...] }`
+     *    Explicit session-level override. Each group maps to a set of
+     *    `TAiEquipmentType` values via `AI_QUICKSTART_EQUIPMENT_GROUPS`.
+     *    Multi-select; the backend takes the union of all groups' equipment.
+     *    Must contain at least one group (enforced at API edge).
+     *
+     * Empty-result policy: if the resolved equipment set is empty (e.g. user
+     * picked "preferences" but profile has no preferredEquipment yet), the
+     * backend treats it as "no equipment filter" — i.e. all candidates eligible.
+     */
+    equipmentSelectionOverride: TQuickStartEquipmentSelection;
+};
+export type TQuickStartEquipmentSelection = {
+    type: "preferences";
+} | {
+    type: "groups";
+    groups: TQuickStartEquipmentGroupExplicit[];
 };
 export type TAiEnrichedContext = {
     qdrantFilters: {
@@ -65,6 +86,8 @@ export type TAiEnrichedContext = {
         activeInjuries: TAiUserInjury[];
         avoidedAreas: string[];
         yesterdaysExercises: string[];
+        isOnPeriod?: boolean;
+        availableTimeMinutes?: number;
     };
 };
 /**

package/dist/types/TApiAuth.d.ts

@@ -1,48 +1,35 @@
-import type { TAiFitnessGoal, TAiBodyArea } from "../constants/AiExerciseVocabulary";
+import type { TAiFitnessGoal } from "../constants/AiExerciseVocabulary";
 import { TAuthType, TGender, TProfessionalCategory, TUserMetric, TUserType, TInjuryInfo } from "./TApiUser";
-import { TActivityLevel, TStablePreferences, TFemaleHealthContext } from "./TUserPreferences";
+import { TActivityLevel } from "./TUserPreferences";
 /**
- * TOnboardingData: Core user profile data collected during onboarding
- * Does NOT include workout preferences - those come from TStablePreferences
+ * Anonymous signup request.
+ *
+ * Only fields actually collected during onboarding are declared here.
+ * Workout preferences (preferredEquipment, preferredDurationMinutes, warmup
+ * style, etc.) are populated server-side with sensible defaults — see
+ * `loginAnonymousController` and `core/constants.ts` in the backend.
+ *
+ * Essential GDPR consent is implicit at anonymous signup (the user can't
+ * proceed without it), so it isn't part of the wire contract.
  */
-export type TOnboardingData = {
+export type TApiSignupAnonymousReq = {
+    model: string;
+    deviceUniqueId: string;
+    appLanguage: string;
+    fullName?: string;
+    userType: TUserType;
+    professionType?: TProfessionalCategory;
     weightKg: number;
     heightCm: number;
     dob: Date;
     gender: TGender;
     bodyFatPercentage: number;
     metricSystem: "US" | "EU";
-    appLanguage: string;
     fitnessGoals: TAiFitnessGoal[];
     fitnessLevel: TActivityLevel;
-    avoidBodyAreas?: TAiBodyArea[];
     injuryInfo?: TInjuryInfo;
-    gdprEssential?: boolean;
     gdprAnalytics: boolean;
     gdprMarketing: boolean;
-    userCode: string;
-    userType: TUserType;
-    professionType?: TProfessionalCategory;
-    email?: string;
-    fullName?: string;
-};
-/**
- * Anonymous signup request
- * = Core onboarding data + device info + OPTIONAL workout preferences
- */
-export type TApiSignupAnonymousReq = Omit<TOnboardingData, "userCode"> & {
-    model: string;
-    deviceUniqueId: string;
-    trainingLocation?: TStablePreferences["trainingLocation"];
-    preferredDurationMinutes?: TStablePreferences["preferredDurationMinutes"];
-    preferredEquipment?: TStablePreferences["preferredEquipment"];
-    preferCompoundMovements?: TStablePreferences["preferCompoundMovements"];
-    includeWarmup?: TStablePreferences["includeWarmup"];
-    includeCooldown?: TStablePreferences["includeCooldown"];
-    warmupStyle?: TStablePreferences["warmupStyle"];
-    favouriteMuscleGroups?: TStablePreferences["favouriteMuscleGroups"];
-    blacklistedExerciseIds?: TStablePreferences["blacklistedExerciseIds"];
-    femaleHealth?: TFemaleHealthContext | null;
 };
 export type TApiSignupAnonymousRes = TSignInRes & {
     authType: "anonymous";

package/dist/types/TUserPreferences.d.ts

@@ -1,15 +1,12 @@
-import { TAiFitnessGoal } from "../constants";
+import { TAiEquipmentType, TAiFitnessGoal } from "../constants";
 import { TBodyPart } from "./TApiExercise";
-export type TTrainingLocation = "gym" | "home" | "both";
 export type TPreferredDuration = 20 | 30 | 45 | 60 | 90 | 120;
 export type TAIDecision = "yes" | "no" | "ai_decide";
 export type TWarmupStyle = "dynamic_stretching" | "light_cardio";
-export type TPreferredEquipment = "machines" | "weights" | "free_hand";
 export type TStablePreferences = {
-    trainingLocation: TTrainingLocation;
     preferredDurationMinutes: TPreferredDuration;
     fitnessGoals: TAiFitnessGoal[];
-    preferredEquipment: TPreferredEquipment[];
+    preferredEquipment: TAiEquipmentType[];
     preferCompoundMovements: boolean;
     includeWarmup: TAIDecision;
     includeCooldown: TAIDecision;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dgpholdings/greatoak-shared",
-	"version": "1.2.79",
+	"version": "1.2.82",
 	"description": "Shared TypeScript types and utilities for @dgpholdings projects",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",