@openlifelog/sdk 1.0.6 → 1.0.8

package/dist/index.d.mts

@@ -247,6 +247,24 @@ interface QuickEntryFoodLogRequest {
     loggedAt?: DateTime;
 }
 
+interface MuscleGroupEntity {
+    id: UUID;
+    name: string;
+    medicalName?: string;
+    bodyPart?: string;
+    description?: string;
+    createdAt: DateTime;
+    deletedAt?: DateTime;
+}
+interface ExerciseEquipmentEntity {
+    id: UUID;
+    name: string;
+    category?: string;
+    description?: string;
+    isActive: boolean;
+    createdAt: DateTime;
+    deletedAt?: DateTime;
+}
 interface ExerciseCapabilities {
     supportsWeight: boolean;
     isBodyweight: boolean;
@@ -912,6 +930,8 @@ declare class ExercisesResource {
     getFavorites(params?: ListExercisesParams): Promise<ListResponse<Exercise>>;
     addToFavorites(exerciseId: string): Promise<void>;
     removeFromFavorites(exerciseId: string): Promise<void>;
+    getMuscleGroups(): Promise<MuscleGroupEntity[]>;
+    getEquipment(): Promise<ExerciseEquipmentEntity[]>;
 }
 
 declare class WorkoutsResource {
@@ -1018,6 +1038,7 @@ declare class GoalsResource {
     getNutritionGoalsHistory(params?: ListNutritionGoalsHistoryParams): Promise<ListResponse<UserNutritionGoals>>;
     getNutritionProgress(): Promise<DailyNutritionProgress>;
     getNutritionProgressByDate(date: string): Promise<DailyNutritionProgress>;
+    private convertNutritionProgressFromMetric;
 }
 
 declare class AIResource {
@@ -1108,4 +1129,4 @@ declare class UnitConversionError extends OpenLifeLogError {
     constructor(message?: string, rawError?: any);
 }
 
-export { ACTIVITY_METRICS, ALL_METRICS, type AddExerciseItem, type AddExercisesToWorkoutRequest, type AuthResponse, AuthenticationError, AuthorizationError, BODY_METRICS, type BulkCreateMetricEventsRequest, type BulkCreateNutritionGoalsRequest, type CopyNutritionGoalsRequest, type CountResponse, type CreateExerciseRequest, type CreateFoodLogRequest, type CreateFoodRequest, type CreateMetricEventRequest, type CreateNutritionGoalsRequest, type CreateProgramRequest, type CreateUserGoalRequest, type CreateWorkoutRequest, type CreateWorkoutSessionRequest, type CurrentWeekSchedule, type DailyGoalProgress, type DailyMetricAggregate, type DailyNutritionProgress, type DailyNutritionSummary, type DateRangeParams, type DateString, type DateTime, DistanceConverter, type EnrollInProgramRequest, type EnrollmentProgress, type Equipment, type ErrorResponse, type Exercise, type ExerciseCapabilities, type ExerciseCategory, type ExerciseHistory, type ExerciseHistoryEntry, type Food, type FoodInsightsResponse, type FoodLog, type ForceDirection, type GetDailyMetricParams, type GetDailySummaryParams, type GetFoodInsightsParams, type GoalProgress, type GoalProgressStatus, type GoalTargetType, HeightConverter, type Insight, type InsightSeverity, type InsightType, type ListExercisesParams, type ListFoodLogsParams, type ListFoodsParams, type ListMetricEventsParams, type ListNutritionGoalsHistoryParams, type ListParams, type ListResponse, type ListWorkoutSessionsParams, type ListWorkoutsParams, type LoginRequest, type MealType, type MeasurementSystem, type Metric, type MetricAggregationType, type MetricCategory, type MetricDefinition, type MetricEvent, type MovementPattern, type MuscleGroup, NetworkError, NotFoundError, type NutritionGoal, type NutritionGoalType, type NutritionProgress, type NutritionalInformation, OpenLifeLog, type OpenLifeLogConfig, OpenLifeLogError, type PageInfo, PaginatedIterator, type PasswordResetConfirm, type PasswordResetRequest, type PersonalRecord, type PersonalRecordHistory, type PersonalRecordHistoryEntry, type Program, type ProgramEnrollment, type ProgramMetadata, type ProgramScheduleDay, type ProgramScheduleExercise, type QuickEntryFoodLogRequest, RateLimitError, type Recommendation, type RecordType, SLEEP_METRICS, type SearchParams, ServerError, type ServingSize, type SessionExerciseDetail, type SessionStatus, type SetData, type SignupRequest, type SuccessResponse, TimeoutError, type UUID, UnitConversionError, UnitConverter, type UpdateEnrollmentRequest, type UpdateExerciseItem, type UpdateExerciseRequest, type UpdateFoodLogRequest, type UpdateFoodRequest, type UpdateMetricEventRequest, type UpdateNutritionGoalsRequest, type UpdatePreferencesRequest, type UpdateProgramRequest, type UpdateUserGoalRequest, type UpdateUserRequest, type UpdateWorkoutExerciseRequest, type UpdateWorkoutRequest, type UpdateWorkoutSessionRequest, type User, type UserGoal, type UserNutritionGoals, type UserPreferences, VITAL_METRICS, ValidationError, WELLNESS_METRICS, WeightConverter, type Workout, type WorkoutExercise, type WorkoutFormat, type WorkoutSession, createPaginatedIterator, createUnitConverter, OpenLifeLog as default, fetchAllPages, getMetricDefinition, getMetricsByCategory, hasMorePages };
+export { ACTIVITY_METRICS, ALL_METRICS, type AddExerciseItem, type AddExercisesToWorkoutRequest, type AuthResponse, AuthenticationError, AuthorizationError, BODY_METRICS, type BulkCreateMetricEventsRequest, type BulkCreateNutritionGoalsRequest, type CopyNutritionGoalsRequest, type CountResponse, type CreateExerciseRequest, type CreateFoodLogRequest, type CreateFoodRequest, type CreateMetricEventRequest, type CreateNutritionGoalsRequest, type CreateProgramRequest, type CreateUserGoalRequest, type CreateWorkoutRequest, type CreateWorkoutSessionRequest, type CurrentWeekSchedule, type DailyGoalProgress, type DailyMetricAggregate, type DailyNutritionProgress, type DailyNutritionSummary, type DateRangeParams, type DateString, type DateTime, DistanceConverter, type EnrollInProgramRequest, type EnrollmentProgress, type Equipment, type ErrorResponse, type Exercise, type ExerciseCapabilities, type ExerciseCategory, type ExerciseEquipmentEntity, type ExerciseHistory, type ExerciseHistoryEntry, type Food, type FoodInsightsResponse, type FoodLog, type ForceDirection, type GetDailyMetricParams, type GetDailySummaryParams, type GetFoodInsightsParams, type GoalProgress, type GoalProgressStatus, type GoalTargetType, HeightConverter, type Insight, type InsightSeverity, type InsightType, type ListExercisesParams, type ListFoodLogsParams, type ListFoodsParams, type ListMetricEventsParams, type ListNutritionGoalsHistoryParams, type ListParams, type ListResponse, type ListWorkoutSessionsParams, type ListWorkoutsParams, type LoginRequest, type MealType, type MeasurementSystem, type Metric, type MetricAggregationType, type MetricCategory, type MetricDefinition, type MetricEvent, type MovementPattern, type MuscleGroup, type MuscleGroupEntity, NetworkError, NotFoundError, type NutritionGoal, type NutritionGoalType, type NutritionProgress, type NutritionalInformation, OpenLifeLog, type OpenLifeLogConfig, OpenLifeLogError, type PageInfo, PaginatedIterator, type PasswordResetConfirm, type PasswordResetRequest, type PersonalRecord, type PersonalRecordHistory, type PersonalRecordHistoryEntry, type Program, type ProgramEnrollment, type ProgramMetadata, type ProgramScheduleDay, type ProgramScheduleExercise, type QuickEntryFoodLogRequest, RateLimitError, type Recommendation, type RecordType, SLEEP_METRICS, type SearchParams, ServerError, type ServingSize, type SessionExerciseDetail, type SessionStatus, type SetData, type SignupRequest, type SuccessResponse, TimeoutError, type UUID, UnitConversionError, UnitConverter, type UpdateEnrollmentRequest, type UpdateExerciseItem, type UpdateExerciseRequest, type UpdateFoodLogRequest, type UpdateFoodRequest, type UpdateMetricEventRequest, type UpdateNutritionGoalsRequest, type UpdatePreferencesRequest, type UpdateProgramRequest, type UpdateUserGoalRequest, type UpdateUserRequest, type UpdateWorkoutExerciseRequest, type UpdateWorkoutRequest, type UpdateWorkoutSessionRequest, type User, type UserGoal, type UserNutritionGoals, type UserPreferences, VITAL_METRICS, ValidationError, WELLNESS_METRICS, WeightConverter, type Workout, type WorkoutExercise, type WorkoutFormat, type WorkoutSession, createPaginatedIterator, createUnitConverter, OpenLifeLog as default, fetchAllPages, getMetricDefinition, getMetricsByCategory, hasMorePages };

package/dist/index.d.ts

@@ -247,6 +247,24 @@ interface QuickEntryFoodLogRequest {
     loggedAt?: DateTime;
 }
 
+interface MuscleGroupEntity {
+    id: UUID;
+    name: string;
+    medicalName?: string;
+    bodyPart?: string;
+    description?: string;
+    createdAt: DateTime;
+    deletedAt?: DateTime;
+}
+interface ExerciseEquipmentEntity {
+    id: UUID;
+    name: string;
+    category?: string;
+    description?: string;
+    isActive: boolean;
+    createdAt: DateTime;
+    deletedAt?: DateTime;
+}
 interface ExerciseCapabilities {
     supportsWeight: boolean;
     isBodyweight: boolean;
@@ -912,6 +930,8 @@ declare class ExercisesResource {
     getFavorites(params?: ListExercisesParams): Promise<ListResponse<Exercise>>;
     addToFavorites(exerciseId: string): Promise<void>;
     removeFromFavorites(exerciseId: string): Promise<void>;
+    getMuscleGroups(): Promise<MuscleGroupEntity[]>;
+    getEquipment(): Promise<ExerciseEquipmentEntity[]>;
 }
 
 declare class WorkoutsResource {
@@ -1018,6 +1038,7 @@ declare class GoalsResource {
     getNutritionGoalsHistory(params?: ListNutritionGoalsHistoryParams): Promise<ListResponse<UserNutritionGoals>>;
     getNutritionProgress(): Promise<DailyNutritionProgress>;
     getNutritionProgressByDate(date: string): Promise<DailyNutritionProgress>;
+    private convertNutritionProgressFromMetric;
 }
 
 declare class AIResource {
@@ -1108,4 +1129,4 @@ declare class UnitConversionError extends OpenLifeLogError {
     constructor(message?: string, rawError?: any);
 }
 
-export { ACTIVITY_METRICS, ALL_METRICS, type AddExerciseItem, type AddExercisesToWorkoutRequest, type AuthResponse, AuthenticationError, AuthorizationError, BODY_METRICS, type BulkCreateMetricEventsRequest, type BulkCreateNutritionGoalsRequest, type CopyNutritionGoalsRequest, type CountResponse, type CreateExerciseRequest, type CreateFoodLogRequest, type CreateFoodRequest, type CreateMetricEventRequest, type CreateNutritionGoalsRequest, type CreateProgramRequest, type CreateUserGoalRequest, type CreateWorkoutRequest, type CreateWorkoutSessionRequest, type CurrentWeekSchedule, type DailyGoalProgress, type DailyMetricAggregate, type DailyNutritionProgress, type DailyNutritionSummary, type DateRangeParams, type DateString, type DateTime, DistanceConverter, type EnrollInProgramRequest, type EnrollmentProgress, type Equipment, type ErrorResponse, type Exercise, type ExerciseCapabilities, type ExerciseCategory, type ExerciseHistory, type ExerciseHistoryEntry, type Food, type FoodInsightsResponse, type FoodLog, type ForceDirection, type GetDailyMetricParams, type GetDailySummaryParams, type GetFoodInsightsParams, type GoalProgress, type GoalProgressStatus, type GoalTargetType, HeightConverter, type Insight, type InsightSeverity, type InsightType, type ListExercisesParams, type ListFoodLogsParams, type ListFoodsParams, type ListMetricEventsParams, type ListNutritionGoalsHistoryParams, type ListParams, type ListResponse, type ListWorkoutSessionsParams, type ListWorkoutsParams, type LoginRequest, type MealType, type MeasurementSystem, type Metric, type MetricAggregationType, type MetricCategory, type MetricDefinition, type MetricEvent, type MovementPattern, type MuscleGroup, NetworkError, NotFoundError, type NutritionGoal, type NutritionGoalType, type NutritionProgress, type NutritionalInformation, OpenLifeLog, type OpenLifeLogConfig, OpenLifeLogError, type PageInfo, PaginatedIterator, type PasswordResetConfirm, type PasswordResetRequest, type PersonalRecord, type PersonalRecordHistory, type PersonalRecordHistoryEntry, type Program, type ProgramEnrollment, type ProgramMetadata, type ProgramScheduleDay, type ProgramScheduleExercise, type QuickEntryFoodLogRequest, RateLimitError, type Recommendation, type RecordType, SLEEP_METRICS, type SearchParams, ServerError, type ServingSize, type SessionExerciseDetail, type SessionStatus, type SetData, type SignupRequest, type SuccessResponse, TimeoutError, type UUID, UnitConversionError, UnitConverter, type UpdateEnrollmentRequest, type UpdateExerciseItem, type UpdateExerciseRequest, type UpdateFoodLogRequest, type UpdateFoodRequest, type UpdateMetricEventRequest, type UpdateNutritionGoalsRequest, type UpdatePreferencesRequest, type UpdateProgramRequest, type UpdateUserGoalRequest, type UpdateUserRequest, type UpdateWorkoutExerciseRequest, type UpdateWorkoutRequest, type UpdateWorkoutSessionRequest, type User, type UserGoal, type UserNutritionGoals, type UserPreferences, VITAL_METRICS, ValidationError, WELLNESS_METRICS, WeightConverter, type Workout, type WorkoutExercise, type WorkoutFormat, type WorkoutSession, createPaginatedIterator, createUnitConverter, OpenLifeLog as default, fetchAllPages, getMetricDefinition, getMetricsByCategory, hasMorePages };
+export { ACTIVITY_METRICS, ALL_METRICS, type AddExerciseItem, type AddExercisesToWorkoutRequest, type AuthResponse, AuthenticationError, AuthorizationError, BODY_METRICS, type BulkCreateMetricEventsRequest, type BulkCreateNutritionGoalsRequest, type CopyNutritionGoalsRequest, type CountResponse, type CreateExerciseRequest, type CreateFoodLogRequest, type CreateFoodRequest, type CreateMetricEventRequest, type CreateNutritionGoalsRequest, type CreateProgramRequest, type CreateUserGoalRequest, type CreateWorkoutRequest, type CreateWorkoutSessionRequest, type CurrentWeekSchedule, type DailyGoalProgress, type DailyMetricAggregate, type DailyNutritionProgress, type DailyNutritionSummary, type DateRangeParams, type DateString, type DateTime, DistanceConverter, type EnrollInProgramRequest, type EnrollmentProgress, type Equipment, type ErrorResponse, type Exercise, type ExerciseCapabilities, type ExerciseCategory, type ExerciseEquipmentEntity, type ExerciseHistory, type ExerciseHistoryEntry, type Food, type FoodInsightsResponse, type FoodLog, type ForceDirection, type GetDailyMetricParams, type GetDailySummaryParams, type GetFoodInsightsParams, type GoalProgress, type GoalProgressStatus, type GoalTargetType, HeightConverter, type Insight, type InsightSeverity, type InsightType, type ListExercisesParams, type ListFoodLogsParams, type ListFoodsParams, type ListMetricEventsParams, type ListNutritionGoalsHistoryParams, type ListParams, type ListResponse, type ListWorkoutSessionsParams, type ListWorkoutsParams, type LoginRequest, type MealType, type MeasurementSystem, type Metric, type MetricAggregationType, type MetricCategory, type MetricDefinition, type MetricEvent, type MovementPattern, type MuscleGroup, type MuscleGroupEntity, NetworkError, NotFoundError, type NutritionGoal, type NutritionGoalType, type NutritionProgress, type NutritionalInformation, OpenLifeLog, type OpenLifeLogConfig, OpenLifeLogError, type PageInfo, PaginatedIterator, type PasswordResetConfirm, type PasswordResetRequest, type PersonalRecord, type PersonalRecordHistory, type PersonalRecordHistoryEntry, type Program, type ProgramEnrollment, type ProgramMetadata, type ProgramScheduleDay, type ProgramScheduleExercise, type QuickEntryFoodLogRequest, RateLimitError, type Recommendation, type RecordType, SLEEP_METRICS, type SearchParams, ServerError, type ServingSize, type SessionExerciseDetail, type SessionStatus, type SetData, type SignupRequest, type SuccessResponse, TimeoutError, type UUID, UnitConversionError, UnitConverter, type UpdateEnrollmentRequest, type UpdateExerciseItem, type UpdateExerciseRequest, type UpdateFoodLogRequest, type UpdateFoodRequest, type UpdateMetricEventRequest, type UpdateNutritionGoalsRequest, type UpdatePreferencesRequest, type UpdateProgramRequest, type UpdateUserGoalRequest, type UpdateUserRequest, type UpdateWorkoutExerciseRequest, type UpdateWorkoutRequest, type UpdateWorkoutSessionRequest, type User, type UserGoal, type UserNutritionGoals, type UserPreferences, VITAL_METRICS, ValidationError, WELLNESS_METRICS, WeightConverter, type Workout, type WorkoutExercise, type WorkoutFormat, type WorkoutSession, createPaginatedIterator, createUnitConverter, OpenLifeLog as default, fetchAllPages, getMetricDefinition, getMetricsByCategory, hasMorePages };

package/dist/index.js

@@ -1469,6 +1469,30 @@ var ExercisesResource = class {
   async removeFromFavorites(exerciseId) {
     await this.http.delete(`/v1/exercises/${exerciseId}/favorite`);
   }
+  /**
+   * Get all muscle groups
+   *
+   * @example
+   * ```typescript
+   * const muscleGroups = await client.exercises.getMuscleGroups();
+   * ```
+   */
+  async getMuscleGroups() {
+    const response = await this.http.get("/v1/exercises/muscle-groups");
+    return response.data;
+  }
+  /**
+   * Get all exercise equipment
+   *
+   * @example
+   * ```typescript
+   * const equipment = await client.exercises.getEquipment();
+   * ```
+   */
+  async getEquipment() {
+    const response = await this.http.get("/v1/exercises/equipment");
+    return response.data;
+  }
 };
 
 // resources/workouts.ts
@@ -2163,6 +2187,9 @@ var GoalsResource = class {
    */
   async getNutritionProgress() {
     const response = await this.http.get("/v1/nutrition/progress/today");
+    if (this.config.autoConvertUnits) {
+      return this.convertNutritionProgressFromMetric(response.data);
+    }
     return response.data;
   }
   /**
@@ -2170,8 +2197,33 @@ var GoalsResource = class {
    */
   async getNutritionProgressByDate(date) {
     const response = await this.http.get(`/v1/nutrition/progress/date/${date}`);
+    if (this.config.autoConvertUnits) {
+      return this.convertNutritionProgressFromMetric(response.data);
+    }
     return response.data;
   }
+  /**
+   * Convert nutrition progress data from metric to user's preferred units
+   * Handles water values in the progress data
+   */
+  convertNutritionProgressFromMetric(data) {
+    if (!data || !data.progress) {
+      return data;
+    }
+    const converted = { ...data };
+    converted.progress = data.progress.map((nutrient) => {
+      if (nutrient.nutrientKey === "water" && this.config.measurementSystem === "imperial") {
+        return {
+          ...nutrient,
+          current: nutrient.current ? VolumeConverter.fromMetric(nutrient.current, this.config.measurementSystem) : nutrient.current,
+          target: nutrient.target ? VolumeConverter.fromMetric(nutrient.target, this.config.measurementSystem) : nutrient.target,
+          remaining: nutrient.remaining ? VolumeConverter.fromMetric(nutrient.remaining, this.config.measurementSystem) : nutrient.remaining
+        };
+      }
+      return nutrient;
+    });
+    return converted;
+  }
 };
 
 // resources/ai.ts

package/dist/index.mjs

@@ -1415,6 +1415,30 @@ var ExercisesResource = class {
   async removeFromFavorites(exerciseId) {
     await this.http.delete(`/v1/exercises/${exerciseId}/favorite`);
   }
+  /**
+   * Get all muscle groups
+   *
+   * @example
+   * ```typescript
+   * const muscleGroups = await client.exercises.getMuscleGroups();
+   * ```
+   */
+  async getMuscleGroups() {
+    const response = await this.http.get("/v1/exercises/muscle-groups");
+    return response.data;
+  }
+  /**
+   * Get all exercise equipment
+   *
+   * @example
+   * ```typescript
+   * const equipment = await client.exercises.getEquipment();
+   * ```
+   */
+  async getEquipment() {
+    const response = await this.http.get("/v1/exercises/equipment");
+    return response.data;
+  }
 };
 
 // resources/workouts.ts
@@ -2109,6 +2133,9 @@ var GoalsResource = class {
    */
   async getNutritionProgress() {
     const response = await this.http.get("/v1/nutrition/progress/today");
+    if (this.config.autoConvertUnits) {
+      return this.convertNutritionProgressFromMetric(response.data);
+    }
     return response.data;
   }
   /**
@@ -2116,8 +2143,33 @@ var GoalsResource = class {
    */
   async getNutritionProgressByDate(date) {
     const response = await this.http.get(`/v1/nutrition/progress/date/${date}`);
+    if (this.config.autoConvertUnits) {
+      return this.convertNutritionProgressFromMetric(response.data);
+    }
     return response.data;
   }
+  /**
+   * Convert nutrition progress data from metric to user's preferred units
+   * Handles water values in the progress data
+   */
+  convertNutritionProgressFromMetric(data) {
+    if (!data || !data.progress) {
+      return data;
+    }
+    const converted = { ...data };
+    converted.progress = data.progress.map((nutrient) => {
+      if (nutrient.nutrientKey === "water" && this.config.measurementSystem === "imperial") {
+        return {
+          ...nutrient,
+          current: nutrient.current ? VolumeConverter.fromMetric(nutrient.current, this.config.measurementSystem) : nutrient.current,
+          target: nutrient.target ? VolumeConverter.fromMetric(nutrient.target, this.config.measurementSystem) : nutrient.target,
+          remaining: nutrient.remaining ? VolumeConverter.fromMetric(nutrient.remaining, this.config.measurementSystem) : nutrient.remaining
+        };
+      }
+      return nutrient;
+    });
+    return converted;
+  }
 };
 
 // resources/ai.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openlifelog/sdk",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "TypeScript SDK for the OpenLifeLog API - A comprehensive fitness and nutrition tracking platform",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/resources/exercises.ts

@@ -6,6 +6,8 @@ import type {
   ListExercisesParams,
   ListResponse,
   CountResponse,
+  MuscleGroupEntity,
+  ExerciseEquipmentEntity,
 } from '../types';
 import { createPaginatedIterator, type PaginatedIterator } from '../utils/pagination';
 
@@ -109,4 +111,30 @@ export class ExercisesResource {
   async removeFromFavorites(exerciseId: string): Promise<void> {
     await this.http.delete(`/v1/exercises/${exerciseId}/favorite`);
   }
+
+  /**
+   * Get all muscle groups
+   *
+   * @example
+   * ```typescript
+   * const muscleGroups = await client.exercises.getMuscleGroups();
+   * ```
+   */
+  async getMuscleGroups(): Promise<MuscleGroupEntity[]> {
+    const response = await this.http.get<MuscleGroupEntity[]>('/v1/exercises/muscle-groups');
+    return response.data;
+  }
+
+  /**
+   * Get all exercise equipment
+   *
+   * @example
+   * ```typescript
+   * const equipment = await client.exercises.getEquipment();
+   * ```
+   */
+  async getEquipment(): Promise<ExerciseEquipmentEntity[]> {
+    const response = await this.http.get<ExerciseEquipmentEntity[]>('/v1/exercises/equipment');
+    return response.data;
+  }
 }

package/resources/goals.ts

@@ -14,7 +14,7 @@ import type {
   ListNutritionGoalsHistoryParams,
   ListResponse,
 } from '../types';
-import { convertNutritionGoalsToMetric, convertNutritionGoalsFromMetric } from '../utils/units';
+import { convertNutritionGoalsToMetric, convertNutritionGoalsFromMetric, VolumeConverter } from '../utils/units';
 
 /**
  * Goals resource
@@ -177,6 +177,11 @@ export class GoalsResource {
    */
   async getNutritionProgress(): Promise<DailyNutritionProgress> {
     const response = await this.http.get<DailyNutritionProgress>('/v1/nutrition/progress/today');
+
+    if (this.config.autoConvertUnits) {
+      return this.convertNutritionProgressFromMetric(response.data);
+    }
+
     return response.data;
   }
 
@@ -185,6 +190,37 @@ export class GoalsResource {
    */
   async getNutritionProgressByDate(date: string): Promise<DailyNutritionProgress> {
     const response = await this.http.get<DailyNutritionProgress>(`/v1/nutrition/progress/date/${date}`);
+
+    if (this.config.autoConvertUnits) {
+      return this.convertNutritionProgressFromMetric(response.data);
+    }
+
     return response.data;
   }
+
+  /**
+   * Convert nutrition progress data from metric to user's preferred units
+   * Handles water values in the progress data
+   */
+  private convertNutritionProgressFromMetric(data: DailyNutritionProgress): DailyNutritionProgress {
+    if (!data || !data.progress) {
+      return data;
+    }
+
+    const converted = { ...data };
+    converted.progress = data.progress.map(nutrient => {
+      // Only convert water from ml to oz/fl oz for imperial users
+      if (nutrient.nutrientKey === 'water' && this.config.measurementSystem === 'imperial') {
+        return {
+          ...nutrient,
+          current: nutrient.current ? VolumeConverter.fromMetric(nutrient.current, this.config.measurementSystem) : nutrient.current,
+          target: nutrient.target ? VolumeConverter.fromMetric(nutrient.target, this.config.measurementSystem) : nutrient.target,
+          remaining: nutrient.remaining ? VolumeConverter.fromMetric(nutrient.remaining, this.config.measurementSystem) : nutrient.remaining,
+        };
+      }
+      return nutrient;
+    });
+
+    return converted;
+  }
 }

package/types/exercise.ts

@@ -13,6 +13,32 @@ import type {
  * Exercise types
  */
 
+/**
+ * Muscle group entity from database
+ */
+export interface MuscleGroupEntity {
+  id: UUID;
+  name: string;
+  medicalName?: string;
+  bodyPart?: string;
+  description?: string;
+  createdAt: DateTime;
+  deletedAt?: DateTime;
+}
+
+/**
+ * Exercise equipment entity from database
+ */
+export interface ExerciseEquipmentEntity {
+  id: UUID;
+  name: string;
+  category?: string;
+  description?: string;
+  isActive: boolean;
+  createdAt: DateTime;
+  deletedAt?: DateTime;
+}
+
 /**
  * Exercise capabilities
  */