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.

Workout: an exercise's ⋯ menu keeps today's session of it out of progression, with a marker and an undo on the card (Discord)

Duarte Santos792f0fb47f42
diff --git a/frontend/src/index.css b/frontend/src/index.css
index cdf223e75..4cca84839 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1022,6 +1022,10 @@ body.chips-dragging *{cursor:inherit}
}
.progline.warn{color:var(--yellow)}
.progline svg{flex:none;margin-top:2px}
+/* an exercise kept out of progression for this session, with its undo */
+.noprog{display:flex;align-items:center;gap:7px;margin:0 0 6px;font-size:13px;line-height:1.38;color:var(--orange)}
+.noprog svg{flex:none}
+.noprog .chip{margin-left:auto;padding:3px 11px;font-size:13px;color:var(--orange);background:color-mix(in srgb,var(--orange) 14%,transparent)}
/* start a timed set (issue #16) — sits where you'd otherwise reach for the checkbox */
.setrow .setgo{
diff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.js
index 2d5b88ab8..09b676314 100644
--- a/frontend/src/lib/pt-br-locale.test.js
+++ b/frontend/src/lib/pt-br-locale.test.js
@@ -28,10 +28,10 @@ describe('Brazilian Portuguese locale', () => {
const fingerprint = createHash('sha256').update(JSON.stringify(inherited)).digest('hex')
expect(Object.keys(PT_BR_OVERRIDES)).toHaveLength(679)
- expect(inherited).toHaveLength(675)
+ expect(inherited).toHaveLength(678)
// If this fails, review the changed keys and wording before accepting a new hash. From
// frontend/: node scripts/pt-br-inheritance-fingerprint.mjs --list
- expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('ef2572fbca0fee789c583658d22f6fe518a2aacd0f7c639acf6a26083b039385')
+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('452435ba59c6b477a6d6ff3eead25b7d3355d40dd5e29d7fbfca16debaf37015')
})
test('does not leak European Portuguese UI terms', () => {
diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.js
index 02f2951f9..6fcfe45c4 100644
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@ -1208,6 +1208,9 @@ export default {
'Add note': 'Notiz hinzufügen',
'Edit note': 'Notiz bearbeiten',
'Progression settings': 'Progressions-Einstellungen',
+ 'Don’t count for progression': 'Nicht für die Progression zählen',
+ 'This exercise, this session only': 'Nur diese Übung, nur in dieser Einheit',
+ 'Not counted for progression': 'Zählt nicht für die Progression',
'Set {0}': 'Satz {0}',
'Drop set': 'Drop-Satz',
'Rest-pause burst': 'Rest-Pause-Burst',
diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.js
index 0f55749a4..c1a62d3af 100644
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Añadir nota',
'Edit note': 'Editar nota',
'Progression settings': 'Ajustes de progresión',
+ 'Don’t count for progression': 'No contar para la progresión',
+ 'This exercise, this session only': 'Solo este ejercicio, solo en esta sesión',
+ 'Not counted for progression': 'No cuenta para la progresión',
'Set {0}': 'Serie {0}',
'Drop set': 'Serie descendente',
'Rest-pause burst': 'Ráfaga rest-pause',
diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.js
index 38e699557..30e769d70 100644
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Ajouter une note',
'Edit note': 'Modifier la note',
'Progression settings': 'Réglages de progression',
+ 'Don’t count for progression': 'Ne pas compter pour la progression',
+ 'This exercise, this session only': 'Seulement cet exercice, seulement pour cette séance',
+ 'Not counted for progression': 'Ne compte pas pour la progression',
'Set {0}': 'Série {0}',
'Drop set': 'Série dégressive',
'Rest-pause burst': 'Rafale rest-pause',
diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.js
index e6f48515b..5b984d1a5 100644
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'नोट जोड़ें',
'Edit note': 'नोट संपादित करें',
'Progression settings': 'प्रगति सेटिंग',
+ 'Don’t count for progression': 'प्रोग्रेशन में न गिनें',
+ 'This exercise, this session only': 'सिर्फ़ यह व्यायाम, सिर्फ़ इस सत्र में',
+ 'Not counted for progression': 'प्रोग्रेशन में नहीं गिना जाएगा',
'Set {0}': 'सेट {0}',
'Drop set': 'ड्रॉप सेट',
'Rest-pause burst': 'रेस्ट-पॉज़ बर्स्ट',
diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.js
index fc0a98607..a2beb1bb4 100644
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@ -1191,6 +1191,9 @@ export default {
'Add note': 'Jegyzet hozzáadása',
'Edit note': 'Jegyzet szerkesztése',
'Progression settings': 'Progresszió beállításai',
+ 'Don’t count for progression': 'Ne számítson bele a progresszióba',
+ 'This exercise, this session only': 'Csak ez a gyakorlat, csak ezen az edzésen',
+ 'Not counted for progression': 'Nem számít bele a progresszióba',
'Set {0}': '{0}. sorozat',
'Drop set': 'Drop szett',
'Rest-pause burst': 'Rest-pause sorozat',
diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.js
index 77eda1f16..e52480d67 100644
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Aggiungi nota',
'Edit note': 'Modifica nota',
'Progression settings': 'Impostazioni di progressione',
+ 'Don’t count for progression': 'Non contare per la progressione',
+ 'This exercise, this session only': 'Solo questo esercizio, solo in questa sessione',
+ 'Not counted for progression': 'Non conta per la progressione',
'Set {0}': 'Serie {0}',
'Drop set': 'Drop set',
'Rest-pause burst': 'Raffica rest-pause',
diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.js
index 51e1035a0..07e3053b7 100644
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': '메모 추가',
'Edit note': '메모 편집',
'Progression settings': '진행 설정',
+ 'Don’t count for progression': '점진적 증가에 반영하지 않기',
+ 'This exercise, this session only': '이 운동만, 이번 세션에만',
+ 'Not counted for progression': '점진적 증가에 반영되지 않음',
'Set {0}': '{0}세트',
'Drop set': '드롭 세트',
'Rest-pause burst': '레스트 포즈',
diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.js
index 25c7ff02b..6b5c00184 100644
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Dodaj notatkę',
'Edit note': 'Edytuj notatkę',
'Progression settings': 'Ustawienia progresji',
+ 'Don’t count for progression': 'Nie wliczaj do progresji',
+ 'This exercise, this session only': 'Tylko to ćwiczenie, tylko w tej sesji',
+ 'Not counted for progression': 'Nie wlicza się do progresji',
'Set {0}': 'Seria {0}',
'Drop set': 'Drop set',
'Rest-pause burst': 'Seria rest-pause',
diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.js
index 720d79539..704aea13d 100644
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Adicionar nota',
'Edit note': 'Editar nota',
'Progression settings': 'Definições de progressão',
+ 'Don’t count for progression': 'Não contar para a progressão',
+ 'This exercise, this session only': 'Só este exercício, só nesta sessão',
+ 'Not counted for progression': 'Não conta para a progressão',
'Set {0}': 'Série {0}',
'Drop set': 'Drop set',
'Rest-pause burst': 'Rajada rest-pause',
diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.js
index 948236749..8fd5fe98e 100644
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Добавить заметку',
'Edit note': 'Изменить заметку',
'Progression settings': 'Настройки прогрессии',
+ 'Don’t count for progression': 'Не учитывать в прогрессии',
+ 'This exercise, this session only': 'Только это упражнение и только в этой тренировке',
+ 'Not counted for progression': 'Не учитывается в прогрессии',
'Set {0}': 'Подход {0}',
'Drop set': 'Дроп-сет',
'Rest-pause burst': 'Отдых-пауза',
diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.js
index 35248e0eb..443110b97 100644
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@ -1199,6 +1199,9 @@ export default {
'Add note': 'เพิ่มโน้ต',
'Edit note': 'แก้ไขโน้ต',
'Progression settings': 'ตั้งค่าการเพิ่มน้ำหนัก',
+ 'Don’t count for progression': 'ไม่นับรวมในการเพิ่มระดับ',
+ 'This exercise, this session only': 'เฉพาะท่านี้ และเฉพาะรอบนี้เท่านั้น',
+ 'Not counted for progression': 'ไม่ถูกนับรวมในการเพิ่มระดับ',
'Set {0}': 'เซ็ต {0}',
'Drop set': 'ดรอปเซ็ต',
'Rest-pause burst': 'เรสต์พอส',
diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.js
index 4e2360817..2514ec33a 100644
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': 'Not ekle',
'Edit note': 'Notu düzenle',
'Progression settings': 'İlerleme ayarları',
+ 'Don’t count for progression': 'İlerlemeye sayma',
+ 'This exercise, this session only': 'Yalnızca bu egzersiz, yalnızca bu seansta',
+ 'Not counted for progression': 'İlerlemeye sayılmaz',
'Set {0}': 'Set {0}',
'Drop set': 'Drop set',
'Rest-pause burst': 'Rest-pause patlaması',
diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.js
index df98a9896..7fbe94fe8 100644
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@ -1188,6 +1188,9 @@ export default {
'Add note': '添加备注',
'Edit note': '编辑备注',
'Progression settings': '渐进设置',
+ 'Don’t count for progression': '不计入进阶',
+ 'This exercise, this session only': '仅限此动作,仅限本次训练',
+ 'Not counted for progression': '未计入进阶',
'Set {0}': '第 {0} 组',
'Drop set': '递减组',
'Rest-pause burst': '休息暂停组',
diff --git a/frontend/src/views/Workout.jsx b/frontend/src/views/Workout.jsx
index 228a11c1e..d3a810596 100644
--- a/frontend/src/views/Workout.jsx
+++ b/frontend/src/views/Workout.jsx
@@ -76,7 +76,7 @@ function Elapsed({ start }) {
// "last time" recap and the progression line — leaving the name, the ⋯ menu, the one-line plan
// the rows are measured against, and the sets.
// Nothing dropped is lost: it is all still on the ⋯ menu, or one ⋮ switch back to list/cards.
-function ExerciseBlock({ entryIdx, compact, dense, onToggle, onToggleSide, onField, onAddSet, onRemoveSet, onAddWarmup, onRemoveSetAt, onStartTimed, onPairPrev, onPairNext, onSetRowRef, onProgressionSettings, onSwap, onMoveUp, onMoveDown, canMoveUp, canMoveDown, onRemoveExercise, busy }) {
+function ExerciseBlock({ entryIdx, compact, dense, onToggle, onToggleSide, onField, onAddSet, onRemoveSet, onAddWarmup, onRemoveSetAt, onStartTimed, onPairPrev, onPairNext, onSetRowRef, onProgressionSettings, onNoProg, onSwap, onMoveUp, onMoveDown, canMoveUp, canMoveDown, onRemoveExercise, busy }) {
const S = useStore(s => s.S)
const update = useStore(s => s.update)
const working = useUI(s => s.work)
@@ -246,6 +246,7 @@ function ExerciseBlock({ entryIdx, compact, dense, onToggle, onToggleSide, onFie
{ icon: 'info', label: t('Details'), onClick: () => exerciseDetailSheet(ex) },
{ icon: 'history', label: t('History'), sub: last ? t('Last time') + ' ' + fmtDate(last.d) : undefined, onClick: () => exerciseHistorySheet(entry.id) },
onProgressionSettings && { icon: 'chartLine', label: t('Progression settings'), sub: guidance ? t(guidance.policyLabel) : undefined, onClick: onProgressionSettings },
+ onNoProg && { icon: 'pause', label: t('Don’t count for progression'), sub: t('This exercise, this session only'), on: entry.noProg === true, onClick: () => onNoProg(entry.noProg !== true) },
barInfo && { icon: 'barbell', label: t('Bar weight'), sub: barInfo.text, onClick: () => barWeightSheet(entry.id) },
{ icon: 'flame', label: t('Add warm-up set'), onClick: onAddWarmup },
onPairPrev && { icon: 'link', label: t('Make superset with previous'), onClick: onPairPrev },
@@ -400,6 +401,13 @@ function ExerciseBlock({ entryIdx, compact, dense, onToggle, onToggleSide, onFie
<button className="iconbtn" aria-label={t('More')} title={t('More')} onClick={openMore}><Icon name="more" /></button>
</div>
</div>
+ {/* Kept out of progression: by hand for this session (the ⋯ menu, with its undo right here),
+ or by a deload or rehab routine, which owns that choice and offers no undo. On in every
+ view, compact included: it changes what the next session is built from. */}
+ {entry.noProg === true && <div className="noprog">
+ <Icon name="pause" /><span>{t('Not counted for progression')}</span>
+ {onNoProg && <button type="button" className="chip" onClick={() => onNoProg(false)}>{t('Undo')}</button>}
+ </div>}
{/* compact view keeps the plan line: it is what the rows are measured against */}
{dense && planLine}
{wc.pairButtons && !compact && !dense && (onPairPrev || onPairNext) && <div className="row" style={{ gap: 6, flexWrap: 'wrap', marginBottom: 8 }}>
@@ -717,6 +725,20 @@ function ActiveWorkout() {
const moveCurrentUnit = direction => moveUnitAt(cur, direction)
+ // "Don't count for progression" from an exercise's ⋯ menu (Discord, asierlama: an injury day).
+ // It stamps the entry's `noProg`, the flag a deload routine freezes onto its entries: the saved
+ // workout keeps it (finish-workout.js), and the next prescription and "last time" read past
+ // this entry (history.js entryExcluded). This exercise, this session; the routine is untouched.
+ const setNoProg = (idx, on) => update(s => {
+ const e = s.active?.entries?.[idx]
+ if (!e) return
+ if (on) e.noProg = true
+ else delete e.noProg
+ })
+ // A deload or rehab routine keeps its own exercises out (RoutineEdit). That is the routine's
+ // setting, so its entries get the marker but no switch.
+ const routineKeepsOut = e => !!e?.rid && S.routines.some(r => r.id === e.rid && r.excludeFromProgression === true)
+
// One prop object per entry so the card and list layouts share the exact same wiring. The
// exercise-level actions (swap, move, remove) address the entry itself, so the "more" menu of
// a superset member acts on that member, not on whatever the marker happens to point at.
@@ -737,6 +759,7 @@ function ActiveWorkout() {
onRemoveSetAt: i => removeSetAt(idx, i),
onStartTimed: i => startTimed(idx, i),
onProgressionSettings: () => openProgressionSettings(idx),
+ onNoProg: routineKeepsOut(A.entries[idx]) ? null : on => setNoProg(idx, on),
})
const navigateUnit = direction => {
const targetFor = active => {
@@ -1165,12 +1188,13 @@ function ActiveWorkout() {
// freestyle session has no `rid` to inherit. It inherits the block's `noProg` too: an
// exercise added to a rehab or deload routine's block is kept out of progression like the
// rest of it, the way a swap or an edit there is — it takes the routine's own numbers and
- // never becomes the baseline the regular sessions progress from.
+ // never becomes the baseline the regular sessions progress from. An exercise kept out by
+ // hand (its ⋯ menu) is that exercise's own choice for today and is not passed on.
const curEntry = A.entries[A.cur]
const curRid = curEntry?.rid
const routine = curRid ? S.routines.find(r => r.id === curRid) : null
const freestyle = !routine
- const noProg = !freestyle && curEntry?.noProg === true
+ const noProg = !freestyle && curEntry?.noProg === true && routine.excludeFromProgression === true
// Freestyle has no routine prescription to apply: show the last target in the config
// sheet and carry its completed rows forward. A planned session uses its configured
// target when progression is off, while progression-enabled sessions keep their path.
diff --git a/frontend/src/views/Workout.noprog.test.jsx b/frontend/src/views/Workout.noprog.test.jsx
new file mode 100644
index 000000000..72ed578ba
--- /dev/null
+++ b/frontend/src/views/Workout.noprog.test.jsx
@@ -0,0 +1,150 @@
+// @vitest-environment happy-dom
+// "Don't count for progression" from an exercise's ⋯ menu (Discord, asierlama: an injury day),
+// against the real store, sheets and progression engine: the toggle, the marker and its undo,
+// and what the next session is then built from.
+import React, { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { MemoryRouter } from 'react-router-dom'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import Workout from './Workout.jsx'
+import { DEF, useStore } from '../store/useStore.js'
+import { useUI } from '../store/useUI.js'
+import { buildCompletedWorkout } from '../lib/finish-workout.js'
+import { nextPrescription } from '../lib/progression.js'
+import { lastEntryFor } from '../lib/history.js'
+
+vi.mock('../lib/sound.js', () => ({ beep: vi.fn(), chime: vi.fn(), vibrate: vi.fn(), unlock: vi.fn() }))
+vi.mock('../lib/api.js', () => ({ api: vi.fn(() => Promise.resolve({})), appBase: () => '/' }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+const clone = value => JSON.parse(JSON.stringify(value))
+const BENCH = '0025'
+const ROW = '0027'
+const routines = [
+ { id: 'main', name: 'Main', ex: [{ id: BENCH, sets: 1, reps: 5, weight: 100 }] },
+ { id: 'deload', name: 'Deload', excludeFromProgression: true, ex: [{ id: ROW, sets: 1, reps: 8, weight: 40 }] },
+]
+const history = [{
+ id: 'w1', d: '2026-09-20', routineIds: ['main'],
+ entries: [{ id: BENCH, rid: 'main', target: { sets: 1, reps: 5, weight: 100 }, sets: [{ w: 100, r: 5, done: true }] }],
+}]
+const entry = (id, rid, w, extra = {}) => ({ id, rid, target: { sets: 1, reps: 5, weight: w }, sets: [{ w, r: 5, done: false }], ...extra })
+
+let root
+let container
+let sheetRoot
+let sheetContainer
+
+function renderWorkout(entries) {
+ const S = clone(DEF)
+ S.routines = clone(routines)
+ S.workouts = clone(history)
+ S.active = { id: 'noprog-test', d: '2026-09-23', start: Date.now(), routineIds: ['main'], routineId: 'main', name: 'Main', bw: null, cur: 0, entries }
+ useStore.setState({ S, user: null })
+ container = document.createElement('div')
+ document.body.appendChild(container)
+ root = createRoot(container)
+ act(() => root.render(<MemoryRouter><Workout /></MemoryRouter>))
+}
+
+function renderTopSheet() {
+ if (sheetRoot) act(() => sheetRoot.unmount())
+ if (sheetContainer) sheetContainer.remove()
+ const sheet = useUI.getState().sheets.at(-1)
+ expect(sheet).toBeTruthy()
+ sheetContainer = document.createElement('div')
+ document.body.appendChild(sheetContainer)
+ sheetRoot = createRoot(sheetContainer)
+ act(() => sheetRoot.render(sheet.render(() => useUI.getState().closeSheet(sheet.id))))
+ return sheetContainer
+}
+
+const openMenu = () => {
+ const more = container.querySelector('button[aria-label="More"]')
+ expect(more).toBeTruthy()
+ act(() => more.click())
+ return renderTopSheet()
+}
+const menuItem = (menu, label) => [...menu.querySelectorAll('.menu-item')].find(it => it.querySelector('.tt')?.textContent === label)
+const marker = () => container.querySelector('.noprog')
+const active = () => useStore.getState().S.active
+
+beforeEach(() => {
+ vi.useFakeTimers()
+ localStorage.clear()
+ useUI.setState({ sheets: [], toastMsg: '', timer: null, work: null })
+ root = null; container = null; sheetRoot = null; sheetContainer = null
+})
+
+afterEach(() => {
+ if (sheetRoot) act(() => sheetRoot.unmount())
+ if (sheetContainer) sheetContainer.remove()
+ if (root) act(() => root.unmount())
+ if (container) container.remove()
+ useUI.getState().stopRest()
+ vi.clearAllTimers()
+ vi.useRealTimers()
+})
+
+describe('don’t count this session for progression', () => {
+ it('the ⋯ menu stamps the entry, the card says so, and Undo takes it back', () => {
+ renderWorkout([entry(BENCH, 'main', 80)])
+ expect(marker()).toBeNull()
+
+ const menu = openMenu()
+ const item = menuItem(menu, 'Don’t count for progression')
+ expect(item).toBeTruthy()
+ expect(item.querySelector('.ss').textContent).toBe('This exercise, this session only')
+ expect(item.querySelector('.menu-on.is-on')).toBeNull()
+ act(() => item.click())
+
+ expect(active().entries[0].noProg).toBe(true)
+ expect(marker().textContent).toContain('Not counted for progression')
+ // the routine is not touched
+ expect(useStore.getState().S.routines.find(r => r.id === 'main').excludeFromProgression).toBeUndefined()
+
+ const undo = [...marker().querySelectorAll('button')].find(b => b.textContent === 'Undo')
+ act(() => undo.click())
+ expect(active().entries[0].noProg).toBeUndefined()
+ expect(marker()).toBeNull()
+ })
+
+ it('the menu item is a switch: it shows it is on, and a second tap turns it off', () => {
+ renderWorkout([entry(BENCH, 'main', 80, { noProg: true })])
+ const item = menuItem(openMenu(), 'Don’t count for progression')
+ expect(item.querySelector('.menu-on.is-on')).toBeTruthy()
+ act(() => item.click())
+ expect(active().entries[0].noProg).toBeUndefined()
+ })
+
+ it('only that exercise: the others in the session still count', () => {
+ renderWorkout([entry(BENCH, 'main', 80), entry(ROW, 'main', 50)])
+ const item = menuItem(openMenu(), 'Don’t count for progression')
+ act(() => item.click())
+ expect(active().entries.map(e => e.noProg === true)).toEqual([true, false])
+ })
+
+ it('the saved workout keeps it, and the next session progresses from the last one that counted', () => {
+ renderWorkout([entry(BENCH, 'main', 80)])
+ const item = menuItem(openMenu(), 'Don’t count for progression')
+ act(() => item.click())
+ useStore.getState().update(s => { s.active.entries[0].sets[0].done = true })
+
+ const saved = buildCompletedWorkout(active(), { end: Date.now() })
+ expect(saved.entries[0].noProg).toBe(true)
+
+ const S = { ...useStore.getState().S, active: null, workouts: [...history, saved] }
+ const cfg = routines[0].ex[0]
+ const plan = nextPrescription(S, cfg, routines[0])
+ // 100 × 5 on the 20th was the last session that counted, not today's 80
+ expect(plan.weight).toBe(102.5)
+ expect(lastEntryFor(S, BENCH, 'main').d).toBe('2026-09-20')
+ })
+
+ it('a deload routine’s exercise shows the marker but offers neither the switch nor an undo', () => {
+ renderWorkout([entry(ROW, 'deload', 40, { noProg: true })])
+ expect(marker().textContent).toContain('Not counted for progression')
+ expect(marker().querySelector('button')).toBeNull()
+ expect(menuItem(openMenu(), 'Don’t count for progression')).toBeUndefined()
+ })
+})
diff --git a/frontend/src/views/Workout.test.jsx b/frontend/src/views/Workout.test.jsx
index 55a757a6f..8dc4fc6c7 100644
--- a/frontend/src/views/Workout.test.jsx
+++ b/frontend/src/views/Workout.test.jsx
@@ -531,6 +531,15 @@ describe('adding an exercise to a block kept out of progression', () => {
expect(added.plan.kind).toBe('up')
expect(added.sets.map(s => s.w)).toEqual([102.5])
})
+
+ it('does not pass on an exercise kept out by hand for today (its ⋯ menu)', async () => {
+ await mount([exercise('row', [false], { rid: 'main', noProg: true })], 0, { routines, workouts: history })
+ await addExerciseThroughSheets({ id: BENCH }, { mode: 'reps', sets: 1, reps: 5, weight: 40 })
+ const added = mocks.S.active.entries[1]
+ expect(added.noProg).toBeUndefined()
+ expect(added.plan.kind).toBe('up')
+ expect(added.sets.map(s => s.w)).toEqual([102.5])
+ })
})
describe('active workout weight controls', () => {