@nickchristensen/cliftin 3.0.0 → 4.1.0

package/README.md

@@ -46,6 +46,11 @@ USAGE
 * [`cliftin help [COMMAND]`](#cliftin-help-command)
 * [`cliftin programs list`](#cliftin-programs-list)
 * [`cliftin programs show [SELECTOR]`](#cliftin-programs-show-selector)
+* [`cliftin routines from-workout [WORKOUTID]`](#cliftin-routines-from-workout-workoutid)
+* [`cliftin routines latest`](#cliftin-routines-latest)
+* [`cliftin routines list`](#cliftin-routines-list)
+* [`cliftin routines next`](#cliftin-routines-next)
+* [`cliftin routines show SELECTOR`](#cliftin-routines-show-selector)
 * [`cliftin workouts list`](#cliftin-workouts-list)
 * [`cliftin workouts next`](#cliftin-workouts-next)
 * [`cliftin workouts show [WORKOUTID]`](#cliftin-workouts-show-workoutid)
@@ -73,7 +78,7 @@ DESCRIPTION
   List exercises
 ```
 
-_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/exercises/list.ts)_
+_See code: [src/commands/exercises/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/exercises/list.ts)_
 
 ## `cliftin exercises show SELECTOR`
 
@@ -82,8 +87,8 @@ Show one exercise detail and history
 ```
 USAGE
   $ cliftin exercises show SELECTOR [--json] [--all | --limit <value>] [--from <value>] [--max-reps <value>]
-    [--max-weight <value>] [--min-reps <value>] [--min-weight <value>] [--program <value>] [--routine <value>] [--to
-    <value>]
+    [--max-weight <value>] [--min-reps <value>] [--min-weight <value>] [--no-warmup] [--program <value>] [--routine
+    <value>] [--to <value>]
 
 ARGUMENTS
   SELECTOR  exercise id or name
@@ -96,6 +101,7 @@ FLAGS
   --max-weight=<value>  History max top weight
   --min-reps=<value>    History min top reps
   --min-weight=<value>  History min top weight
+  --no-warmup           Hide warmup sets from output
   --program=<value>     History filter by program id or name
   --routine=<value>     History filter by routine id or name
   --to=<value>          History end date YYYY-MM-DD
@@ -107,7 +113,7 @@ DESCRIPTION
   Show one exercise detail and history
 ```
 
-_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/exercises/show.ts)_
+_See code: [src/commands/exercises/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/exercises/show.ts)_
 
 ## `cliftin help [COMMAND]`
 
@@ -144,7 +150,7 @@ DESCRIPTION
   List programs
 ```
 
-_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/programs/list.ts)_
+_See code: [src/commands/programs/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/programs/list.ts)_
 
 ## `cliftin programs show [SELECTOR]`
 
@@ -164,7 +170,103 @@ DESCRIPTION
   Show one program hierarchy
 ```
 
-_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/programs/show.ts)_
+_See code: [src/commands/programs/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/programs/show.ts)_
+
+## `cliftin routines from-workout [WORKOUTID]`
+
+Show the planned routine for a completed workout
+
+```
+USAGE
+  $ cliftin routines from-workout [WORKOUTID] [--json]
+
+ARGUMENTS
+  [WORKOUTID]  workout id (default: latest workout)
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Show the planned routine for a completed workout
+```
+
+_See code: [src/commands/routines/from-workout.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/from-workout.ts)_
+
+## `cliftin routines latest`
+
+Show the planned routine for the latest workout
+
+```
+USAGE
+  $ cliftin routines latest [--json]
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Show the planned routine for the latest workout
+```
+
+_See code: [src/commands/routines/latest.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/latest.ts)_
+
+## `cliftin routines list`
+
+List planned routines
+
+```
+USAGE
+  $ cliftin routines list [--json] [--name <value>] [--program <value>] [--week <value>]
+
+FLAGS
+  --name=<value>     Filter by routine name contains
+  --program=<value>  Filter by program id or name
+  --week=<value>     Filter by week number
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  List planned routines
+```
+
+_See code: [src/commands/routines/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/list.ts)_
+
+## `cliftin routines next`
+
+Show the up-next routine from the active program
+
+```
+USAGE
+  $ cliftin routines next [--json]
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Show the up-next routine from the active program
+```
+
+_See code: [src/commands/routines/next.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/next.ts)_
+
+## `cliftin routines show SELECTOR`
+
+Show one planned routine
+
+```
+USAGE
+  $ cliftin routines show SELECTOR [--json]
+
+ARGUMENTS
+  SELECTOR  routine id or name
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Show one planned routine
+```
+
+_See code: [src/commands/routines/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/routines/show.ts)_
 
 ## `cliftin workouts list`
 
@@ -191,11 +293,11 @@ DESCRIPTION
   List workouts
 ```
 
-_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/workouts/list.ts)_
+_See code: [src/commands/workouts/list.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/workouts/list.ts)_
 
 ## `cliftin workouts next`
 
-Show the up-next routine from the active program
+Redirect to routines next
 
 ```
 USAGE
@@ -205,10 +307,10 @@ GLOBAL FLAGS
   --json  Format output as json.
 
 DESCRIPTION
-  Show the up-next routine from the active program
+  Redirect to routines next
 ```
 
-_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/workouts/next.ts)_
+_See code: [src/commands/workouts/next.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/workouts/next.ts)_
 
 ## `cliftin workouts show [WORKOUTID]`
 
@@ -216,11 +318,14 @@ Show one workout with exercises and sets
 
 ```
 USAGE
-  $ cliftin workouts show [WORKOUTID] [--json]
+  $ cliftin workouts show [WORKOUTID] [--json] [--no-warmup]
 
 ARGUMENTS
   [WORKOUTID]  workout id (default: latest workout)
 
+FLAGS
+  --no-warmup  Hide warmup sets from output
+
 GLOBAL FLAGS
   --json  Format output as json.
 
@@ -228,5 +333,5 @@ DESCRIPTION
   Show one workout with exercises and sets
 ```
 
-_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v3.0.0/src/commands/workouts/show.ts)_
+_See code: [src/commands/workouts/show.ts](https://github.com/nickchristensen/cliftin/blob/v4.1.0/src/commands/workouts/show.ts)_
 <!-- commandsstop -->

package/dist/commands/exercises/show.d.ts

@@ -13,6 +13,7 @@ export default class ExercisesShow extends Command {
         'max-weight': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'min-reps': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'min-weight': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'no-warmup': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         program: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         routine: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         to: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/exercises/show.js

@@ -40,6 +40,7 @@ export default class ExercisesShow extends Command {
         'max-weight': Flags.integer({ description: 'History max top weight' }),
         'min-reps': Flags.integer({ description: 'History min top reps' }),
         'min-weight': Flags.integer({ description: 'History min top weight' }),
+        'no-warmup': Flags.boolean({ description: 'Hide warmup sets from output' }),
         program: Flags.string({ description: 'History filter by program id or name' }),
         routine: Flags.string({ description: 'History filter by routine id or name' }),
         to: Flags.string({ description: 'History end date YYYY-MM-DD' }),
@@ -58,7 +59,9 @@ export default class ExercisesShow extends Command {
                 const historyUnitPreference = await resolveExerciseWeightUnit(context.db, exerciseId);
                 const history = (await getExerciseHistoryWithSetsRows(context.db, exerciseId, historyFilters)).map((row) => ({
                     ...row,
-                    sets: row.sets.map((set) => ({
+                    sets: row.sets
+                        .filter((set) => (parsedFlags['no-warmup'] ? !set.isWarmup : true))
+                        .map((set) => ({
                         ...set,
                         weight: withWeightUnit(set.weight, historyUnitPreference),
                     })),
@@ -92,7 +95,7 @@ export default class ExercisesShow extends Command {
             this.log(`Program: ${lastPerformedSnapshot.workout.program ?? 'n/a'}`);
             this.log(`Date: ${formatWorkoutDate(lastPerformedSnapshot.workout.date)}`);
             this.log('');
-            this.log(renderTable(lastPerformedSnapshot.exercise.sets.map((set) => ({
+            this.log(renderTable(lastPerformedSnapshot.exercise.sets.filter((set) => (parsedFlags['no-warmup'] ? !set.isWarmup : true)).map((set) => ({
                 id: set.id,
                 isWarmup: set.isWarmup,
                 reps: set.reps,

package/dist/commands/routines/from-workout.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class RoutinesFromWorkout extends Command {
+    static args: {
+        workoutId: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static description: string;
+    static enableJsonFlag: boolean;
+    run(): Promise<unknown | void>;
+}

package/dist/commands/routines/from-workout.js

@@ -0,0 +1,51 @@
+import { Args, Command } from '@oclif/core';
+import { closeDb, openDb } from '../../lib/db.js';
+import { toJsonErrorPayload } from '../../lib/json-error.js';
+import { serializeRoutineDetailWithWeightUnits } from '../../lib/json-weight.js';
+import { renderTable } from '../../lib/output.js';
+import { getLatestRoutineDetail, getRoutineDetailFromWorkout } from '../../lib/repositories/routines.js';
+import { buildRoutineRows } from '../../lib/routine-output.js';
+import { resolveProgramWeightUnit, weightUnitLabel } from '../../lib/units.js';
+export default class RoutinesFromWorkout extends Command {
+    static args = {
+        workoutId: Args.string({
+            description: 'workout id (default: latest workout)',
+            ignoreStdin: true,
+            required: false,
+        }),
+    };
+    static description = 'Show the planned routine for a completed workout';
+    static enableJsonFlag = true;
+    async run() {
+        const { args } = await this.parse(RoutinesFromWorkout);
+        const context = openDb();
+        try {
+            if (args.workoutId !== undefined && !/^\d+$/.test(args.workoutId)) {
+                throw new Error('Workout id must be numeric.');
+            }
+            const detail = args.workoutId
+                ? await getRoutineDetailFromWorkout(context.db, Number(args.workoutId))
+                : await getLatestRoutineDetail(context.db);
+            const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
+            const unitLabel = weightUnitLabel(unitPreference);
+            if (this.jsonEnabled()) {
+                return serializeRoutineDetailWithWeightUnits(detail, unitPreference);
+            }
+            this.log(`[${detail.routine.id}] ${detail.routine.name ?? 'Routine'}`);
+            this.log(`Program: ${detail.program.name}`);
+            this.log(`Week: ${detail.week.number}`);
+            if (detail.workout)
+                this.log(`Workout: [${detail.workout.id}] ${detail.workout.routine ?? 'Workout'}`);
+            this.log('');
+            this.log(renderTable(buildRoutineRows(detail.routine, unitLabel)).replace(/^\n+/, ''));
+        }
+        catch (error) {
+            if (this.jsonEnabled())
+                return toJsonErrorPayload(error);
+            throw error;
+        }
+        finally {
+            await closeDb(context);
+        }
+    }
+}

package/dist/commands/routines/latest.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class RoutinesLatest extends Command {
+    static description: string;
+    static enableJsonFlag: boolean;
+    run(): Promise<unknown | void>;
+}

package/dist/commands/routines/latest.js

@@ -0,0 +1,39 @@
+import { Command } from '@oclif/core';
+import { closeDb, openDb } from '../../lib/db.js';
+import { toJsonErrorPayload } from '../../lib/json-error.js';
+import { serializeRoutineDetailWithWeightUnits } from '../../lib/json-weight.js';
+import { renderTable } from '../../lib/output.js';
+import { getLatestRoutineDetail } from '../../lib/repositories/routines.js';
+import { buildRoutineRows } from '../../lib/routine-output.js';
+import { resolveProgramWeightUnit, weightUnitLabel } from '../../lib/units.js';
+export default class RoutinesLatest extends Command {
+    static description = 'Show the planned routine for the latest workout';
+    static enableJsonFlag = true;
+    async run() {
+        await this.parse(RoutinesLatest);
+        const context = openDb();
+        try {
+            const detail = await getLatestRoutineDetail(context.db);
+            const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
+            const unitLabel = weightUnitLabel(unitPreference);
+            if (this.jsonEnabled()) {
+                return serializeRoutineDetailWithWeightUnits(detail, unitPreference);
+            }
+            this.log(`[${detail.routine.id}] ${detail.routine.name ?? 'Routine'}`);
+            this.log(`Program: ${detail.program.name}`);
+            this.log(`Week: ${detail.week.number}`);
+            if (detail.workout)
+                this.log(`Workout: [${detail.workout.id}] ${detail.workout.routine ?? 'Workout'}`);
+            this.log('');
+            this.log(renderTable(buildRoutineRows(detail.routine, unitLabel)).replace(/^\n+/, ''));
+        }
+        catch (error) {
+            if (this.jsonEnabled())
+                return toJsonErrorPayload(error);
+            throw error;
+        }
+        finally {
+            await closeDb(context);
+        }
+    }
+}

package/dist/commands/routines/list.d.ts

@@ -0,0 +1,11 @@
+import { Command } from '@oclif/core';
+export default class RoutinesList extends Command {
+    static description: string;
+    static enableJsonFlag: boolean;
+    static flags: {
+        name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        program: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        week: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<unknown | void>;
+}

package/dist/commands/routines/list.js

@@ -0,0 +1,40 @@
+import { Command, Flags } from '@oclif/core';
+import { closeDb, openDb } from '../../lib/db.js';
+import { renderTable } from '../../lib/output.js';
+import { listRoutines } from '../../lib/repositories/routines.js';
+export default class RoutinesList extends Command {
+    static description = 'List planned routines';
+    static enableJsonFlag = true;
+    static flags = {
+        name: Flags.string({ description: 'Filter by routine name contains' }),
+        program: Flags.string({ description: 'Filter by program id or name' }),
+        week: Flags.integer({ description: 'Filter by week number' }),
+    };
+    async run() {
+        const { flags } = await this.parse(RoutinesList);
+        const context = openDb();
+        try {
+            const routines = await listRoutines(context.db, {
+                name: flags.name,
+                program: flags.program,
+                week: flags.week,
+            });
+            if (this.jsonEnabled()) {
+                return routines.map(({ id, ...routine }) => ({
+                    ...routine,
+                    routineId: id,
+                }));
+            }
+            this.log(renderTable(routines.map((routine) => ({
+                id: routine.id,
+                isNext: routine.isNext,
+                name: routine.name,
+                program: routine.program,
+                week: routine.week,
+            }))));
+        }
+        finally {
+            await closeDb(context);
+        }
+    }
+}

package/dist/commands/routines/next.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class RoutinesNext extends Command {
+    static description: string;
+    static enableJsonFlag: boolean;
+    run(): Promise<unknown | void>;
+}

package/dist/commands/routines/next.js

@@ -0,0 +1,37 @@
+import { Command } from '@oclif/core';
+import { closeDb, openDb } from '../../lib/db.js';
+import { toJsonErrorPayload } from '../../lib/json-error.js';
+import { serializeRoutineDetailWithWeightUnits } from '../../lib/json-weight.js';
+import { renderTable } from '../../lib/output.js';
+import { getNextRoutineDetail } from '../../lib/repositories/routines.js';
+import { buildRoutineRows } from '../../lib/routine-output.js';
+import { resolveProgramWeightUnit, weightUnitLabel } from '../../lib/units.js';
+export default class RoutinesNext extends Command {
+    static description = 'Show the up-next routine from the active program';
+    static enableJsonFlag = true;
+    async run() {
+        await this.parse(RoutinesNext);
+        const context = openDb();
+        try {
+            const detail = await getNextRoutineDetail(context.db);
+            const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
+            const unitLabel = weightUnitLabel(unitPreference);
+            if (this.jsonEnabled()) {
+                return serializeRoutineDetailWithWeightUnits(detail, unitPreference);
+            }
+            this.log(`[${detail.routine.id}] ${detail.routine.name ?? 'Routine'}`);
+            this.log(`Program: ${detail.program.name}`);
+            this.log(`Week: ${detail.week.number}`);
+            this.log('');
+            this.log(renderTable(buildRoutineRows(detail.routine, unitLabel)).replace(/^\n+/, ''));
+        }
+        catch (error) {
+            if (this.jsonEnabled())
+                return toJsonErrorPayload(error);
+            throw error;
+        }
+        finally {
+            await closeDb(context);
+        }
+    }
+}

package/dist/commands/routines/show.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class RoutinesShow extends Command {
+    static args: {
+        selector: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static enableJsonFlag: boolean;
+    run(): Promise<unknown | void>;
+}

package/dist/commands/routines/show.js

@@ -0,0 +1,34 @@
+import { Args, Command } from '@oclif/core';
+import { closeDb, openDb } from '../../lib/db.js';
+import { serializeRoutineDetailWithWeightUnits } from '../../lib/json-weight.js';
+import { renderTable } from '../../lib/output.js';
+import { getRoutineDetail } from '../../lib/repositories/routines.js';
+import { buildRoutineRows } from '../../lib/routine-output.js';
+import { resolveProgramWeightUnit, weightUnitLabel } from '../../lib/units.js';
+export default class RoutinesShow extends Command {
+    static args = {
+        selector: Args.string({ description: 'routine id or name', ignoreStdin: true, required: true }),
+    };
+    static description = 'Show one planned routine';
+    static enableJsonFlag = true;
+    async run() {
+        const { args } = await this.parse(RoutinesShow);
+        const context = openDb();
+        try {
+            const detail = await getRoutineDetail(context.db, args.selector);
+            const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
+            const unitLabel = weightUnitLabel(unitPreference);
+            if (this.jsonEnabled()) {
+                return serializeRoutineDetailWithWeightUnits(detail, unitPreference);
+            }
+            this.log(`[${detail.routine.id}] ${detail.routine.name ?? 'Routine'}`);
+            this.log(`Program: ${detail.program.name}`);
+            this.log(`Week: ${detail.week.number}`);
+            this.log('');
+            this.log(renderTable(buildRoutineRows(detail.routine, unitLabel)).replace(/^\n+/, ''));
+        }
+        finally {
+            await closeDb(context);
+        }
+    }
+}

package/dist/commands/workouts/next.js

@@ -1,44 +1,16 @@
 import { Command } from '@oclif/core';
-import { closeDb, openDb } from '../../lib/db.js';
-import { toJsonErrorPayload } from '../../lib/json-error.js';
-import { serializeNextWorkoutDetailWithWeightUnits } from '../../lib/json-weight.js';
-import { renderTable } from '../../lib/output.js';
-import { getNextWorkoutDetail } from '../../lib/repositories/workouts.js';
-import { resolveProgramWeightUnit, weightUnitLabel } from '../../lib/units.js';
 export default class WorkoutsNext extends Command {
-    static description = 'Show the up-next routine from the active program';
+    static description = 'Redirect to routines next';
     static enableJsonFlag = true;
     async run() {
         await this.parse(WorkoutsNext);
-        const context = openDb();
-        try {
-            const detail = await getNextWorkoutDetail(context.db);
-            const unitPreference = await resolveProgramWeightUnit(context.db, detail.program.id);
-            const unitLabel = weightUnitLabel(unitPreference);
-            if (this.jsonEnabled()) {
-                return serializeNextWorkoutDetailWithWeightUnits(detail, unitPreference);
-            }
-            this.log(`[${detail.routine.id}] ${detail.routine.name ?? 'Workout'}`);
-            this.log(`Program: ${detail.program.name}`);
-            this.log(`Week: ${detail.week.number}`);
-            for (const exercise of detail.routine.exercises) {
-                this.log('');
-                this.log(`[${exercise.id ?? exercise.exerciseConfigId}] ${exercise.name ?? '(unnamed)'}`);
-                this.log(renderTable(exercise.sets.map((set) => ({
-                    reps: set.reps,
-                    rpe: set.rpe,
-                    timeSeconds: set.timeSeconds,
-                    weight: set.weight === null ? null : `${set.weight} ${unitLabel}`,
-                }))));
-            }
-        }
-        catch (error) {
-            if (this.jsonEnabled())
-                return toJsonErrorPayload(error);
-            throw error;
-        }
-        finally {
-            await closeDb(context);
+        const message = 'workouts next has moved. Use "cliftin routines next" instead.';
+        if (this.jsonEnabled()) {
+            return {
+                command: 'routines next',
+                message,
+            };
         }
+        this.log(message);
     }
 }

package/dist/commands/workouts/show.d.ts

@@ -5,5 +5,8 @@ export default class WorkoutsShow extends Command {
     };
     static description: string;
     static enableJsonFlag: boolean;
+    static flags: {
+        'no-warmup': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<unknown | void>;
 }

package/dist/commands/workouts/show.js

@@ -1,4 +1,4 @@
-import { Args, Command } from '@oclif/core';
+import { Args, Command, Flags } from '@oclif/core';
 import { format, isValid, parseISO } from 'date-fns';
 import { closeDb, openDb } from '../../lib/db.js';
 import { serializeWorkoutDetailWithWeightUnits } from '../../lib/json-weight.js';
@@ -18,14 +18,28 @@ function formatWorkoutDate(dateIso) {
         return dateIso;
     return format(parsed, 'yyyy-MM-dd HH:mm');
 }
+function maybeExcludeWarmupSets(detail, omitWarmups) {
+    if (!omitWarmups)
+        return detail;
+    return {
+        ...detail,
+        exercises: detail.exercises.map((exercise) => ({
+            ...exercise,
+            sets: exercise.sets.filter((set) => !set.isWarmup),
+        })),
+    };
+}
 export default class WorkoutsShow extends Command {
     static args = {
         workoutId: Args.string({ description: 'workout id (default: latest workout)', ignoreStdin: true, required: false }),
     };
     static description = 'Show one workout with exercises and sets';
     static enableJsonFlag = true;
+    static flags = {
+        'no-warmup': Flags.boolean({ description: 'Hide warmup sets from output' }),
+    };
     async run() {
-        const { args } = await this.parse(WorkoutsShow);
+        const { args, flags } = await this.parse(WorkoutsShow);
         const context = openDb();
         try {
             if (args.workoutId !== undefined && !/^\d+$/.test(args.workoutId)) {
@@ -38,7 +52,7 @@ export default class WorkoutsShow extends Command {
                         throw new Error('No workouts found.');
                     return rows[0].id;
                 });
-            const detail = await getWorkoutDetail(context.db, workoutId);
+            const detail = maybeExcludeWarmupSets(await getWorkoutDetail(context.db, workoutId), flags['no-warmup']);
             const unitPreference = await resolveGlobalWeightUnit(context.db);
             const unitLabel = weightUnitLabel(unitPreference);
             if (this.jsonEnabled()) {

package/dist/lib/json-weight.d.ts

@@ -1,8 +1,8 @@
-import { ExerciseHistoryRow, NextWorkoutDetail, ProgramDetailTree, WorkoutDetail } from './types.js';
+import { ExerciseHistoryRow, ProgramDetailTree, RoutineDetail, WorkoutDetail } from './types.js';
 import { UnitPreference, withWeightUnit } from './units.js';
 export declare function serializeExerciseHistoryRowsWithWeightUnits(rows: ExerciseHistoryRow[], unitPreference: UnitPreference): Array<Omit<ExerciseHistoryRow, 'topWeight'> & {
     topWeight: ReturnType<typeof withWeightUnit>;
 }>;
 export declare function serializeProgramDetailWithWeightUnits(detail: ProgramDetailTree, unitPreference: UnitPreference): unknown;
-export declare function serializeNextWorkoutDetailWithWeightUnits(detail: NextWorkoutDetail, unitPreference: UnitPreference): unknown;
+export declare function serializeRoutineDetailWithWeightUnits(detail: RoutineDetail, unitPreference: UnitPreference): unknown;
 export declare function serializeWorkoutDetailWithWeightUnits(detail: WorkoutDetail, unitPreference: UnitPreference): unknown;

package/dist/lib/json-weight.js

@@ -31,9 +31,9 @@ export function serializeProgramDetailWithWeightUnits(detail, unitPreference) {
         })),
     };
 }
-export function serializeNextWorkoutDetailWithWeightUnits(detail, unitPreference) {
+export function serializeRoutineDetailWithWeightUnits(detail, unitPreference) {
     const program = omitId(detail.program);
-    return {
+    const payload = {
         program: { ...program, programId: detail.program.id },
         routine: {
             ...omitId(detail.routine),
@@ -54,6 +54,19 @@ export function serializeNextWorkoutDetailWithWeightUnits(detail, unitPreference
             weekId: detail.week.id,
         },
     };
+    if (detail.workout) {
+        payload.workout = {
+            date: detail.workout.date,
+            duration: {
+                unit: 'seconds',
+                value: detail.workout.duration,
+            },
+            program: detail.workout.program,
+            routine: detail.workout.routine,
+            workoutId: detail.workout.id,
+        };
+    }
+    return payload;
 }
 export function serializeWorkoutDetailWithWeightUnits(detail, unitPreference) {
     return {

package/dist/lib/repositories/routines.d.ts

@@ -0,0 +1,13 @@
+import { Kysely } from 'kysely';
+import { DatabaseSchema } from '../db.js';
+import { RoutineDetail, RoutineSummary } from '../types.js';
+export type RoutineFilters = {
+    name?: string;
+    program?: string;
+    week?: number;
+};
+export declare function listRoutines(db: Kysely<DatabaseSchema>, filters: RoutineFilters): Promise<RoutineSummary[]>;
+export declare function getRoutineDetail(db: Kysely<DatabaseSchema>, selector: string): Promise<RoutineDetail>;
+export declare function getNextRoutineDetail(db: Kysely<DatabaseSchema>): Promise<RoutineDetail>;
+export declare function getRoutineDetailFromWorkout(db: Kysely<DatabaseSchema>, workoutId: number): Promise<RoutineDetail>;
+export declare function getLatestRoutineDetail(db: Kysely<DatabaseSchema>): Promise<RoutineDetail>;

package/dist/lib/repositories/routines.js

@@ -0,0 +1,171 @@
+import { sql } from 'kysely';
+import { appleSecondsToIso } from '../time.js';
+import { getProgramDetail, resolveProgramSelector } from './programs.js';
+import { resolveIdOrName } from './selectors.js';
+async function getRoutinePlanContext(db, routineId) {
+    const row = await db
+        .selectFrom('ZROUTINE as r')
+        .leftJoin('ZPERIOD as p', 'p.Z_PK', 'r.ZPERIOD')
+        .leftJoin('ZWORKOUTPLAN as planDirect', 'planDirect.Z_PK', 'r.ZWORKOUTPLAN')
+        .leftJoin('ZWORKOUTPLAN as planFromPeriod', 'planFromPeriod.Z_PK', 'p.ZWORKOUTPLAN')
+        .select([
+        'r.Z_PK as id',
+        'p.Z_PK as weekId',
+        'planDirect.Z_PK as programIdDirect',
+        'planFromPeriod.Z_PK as programIdFromPeriod',
+    ])
+        .where('r.Z_PK', '=', routineId)
+        .where('r.ZSOFTDELETED', 'is not', 1)
+        .where((eb) => eb.or([eb('planDirect.ZSOFTDELETED', 'is not', 1), eb('planFromPeriod.ZSOFTDELETED', 'is not', 1)]))
+        .executeTakeFirst();
+    if (!row)
+        throw new Error(`Routine not found: ${routineId}`);
+    const programId = row.programIdDirect ?? row.programIdFromPeriod;
+    if (programId === null)
+        throw new Error(`Routine ${routineId} is not linked to a program.`);
+    if (row.weekId === null)
+        throw new Error(`Routine ${routineId} is not linked to a week.`);
+    return { programId, weekId: row.weekId };
+}
+async function getRoutineDetailById(db, routineId, workout) {
+    const context = await getRoutinePlanContext(db, routineId);
+    const programDetail = await getProgramDetail(db, context.programId);
+    const weekIndex = programDetail.weeks.findIndex((week) => week.id === context.weekId);
+    if (weekIndex === -1) {
+        throw new Error(`Routine ${routineId} is linked to unknown week ${context.weekId}.`);
+    }
+    const week = programDetail.weeks[weekIndex];
+    const routine = week.routines.find((entry) => entry.id === routineId);
+    if (!routine) {
+        throw new Error(`Routine ${routineId} was not found in program ${programDetail.program.name}.`);
+    }
+    return {
+        program: programDetail.program,
+        routine,
+        week: {
+            id: week.id,
+            number: weekIndex + 1,
+        },
+        workout,
+    };
+}
+export async function listRoutines(db, filters) {
+    let query = db
+        .selectFrom('ZROUTINE as r')
+        .leftJoin('ZPERIOD as p', 'p.Z_PK', 'r.ZPERIOD')
+        .leftJoin('ZWORKOUTPLAN as planDirect', 'planDirect.Z_PK', 'r.ZWORKOUTPLAN')
+        .leftJoin('ZWORKOUTPLAN as planFromPeriod', 'planFromPeriod.Z_PK', 'p.ZWORKOUTPLAN')
+        .select([
+        'r.Z_PK as id',
+        'r.ZNAME as name',
+        'r.ZUPNEXT as upNext',
+        'p.Z_PK as weekId',
+        'planDirect.Z_PK as programIdDirect',
+        'planFromPeriod.Z_PK as programIdFromPeriod',
+        'planDirect.ZNAME as programNameDirect',
+        'planFromPeriod.ZNAME as programNameFromPeriod',
+    ])
+        .where('r.ZSOFTDELETED', 'is not', 1)
+        .where((eb) => eb.or([eb('planDirect.ZSOFTDELETED', 'is not', 1), eb('planFromPeriod.ZSOFTDELETED', 'is not', 1)]));
+    if (filters.program) {
+        const programId = await resolveProgramSelector(db, filters.program, false);
+        query = query.where((eb) => eb.or([eb('r.ZWORKOUTPLAN', '=', programId), eb('p.ZWORKOUTPLAN', '=', programId)]));
+    }
+    if (filters.name) {
+        const lowered = `%${filters.name.toLowerCase()}%`;
+        query = query.where(sql `lower(r.ZNAME) like ${lowered}`);
+    }
+    query = query.orderBy('planFromPeriod.ZDATEADDED', 'desc').orderBy('planDirect.ZDATEADDED', 'desc').orderBy('p.Z_FOK_WORKOUTPLAN', 'asc').orderBy('r.Z_FOK_PERIOD', 'asc').orderBy('r.Z_PK', 'asc');
+    const rows = await query.execute();
+    const weekNumbers = new Map();
+    const countsByProgram = new Map();
+    for (const row of rows) {
+        const programId = row.programIdDirect ?? row.programIdFromPeriod;
+        if (programId === null || row.weekId === null)
+            continue;
+        const key = row.weekId;
+        if (!weekNumbers.has(key)) {
+            const count = (countsByProgram.get(programId) ?? 0) + 1;
+            countsByProgram.set(programId, count);
+            weekNumbers.set(key, count);
+        }
+    }
+    return rows
+        .map((row) => ({
+        id: row.id,
+        isNext: row.upNext === 1,
+        name: row.name,
+        program: row.programNameDirect ?? row.programNameFromPeriod,
+        week: row.weekId === null ? null : weekNumbers.get(row.weekId) ?? null,
+    }))
+        .filter((row) => (filters.week === undefined ? true : row.week === filters.week));
+}
+export async function getRoutineDetail(db, selector) {
+    const routineId = await resolveIdOrName(db, 'ZROUTINE', selector);
+    return getRoutineDetailById(db, routineId, null);
+}
+export async function getNextRoutineDetail(db) {
+    const programId = await resolveProgramSelector(db, undefined, true);
+    const nextRoutines = await db
+        .selectFrom('ZROUTINE as r')
+        .leftJoin('ZPERIOD as p', 'p.Z_PK', 'r.ZPERIOD')
+        .select(['r.Z_PK as id'])
+        .where('r.ZUPNEXT', '=', 1)
+        .where('r.ZSOFTDELETED', 'is not', 1)
+        .where((eb) => eb.or([eb('p.ZWORKOUTPLAN', '=', programId), eb('r.ZWORKOUTPLAN', '=', programId)]))
+        .orderBy('p.Z_FOK_WORKOUTPLAN', 'asc')
+        .orderBy('r.Z_FOK_PERIOD', 'asc')
+        .orderBy('r.Z_PK', 'asc')
+        .execute();
+    if (nextRoutines.length === 0) {
+        const programDetail = await getProgramDetail(db, programId);
+        throw new Error(`No up-next routine found for active program ${programDetail.program.name}.`);
+    }
+    if (nextRoutines.length > 1) {
+        const programDetail = await getProgramDetail(db, programId);
+        throw new Error(`Expected exactly one up-next routine for active program ${programDetail.program.name}. Found ${nextRoutines.length}.`);
+    }
+    return getRoutineDetailById(db, nextRoutines[0].id, null);
+}
+export async function getRoutineDetailFromWorkout(db, workoutId) {
+    const workout = await db
+        .selectFrom('ZWORKOUTRESULT as wr')
+        .leftJoin('ZROUTINE as r', 'r.Z_PK', 'wr.ZROUTINE')
+        .leftJoin('ZPERIOD as p', 'p.Z_PK', 'r.ZPERIOD')
+        .leftJoin('ZWORKOUTPLAN as planDirect', 'planDirect.Z_PK', 'r.ZWORKOUTPLAN')
+        .leftJoin('ZWORKOUTPLAN as planFromPeriod', 'planFromPeriod.Z_PK', 'p.ZWORKOUTPLAN')
+        .select([
+        'wr.Z_PK as id',
+        'wr.ZDURATION as duration',
+        'wr.ZSTARTDATE as startDate',
+        'wr.ZROUTINE as routineId',
+        'wr.ZROUTINENAME as routineNameFromResult',
+        'r.ZNAME as routineNameFromPlan',
+        'planDirect.ZNAME as programNameDirect',
+        'planFromPeriod.ZNAME as programNameFromPeriod',
+    ])
+        .where('wr.Z_PK', '=', workoutId)
+        .executeTakeFirst();
+    if (!workout)
+        throw new Error(`Workout not found: ${workoutId}`);
+    if (workout.routineId === null)
+        throw new Error(`Workout ${workoutId} is not linked to a planned routine.`);
+    return getRoutineDetailById(db, workout.routineId, {
+        date: appleSecondsToIso(workout.startDate),
+        duration: workout.duration,
+        id: workout.id,
+        program: workout.programNameDirect ?? workout.programNameFromPeriod,
+        routine: workout.routineNameFromResult ?? workout.routineNameFromPlan,
+    });
+}
+export async function getLatestRoutineDetail(db) {
+    const latestWorkout = await db
+        .selectFrom('ZWORKOUTRESULT')
+        .select('Z_PK as id')
+        .orderBy('ZSTARTDATE', 'desc')
+        .limit(1)
+        .executeTakeFirst();
+    if (!latestWorkout)
+        throw new Error('No workouts found.');
+    return getRoutineDetailFromWorkout(db, latestWorkout.id);
+}

package/dist/lib/repositories/workouts.js

@@ -44,6 +44,7 @@ export async function getNextWorkoutDetail(db) {
             id: week.id,
             number: weekIndex + 1,
         },
+        workout: null,
     };
 }
 export async function listWorkouts(db, filters) {

package/dist/lib/routine-output.d.ts

@@ -0,0 +1,2 @@
+import { ProgramRoutine } from './types.js';
+export declare function buildRoutineRows(routine: ProgramRoutine, unitLabel: string): Array<Record<string, unknown>>;

package/dist/lib/routine-output.js

@@ -0,0 +1,19 @@
+export function buildRoutineRows(routine, unitLabel) {
+    return routine.exercises.flatMap((exercise) => {
+        const headingRow = {
+            exercise: `[${exercise.id ?? exercise.exerciseConfigId}] ${exercise.name ?? '(unnamed)'}`,
+            reps: null,
+            rpe: null,
+            timeSeconds: null,
+            weight: null,
+        };
+        const setRows = exercise.sets.map((set) => ({
+            exercise: '',
+            reps: set.reps,
+            rpe: set.rpe,
+            timeSeconds: set.timeSeconds,
+            weight: set.weight === null ? null : `${set.weight} ${unitLabel}`,
+        }));
+        return [headingRow, ...setRows];
+    });
+}

package/dist/lib/types.d.ts

@@ -39,6 +39,23 @@ export type ProgramDetailTree = {
     program: ProgramSummary;
     weeks: ProgramWeek[];
 };
+export type RoutineWeekRef = {
+    id: number;
+    number: number;
+};
+export type RoutineSummary = {
+    id: number;
+    isNext: boolean;
+    name: null | string;
+    program: null | string;
+    week: null | number;
+};
+export type RoutineDetail = {
+    program: ProgramSummary;
+    routine: ProgramRoutine;
+    week: RoutineWeekRef;
+    workout: null | WorkoutSummary;
+};
 export type WorkoutSummary = {
     date: null | string;
     duration: null | number;
@@ -69,14 +86,7 @@ export type WorkoutDetail = {
     program: null | string;
     routine: null | string;
 };
-export type NextWorkoutDetail = {
-    program: ProgramSummary;
-    routine: ProgramRoutine;
-    week: {
-        id: number;
-        number: number;
-    };
-};
+export type NextWorkoutDetail = RoutineDetail;
 export type ExerciseSummary = {
     equipment: null | string;
     id: number;

package/oclif.manifest.json

@@ -139,6 +139,12 @@
           "multiple": false,
           "type": "option"
         },
+        "no-warmup": {
+          "description": "Hide warmup sets from output",
+          "name": "no-warmup",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "program": {
           "description": "History filter by program id or name",
           "name": "program",
@@ -241,6 +247,184 @@
         "show.js"
       ]
     },
+    "routines:from-workout": {
+      "aliases": [],
+      "args": {
+        "workoutId": {
+          "description": "workout id (default: latest workout)",
+          "name": "workoutId",
+          "required": false
+        }
+      },
+      "description": "Show the planned routine for a completed workout",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "routines:from-workout",
+      "pluginAlias": "@nickchristensen/cliftin",
+      "pluginName": "@nickchristensen/cliftin",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "routines",
+        "from-workout.js"
+      ]
+    },
+    "routines:latest": {
+      "aliases": [],
+      "args": {},
+      "description": "Show the planned routine for the latest workout",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "routines:latest",
+      "pluginAlias": "@nickchristensen/cliftin",
+      "pluginName": "@nickchristensen/cliftin",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "routines",
+        "latest.js"
+      ]
+    },
+    "routines:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List planned routines",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "name": {
+          "description": "Filter by routine name contains",
+          "name": "name",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "program": {
+          "description": "Filter by program id or name",
+          "name": "program",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "week": {
+          "description": "Filter by week number",
+          "name": "week",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "routines:list",
+      "pluginAlias": "@nickchristensen/cliftin",
+      "pluginName": "@nickchristensen/cliftin",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "routines",
+        "list.js"
+      ]
+    },
+    "routines:next": {
+      "aliases": [],
+      "args": {},
+      "description": "Show the up-next routine from the active program",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "routines:next",
+      "pluginAlias": "@nickchristensen/cliftin",
+      "pluginName": "@nickchristensen/cliftin",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "routines",
+        "next.js"
+      ]
+    },
+    "routines:show": {
+      "aliases": [],
+      "args": {
+        "selector": {
+          "description": "routine id or name",
+          "name": "selector",
+          "required": true
+        }
+      },
+      "description": "Show one planned routine",
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "routines:show",
+      "pluginAlias": "@nickchristensen/cliftin",
+      "pluginName": "@nickchristensen/cliftin",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "routines",
+        "show.js"
+      ]
+    },
     "workouts:list": {
       "aliases": [],
       "args": {},
@@ -337,7 +521,7 @@
     "workouts:next": {
       "aliases": [],
       "args": {},
-      "description": "Show the up-next routine from the active program",
+      "description": "Redirect to routines next",
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -380,6 +564,12 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "no-warmup": {
+          "description": "Hide warmup sets from output",
+          "name": "no-warmup",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -399,5 +589,5 @@
       ]
     }
   },
-  "version": "3.0.0"
+  "version": "4.1.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nickchristensen/cliftin",
   "description": "CLIftin: A read-only CLI for Liftin'",
-  "version": "3.0.0",
+  "version": "4.1.0",
   "author": "Nick Christensen",
   "bin": {
     "cliftin": "./bin/run.js"
@@ -71,6 +71,9 @@
       "programs": {
         "description": "Program hierarchy and planning"
       },
+      "routines": {
+        "description": "Planned routine detail and navigation"
+      },
       "workouts": {
         "description": "Workout history and detail"
       }