feat: Enhance exercise trend summary and set classification

- Refactor exercise trend summary to utilize `getWeeklyVolumeSetWeight` for set counting.
- Introduce new set type 'negative' in set type configuration with appropriate hypertrophy factor.
- Update CSV value parsers to recognize 'negative' and 'eccentric' set types.
- Modify clipboard export calculations to incorporate weekly volume for set counting.
- Adjust weekly sets dashboard to account for set weight factors in muscle contributions.
- Revise muscle analytics to apply weekly volume weight in muscle volume time series calculations.
- Improve hypertrophy score calculations by filtering out non-contributing sets based on weekly volume.
- Update muscle volume calculations to reflect weighted set contributions for full body and primary/secondary muscles.
- Refine rolling volume calculations to include set weight factors for daily muscle volumes.
- Enhance windowed exercise breakdown to utilize set weight for accurate contribution tracking.
- Adjust tier utility functions to reflect updated half-life values for achievement calculations.

Co-authored-by: Copilot <copilot@github.com>

Author: aree6

backend/src/lyfta.ts

@@ -164,6 +164,56 @@ export const lyfatGetWorkoutSummaries = async (
   return (await res.json()) as LyfatGetWorkoutSummaryResponse;
 };
 
+interface LyfatGetExerciseProgressResponse {
+  status: boolean;
+  weight_unit: string;
+  data: unknown[];
+}
+
+export const lyfatGetExerciseWeightUnit = async (
+  apiKey: string,
+  exerciseId: string | number,
+): Promise<string | null> => {
+  try {
+    const params = new URLSearchParams({
+      exercise_id: String(exerciseId),
+      duration: '1',
+    });
+    const res = await fetch(`${LYFTA_BASE_URL}/api/v1/exercises/progress?${params.toString()}`, {
+      method: 'GET',
+      headers: buildHeaders(apiKey),
+    });
+    if (!res.ok) return null;
+    const json = (await res.json()) as LyfatGetExerciseProgressResponse;
+    const unit = String(json.weight_unit ?? '').toLowerCase();
+    if (unit === 'kg' || unit === 'lb' || unit === 'lbs') return unit;
+    return null;
+  } catch {
+    return null;
+  }
+};
+
+export const lyfatGetExerciseWeightUnits = async (
+  apiKey: string,
+  exerciseIds: (string | number)[],
+): Promise<Map<string, string>> => {
+  const unitMap = new Map<string, string>();
+  const uniqueIds = [...new Set(exerciseIds.map(String))];
+
+  const results = await Promise.allSettled(
+    uniqueIds.map((id) => lyfatGetExerciseWeightUnit(apiKey, id)),
+  );
+
+  uniqueIds.forEach((id, i) => {
+    const result = results[i];
+    if (result.status === 'fulfilled' && result.value) {
+      unitMap.set(id, result.value);
+    }
+  });
+
+  return unitMap;
+};
+
 export const lyfatGetAllWorkoutSummaries = async (apiKey: string): Promise<LyfatGetWorkoutSummaryResponse['workouts']> => {
   const allSummaries: LyfatGetWorkoutSummaryResponse['workouts'] = [];
   let page = 1;

backend/src/mapLyfataWorkoutsToWorkoutSets.ts

@@ -36,23 +36,35 @@ const toNumber = (v: unknown, fallback = 0): number => {
   return Number.isFinite(n) ? n : fallback;
 };
 
-const normalizeSetType = (value: unknown): string => {
-  const s = String(value ?? '').toLowerCase();
+const LBS_TO_KG = 0.45359237;
 
-  if (s === '0') return 'normal';
-  if (s === '1') return 'warmup';
-  if (s === '2') return 'right';
-  if (s === '3') return 'left';
+const LYFTA_SET_TYPE_MAP: Record<string, string> = {
+  '0': 'normal',
+  '1': 'warmup',
+  '2': 'right',
+  '3': 'left',
+  '4': 'failure',
+  '5': 'dropset',
+  '6': 'negative',
+  '7': 'partial',
+  '8': 'myoreps',
+  '9': 'feederset',
+  '10': 'topset',
+  '11': 'backoff',
+};
 
-  return 'normal';
+const normalizeSetType = (value: unknown): string => {
+  const s = String(value ?? '');
+  return LYFTA_SET_TYPE_MAP[s] || 'normal';
 };
 
 export const mapLyfataWorkoutsToWorkoutSets = (
   workouts: LyfatGetWorkoutsResponse['workouts'],
-  summaries: LyfatGetWorkoutSummaryResponse['workouts'] = []
+  summaries: LyfatGetWorkoutSummaryResponse['workouts'] = [],
+  weightUnitMap: Map<string, string> = new Map(),
 ): WorkoutSetDTO[] => {
   const out: WorkoutSetDTO[] = [];
-  
+
   // Create a map of workout ID to duration for quick lookup
   const durationMap = new Map<number, number>();
   for (const summary of summaries) {
@@ -65,27 +77,34 @@ export const mapLyfataWorkoutsToWorkoutSets = (
   for (const w of workouts) {
     const title = String(w.title ?? 'Workout');
     const start_time = parseDate(w.workout_perform_date);
-    
+
     // Calculate end_time based on duration from summary data
     const durationMinutes = durationMap.get(w.id) ?? 0;
     let end_time = start_time;
-    
+
     if (durationMinutes > 0 && w.workout_perform_date) {
       const startDate = new Date(w.workout_perform_date);
       if (!isNaN(startDate.getTime())) {
         end_time = new Date(startDate.getTime() + durationMinutes * 60 * 1000).toISOString();
       }
     }
-    
+
     const description = '';
 
     for (const [exerciseIndex, ex] of (w.exercises ?? []).entries()) {
       const exercise_title = String(ex.excercise_name ?? '').trim();
       const exercise_notes = '';
       const superset_id = '';
+      const exerciseWeightUnit = weightUnitMap.get(String(ex.exercise_id));
 
       const setsForExercise = [...(ex.sets ?? [])].reverse();
       setsForExercise.forEach((s, setIdx) => {
+        let weight = toNumber(s.weight, 0);
+
+        if (weight > 0 && exerciseWeightUnit === 'lb') {
+          weight = weight * LBS_TO_KG;
+        }
+
         out.push({
           title,
           start_time,
@@ -97,7 +116,7 @@ export const mapLyfataWorkoutsToWorkoutSets = (
           exercise_notes,
           set_index: (ex.sets?.length ?? 1) - 1 - setIdx,
           set_type: normalizeSetType(s.set_type_id),
-          weight_kg: toNumber(s.weight, 0),
+          weight_kg: weight,
           reps: toNumber(s.reps, 0),
           distance_km: toNumber(s.distance, 0),
           duration_seconds: toNumber(s.duration, ex.exercise_rest_time ?? 0),

backend/src/routes/lyftaRoutes.ts

@@ -1,5 +1,5 @@
 import express from 'express';
-import { lyfatGetAllWorkouts, lyfatGetAllWorkoutSummaries, lyfatValidateApiKey } from '../lyfta';
+import { lyfatGetAllWorkouts, lyfatGetAllWorkoutSummaries, lyfatValidateApiKey, lyfatGetExerciseWeightUnits } from '../lyfta';
 import { mapLyfataWorkoutsToWorkoutSets } from '../mapLyfataWorkoutsToWorkoutSets';
 import { getClientIP, getCountryFromIP } from '../geoLocation';
 
@@ -44,7 +44,16 @@ export const createLyftaRouter = (opts: {
           lyfatGetAllWorkouts(apiKey),
           lyfatGetAllWorkoutSummaries(apiKey),
         ]);
-        const sets = mapLyfataWorkoutsToWorkoutSets(workouts, summaries);
+
+        const exerciseIds = new Set<string>();
+        for (const w of workouts) {
+          for (const ex of (w.exercises ?? [])) {
+            exerciseIds.add(String(ex.exercise_id));
+          }
+        }
+
+        const weightUnitMap = await lyfatGetExerciseWeightUnits(apiKey, [...exerciseIds]);
+        const sets = mapLyfataWorkoutsToWorkoutSets(workouts, summaries, weightUnitMap);
         return { workouts, sets };
       });
 

frontend/app/startup/startupAutoLoadHevy.ts

@@ -9,7 +9,6 @@ import {
 import { identifyPersonalRecords } from '../../utils/analysis/core';
 import {
   clearHevyAuthToken,
-  clearHevyProApiKey,
   clearHevyRefreshToken,
   getHevyRefreshToken,
   saveHevyAuthToken,
@@ -19,6 +18,7 @@ import {
   saveSetupComplete,
 } from '../../utils/storage/dataSourceStorage';
 import {
+  clearHevyProApiKey,
   getHevyPassword,
   getHevyUsernameOrEmail,
   saveHevyPassword,

frontend/app/startup/startupAutoLoadLyfta.ts

@@ -1,7 +1,8 @@
 import { WorkoutSet } from '../../types';
 import { lyfatBackendGetSets } from '../../utils/api/lyfataBackend';
 import { identifyPersonalRecords } from '../../utils/analysis/core';
-import { clearLyfataApiKey, saveSetupComplete } from '../../utils/storage/dataSourceStorage';
+import { saveSetupComplete } from '../../utils/storage/dataSourceStorage';
+import { clearLyftaApiKey } from '../../utils/storage/hevyCredentialsStorage';
 import { hydrateBackendWorkoutSetsWithSource } from '../auth/hydrateBackendWorkoutSets';
 import { getLyfatErrorMessage } from '../ui/appErrorMessages';
 import type { StartupAutoLoadParams } from './startupAutoLoadTypes';
@@ -42,7 +43,7 @@ export const loadLyftaFromApiKey = (
       deps.setCsvImportError(null);
     })
     .catch((err) => {
-      clearLyfataApiKey();
+      clearLyftaApiKey();
       if (shouldResetOnError) {
         saveSetupComplete(false);
         deps.setLyfatLoginError(getLyfatErrorMessage(err));

frontend/app/startup/useStartupAutoLoad.ts

@@ -5,15 +5,17 @@ import {
   getCombinedDataSources,
   getDataSourceChoice,
   getHevyAuthToken,
-  getHevyProApiKey,
   getLastCsvPlatform,
   getLastLoginMethod,
-  getLyfataApiKey,
   getSetupComplete,
   saveSetupComplete,
   type DataSourceChoice,
   type LoginMethod,
 } from '../../utils/storage/dataSourceStorage';
+import {
+  getHevyProApiKey,
+  getLyftaApiKey,
+} from '../../utils/storage/hevyCredentialsStorage';
 import { getHevyUsernameOrEmail, getHevyPassword } from '../../utils/storage/hevyCredentialsStorage';
 
 import { loadCsvAuto } from './startupAutoLoadCsv';
@@ -62,7 +64,7 @@ export const useStartupAutoLoad = (params: StartupAutoLoadParams): void => {
       storedChoice,
       hasHevyToken: Boolean(getHevyAuthToken()),
       hasHevyProApiKey: Boolean(getHevyProApiKey()),
-      hasLyftaApiKey: Boolean(getLyfataApiKey()),
+      hasLyftaApiKey: Boolean(getLyftaApiKey()),
       hasCsvData: Boolean(getCSVData()),
     });
 
@@ -106,7 +108,7 @@ export const useStartupAutoLoad = (params: StartupAutoLoadParams): void => {
 
       // Platform: Lyfta
       if (platform === 'lyfta') {
-        const lyftaApiKey = getLyfataApiKey();
+        const lyftaApiKey = getLyftaApiKey();
 
         // Try API key first (preferred for power users)
         if ((method === 'apiKey' || !method) && lyftaApiKey) {

frontend/app/state/clearCacheAndRestart.ts

@@ -12,21 +12,23 @@ import {
 import {
   clearDataSourceChoice,
   clearHevyAuthToken,
-  clearHevyProApiKey,
   clearLastCsvPlatform,
   clearLastLoginMethod,
-  clearLyfataApiKey,
   clearCombinedDataSources,
   clearSetupComplete,
 } from '../../utils/storage/dataSourceStorage';
+import {
+  clearHevyProApiKey,
+  clearLyftaApiKey,
+} from '../../utils/storage/hevyCredentialsStorage';
 
 export const clearCacheAndRestart = (): void => {
   trackEvent('cache_clear', {});
   resetUser();
   clearCSVData();
   clearHevyAuthToken();
   clearHevyProApiKey();
-  clearLyfataApiKey();
+  clearLyftaApiKey();
   clearDataSourceChoice();
   clearLastCsvPlatform();
   clearLastLoginMethod();

frontend/components/app/OnboardingLoginSteps.tsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import type { OnboardingFlow } from '../../app/onboarding/types';
 import { HevyLoginModal } from '../modals/auth/HevyLoginModal';
-import { LyfataLoginModal } from '../modals/auth/LyfataLoginModal';
-import { getHevyAuthToken, getHevyProApiKey, getLyfataApiKey } from '../../utils/storage/dataSourceStorage';
+import { LyftaLoginModal } from '../modals/auth/LyftaLoginModal';
+import { getHevyAuthToken } from '../../utils/storage/dataSourceStorage';
+import { getHevyProApiKey, getLyftaApiKey } from '../../utils/storage/hevyCredentialsStorage';
 import { getPreferencesConfirmed } from '../../utils/storage/localStorage';
 
 interface HevyLoginStepProps {
@@ -76,13 +77,13 @@ export const LyftaLoginStep: React.FC<LyftaLoginStepProps> = ({
   onOpenAddSourcePicker,
   backToCombinePicker = false,
 }) => (
-  <LyfataLoginModal
+  <LyftaLoginModal
     intent={intent}
     errorMessage={lyfatLoginError}
     isLoading={isAnalyzing}
     onLogin={onLyfatLogin}
     loginLabel={intent === 'initial' ? 'Continue' : 'Login with Lyfta'}
-    hasSavedSession={Boolean(getLyfataApiKey()) && getPreferencesConfirmed()}
+    hasSavedSession={Boolean(getLyftaApiKey()) && getPreferencesConfirmed()}
     onSyncSaved={onLyfatSyncSaved}
     onClearCache={onClearCacheAndRestart}
     onImportCsv={() => onSetOnboarding({ intent, step: 'lyfta_csv', platform: 'lyfta', backStep: 'lyfta_login' })}

frontend/components/dashboard/hypertrophy/HypertrophyBarCard.tsx

@@ -67,6 +67,7 @@ const FactorProgressBar: React.FC<{
 
 interface HypertrophyBarCardProps {
   hypertrophyData: MuscleHypertrophyData[];
+  hypertrophyData30d?: MuscleHypertrophyData[];
   selectedMuscleId?: string | null;
   onMuscleClick?: (muscleId: string) => void;
   hypertrophyPeriod: '7d' | '30d';
@@ -93,6 +94,7 @@ const HypertrophySortSelect: React.FC<{
 
 export const HypertrophyBarCard: React.FC<HypertrophyBarCardProps> = ({
   hypertrophyData,
+  hypertrophyData30d,
   selectedMuscleId,
   onMuscleClick,
   hypertrophyPeriod,
@@ -106,6 +108,15 @@ export const HypertrophyBarCard: React.FC<HypertrophyBarCardProps> = ({
     return { avgScore, bestMuscle: hypertrophyData[0], count: hypertrophyData.length };
   }, [hypertrophyData]);
 
+  const prevPositionMap = useMemo(() => {
+    if (!hypertrophyData30d || hypertrophyPeriod !== '7d') return null;
+    const map = new Map<string, number>();
+    hypertrophyData30d.forEach((m, idx) => {
+      map.set(m.muscleId, idx + 1);
+    });
+    return map;
+  }, [hypertrophyData30d, hypertrophyPeriod]);
+
   const handleMouseEnter = (e: React.MouseEvent, m: MuscleHypertrophyData) => {
     const raw = m.score.raw;
     const volW = Math.round(m.score.volumeScore * FACTOR_WEIGHTS.volumeScore);
@@ -199,9 +210,14 @@ export const HypertrophyBarCard: React.FC<HypertrophyBarCardProps> = ({
                 </div>
               ))}
             </div>
-            {hypertrophyData.map((m) => {
+            {hypertrophyData.map((m, idx) => {
               const isSelected = m.muscleId === selectedMuscleId;
               const rating = getScoreRating(m.score.totalScore);
+              const currentPos = idx + 1;
+              const prevPos = prevPositionMap?.get(m.muscleId);
+              const movedUp = prevPos !== undefined && currentPos < prevPos;
+              const movedDown = prevPos !== undefined && currentPos > prevPos;
+              const isNew = prevPos === undefined;
               return (
                 <div key={m.muscleId}
                   className="flex items-center gap-2 rounded px-1 py-0.5 -mx-1 group relative cursor-pointer"
@@ -217,10 +233,21 @@ export const HypertrophyBarCard: React.FC<HypertrophyBarCardProps> = ({
                   <span className={`text-[10px] font-semibold w-[10%] text-right flex-shrink-0 ${isSelected ? 'text-white' : 'text-slate-500'}`}>
                     {m.score.totalScore}%
                   </span>
-                  <span className="text-[9px] flex items-center gap-1 w-[20%] lg:w-[12%] flex-shrink-0" style={{ color: rating.color }}>
-                    <span className="truncate">{rating.label}</span>
-                    <TrendingUp className="w-3 h-3" />
-                  </span>
+                  {prevPositionMap ? (
+                    <span
+                      className="text-[9px] flex items-center gap-0.5 w-[15%] lg:w-[12%] flex-shrink-0"
+                      style={{ color: isNew || movedUp ? '#22c55e' : movedDown ? '#ef4444' : '#3b82f6' }}
+                      title={isNew ? 'NEW' : movedUp ? `↑ from #${prevPos}` : movedDown ? `↓ from #${prevPos}` : `= #${currentPos}`}
+                    >
+                      <span className="font-bold">{isNew || movedUp ? '↑' : movedDown ? '↓' : '='}</span>
+                      <span>{isNew ? 'NEW' : (movedUp || movedDown) ? `#${prevPos} → #${currentPos}` : `#${currentPos}`}</span>
+                    </span>
+                  ) : (
+                    <span className="text-[9px] flex items-center gap-1 w-[15%] lg:w-[12%] flex-shrink-0" style={{ color: rating.color }}>
+                      <span className="truncate">{rating.label}</span>
+                      <TrendingUp className="w-3 h-3" />
+                    </span>
+                  )}
                 </div>
               );
             })}

frontend/components/dashboard/hypertrophy/HypertrophyScatterCard.tsx

@@ -147,15 +147,15 @@ export const HypertrophyScatterCard: React.FC<HypertrophyScatterCardProps> = ({
           <>
             <ResponsiveContainer width="100%" height="100%">
               <ReScatterChart margin={{ top: 28, right: 8, bottom: 28, left: 0 }}>
-                <XAxis type="number" dataKey="progress" domain={[0, 50]}
+                <XAxis type="number" dataKey="volume" domain={[0, 50]}
                   tick={{ fill: '#94a3b8', fontSize: 9 }} tickLine={false} axisLine={{ stroke: '#475569' }}
-                  label={{ value: 'Progress', position: 'bottom', offset: 5, fill: '#94a3b8', fontSize: 10, fontWeight: 600 }} />
-                <YAxis type="number" dataKey="volume" domain={[0, 50]}
+                  label={{ value: 'Volume', position: 'bottom', offset: 5, fill: '#94a3b8', fontSize: 10, fontWeight: 600 }} />
+                <YAxis type="number" dataKey="progress" domain={[0, 50]}
                   tick={{ fill: '#94a3b8', fontSize: 9 }} tickLine={false} axisLine={{ stroke: '#475569' }} width={28}
-                  label={{ value: 'Volume', angle: 0, position: 'insideTop', offset: -18, dx: +12, fill: '#94a3b8', fontSize: 10, fontWeight: 600 }} />
+                  label={{ value: 'Progress', angle: 0, position: 'insideTop', offset: -18, dx: +12, fill: '#94a3b8', fontSize: 10, fontWeight: 600 }} />
 
-                <ReferenceLine x={PROGRESS_MID} stroke="#475569" strokeDasharray="4 4" strokeWidth={1} />
-                <ReferenceLine y={VOLUME_MID} stroke="#475569" strokeDasharray="4 4" strokeWidth={1} />
+                <ReferenceLine x={VOLUME_MID} stroke="#475569" strokeDasharray="4 4" strokeWidth={1} />
+                <ReferenceLine y={PROGRESS_MID} stroke="#475569" strokeDasharray="4 4" strokeWidth={1} />
 
                 <RechartsTooltip content={<CustomScatterTooltip />} />