Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

fix(mcp): sets_planned counts per-side sets in the same units as sets_done (#691)

David Jørgensen51322595ef3d
diff --git a/mcp/src/tools.js b/mcp/src/tools.js
index 4344aad14..f3badd6b2 100644
--- a/mcp/src/tools.js
+++ b/mcp/src/tools.js
@@ -7,7 +7,7 @@ import {
fmt, setLabel, exLine, muscleName, policyName, friendlyDuration, ratio, muscleOrder
} from './labels.js'
import {
- modeOf, workoutVolume, setsDone, effectiveRoutine, effectiveRoutineIds, lastEntryFor, workoutAt
+ modeOf, workoutVolume, setsDone, setUnitsTotal, effectiveRoutine, effectiveRoutineIds, lastEntryFor, workoutAt
} from '../../frontend/src/lib/history.js'
import { queueView, queueNext, pinState } from '../../frontend/src/lib/queue.js'
import { exOr, registerCustom } from '../../frontend/src/lib/exercises.js'
@@ -298,8 +298,8 @@ export const listWorkouts = {
routine_name: w.name || null,
exercise_count: (w.entries || []).length,
sets_done: setsDone(w),
- sets_planned: plannedSets(w),
- sets_ratio: ratio(setsDone(w), plannedSets(w)),
+ sets_planned: setUnitsTotal(w.entries),
+ sets_ratio: ratio(setsDone(w), setUnitsTotal(w.entries)),
volume: workoutVolume(w),
duration_ms: w.end && w.start ? (w.end - w.start) : null,
duration: w.end && w.start ? friendlyDuration(w.end - w.start) : null,
@@ -310,12 +310,6 @@ export const listWorkouts = {
}
}
-function plannedSets(w) {
- let n = 0
- ;(w.entries || []).forEach(e => { n += (e.sets || []).length })
- return n
-}
-
/** get_workout — full entry/set breakdown for one date. */
export const getWorkout = {
name: 'get_workout',
@@ -364,7 +358,7 @@ export const getWorkout = {
bodyweight_at_workout: w.bw || null,
volume: workoutVolume(w),
sets_done: setsDone(w),
- sets_planned: plannedSets(w),
+ sets_planned: setUnitsTotal(w.entries),
duration: w.end && w.start ? friendlyDuration(w.end - w.start) : null,
prs: (w.prs || []).map(id => {
const ex = exerciseOf(id, S)
diff --git a/mcp/test/tools.test.js b/mcp/test/tools.test.js
index ac4c69aa5..fe91fb88f 100644
--- a/mcp/test/tools.test.js
+++ b/mcp/test/tools.test.js
@@ -423,6 +423,27 @@ describe('list_workouts', () => {
})
})
+ // A unilateral set is one row carrying both sides, and setsDone() counts each side that was
+ // done, so the planned count has to count sides too — the app pairs it with setUnitsTotal().
+ // Counting rows read a fully done per-side session as twice the plan (#691).
+ test('a per-side session counts planned sets in the same units as done ones', () => {
+ const CURL = '0294'
+ const side = rDone => ({
+ w: 20, r: 16, done: rDone,
+ sides: { L: { w: 20, r: 8, done: true }, R: { w: 20, r: 8, done: rDone } }
+ })
+ S.workouts = [{
+ id: 'w1', d: '2026-07-06', start: Date.parse('2026-07-06T10:00:00'), end: Date.parse('2026-07-06T11:00:00'), name: 'S',
+ entries: [{ id: CURL, target: { sets: 3, reps: 8, weight: 20, perSide: true }, sets: [side(true), side(true), side(false)] }]
+ }]
+ _seedStateForTests(S)
+ const listed = call('list_workouts').workouts[0]
+ expect(listed.sets_done).toBe(5)
+ expect(listed.sets_planned).toBe(6)
+ expect(listed.sets_ratio).toBe('5/6')
+ expect(call('get_workout', { workout_id: 'w1' }).sets_planned).toBe(6)
+ })
+
test('date range filter narrows results (closed interval, both endpoints inclusive)', () => {
const all = call('list_workouts')
expect(all.workouts.length).toBeGreaterThan(2)