@richhaase/c2 0.3.2 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@richhaase/c2",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "CLI tool for syncing and analyzing Concept2 rowing data",
   "keywords": [
     "concept2",

package/src/commands/report.ts

@@ -287,7 +287,7 @@ function buildRecentWorkouts(workouts: Workout[], count: number): string {
       }
 
       const isShort = w.distance <= 1500;
-      const isHard = paceS > 0 && paceS < 160; // sub-2:40
+      const isHard = paceS > 0 && paceS < 160;
       let annotation = "";
       let rowStyle = "";
       let paceStyle = "";

package/src/config.test.ts

@@ -5,7 +5,7 @@ describe("parseGoalDate", () => {
   test("parses valid date string", () => {
     const d = parseGoalDate("2026-03-07");
     expect(d.getFullYear()).toBe(2026);
-    expect(d.getMonth()).toBe(2); // March = 2
+    expect(d.getMonth()).toBe(2);
     expect(d.getDate()).toBe(7);
   });
 

package/src/display.test.ts

@@ -155,7 +155,6 @@ describe("formatWorkoutLine", () => {
   });
 
   test("appends [IVL rest M:SS.S] tag for interval workouts", () => {
-    // Real 2026-04-11 session: 6x500m, 14:22.6 work, 6:00 rest.
     const w = makeWorkout({
       date: "2026-04-11 09:14:00",
       distance: 3000,
@@ -170,7 +169,6 @@ describe("formatWorkoutLine", () => {
     });
     const line = formatWorkoutLine(w, "01/02");
     expect(line).toContain("[IVL rest 6:00.0]");
-    // Pace comes from work time, not elapsed — must be 2:23.8, not 3:23.8.
     expect(line).toContain("2:23.8/500m");
   });
 

package/src/display.ts

@@ -70,5 +70,5 @@ export function trendArrow(prev: number, curr: number): string {
 
 export function paceArrow(prev: number, curr: number): string {
   if (prev === 0) return " ";
-  return trendArrow(curr, prev); // reversed: lower pace is better
+  return trendArrow(curr, prev);
 }

package/src/models.test.ts

@@ -29,7 +29,7 @@ describe("parsedDate", () => {
     const w = makeWorkout({ date: "2026-03-07 09:21:00" });
     const d = parsedDate(w);
     expect(d.getFullYear()).toBe(2026);
-    expect(d.getMonth()).toBe(2); // March = 2 (0-indexed)
+    expect(d.getMonth()).toBe(2);
     expect(d.getDate()).toBe(7);
     expect(d.getHours()).toBe(9);
     expect(d.getMinutes()).toBe(21);
@@ -47,7 +47,6 @@ describe("pace500mSeconds", () => {
   test("computes pace for normal workout", () => {
     const w = makeWorkout({ distance: 5500, time: 19122 });
     const pace = pace500mSeconds(w);
-    // 19122 / 10 * 500 / 5500 = 173.836...
     expect(pace).toBeCloseTo(173.836, 2);
   });
 
@@ -75,14 +74,10 @@ describe("pace500m", () => {
 
   test("formats 3+ minute pace correctly", () => {
     const w = makeWorkout({ distance: 1000, time: 3706 });
-    // 3706 / 10 * 500 / 1000 = 185.3
     expect(pace500m(w)).toBe("3:05.3");
   });
 
   test("uses work time (not elapsed) for interval workout pace", () => {
-    // Real 2026-04-11 session: 6x500m, 14:22.6 work, 6:00 rest.
-    // API returns `time: 8626` tenths (work), `time_formatted: "20:22.6"` (elapsed).
-    // Pace must be computed from `time`, not `time_formatted`.
     const w = makeWorkout({
       distance: 3000,
       time: 8626,
@@ -91,7 +86,6 @@ describe("pace500m", () => {
       rest_time: 3600,
       rest_distance: 660,
     });
-    // 8626 / 10 * 500 / 3000 = 143.77
     expect(pace500m(w)).toBe("2:23.8");
   });
 });
@@ -153,7 +147,6 @@ describe("restSeconds", () => {
 
 describe("workSeconds", () => {
   test("converts time tenths to seconds", () => {
-    // 8626 tenths = 862.6 seconds = 14:22.6
     const w = makeWorkout({ time: 8626 });
     expect(workSeconds(w)).toBe(862.6);
   });

package/src/models.ts

@@ -7,13 +7,13 @@ export interface HeartRate {
 export interface Workout {
   id: number;
   user_id: number;
-  date: string; // "2026-03-02 17:41:00"
+  date: string;
   timezone?: string;
-  distance: number; // meters of work (rest rowing NOT included)
-  type: string; // "rower"
-  time: number; // tenths of a second of work time (rest NOT included)
-  time_formatted: string; // elapsed time including rest for interval workouts
-  workout_type?: string; // e.g., "FixedDistanceSplits", "FixedDistanceInterval"
+  distance: number;
+  type: string;
+  time: number;
+  time_formatted: string;
+  workout_type?: string;
   source?: string;
   weight_class?: string;
   stroke_rate?: number;
@@ -22,19 +22,17 @@ export interface Workout {
   drag_factor?: number;
   heart_rate?: HeartRate;
   stroke_data?: boolean;
-  /** Total rest time across all rest intervals, in tenths of a second. */
   rest_time?: number;
-  /** Total meters rowed during rest intervals (easy rowing between reps). */
   rest_distance?: number;
   comments?: string;
 }
 
 export interface StrokeData {
-  t?: number; // cumulative time
-  d?: number; // cumulative distance
-  p?: number; // pace
-  spm?: number; // strokes per minute
-  hr?: number; // heart rate
+  t?: number;
+  d?: number;
+  p?: number;
+  spm?: number;
+  hr?: number;
 }
 
 export interface UserProfile {
@@ -66,7 +64,6 @@ export interface ResultsResponse {
   meta?: ResultsMeta;
 }
 
-/** API wraps stroke data in {"data": [...]} */
 export interface StrokeDataResponse {
   data: StrokeData[];
 }
@@ -100,12 +97,10 @@ export function isIntervalWorkout(w: Workout): boolean {
   return false;
 }
 
-/** Total rest time in seconds (0 when not an interval workout). */
 export function restSeconds(w: Workout): number {
   return (w.rest_time ?? 0) / TENTHS_PER_SECOND;
 }
 
-/** Total work time (excluding rest) in seconds. */
 export function workSeconds(w: Workout): number {
   return w.time / TENTHS_PER_SECOND;
 }

package/src/sessions.ts

@@ -2,10 +2,10 @@ import type { Workout } from "./models.ts";
 import { calendarDay } from "./models.ts";
 
 export interface Session {
-  date: string; // "2026-03-07"
+  date: string;
   workouts: Workout[];
   totalDistance: number;
-  totalTime: number; // tenths of seconds
+  totalTime: number;
 }
 
 export function groupIntoSessions(workouts: Workout[]): Session[] {
@@ -31,7 +31,6 @@ export function groupIntoSessions(workouts: Workout[]): Session[] {
     .sort((a, b) => a.date.localeCompare(b.date));
 }
 
-/** Count unique calendar days (sessions) in a list of workouts. */
 export function sessionCount(workouts: Workout[]): number {
   const days = new Set(workouts.map(calendarDay));
   return days.size;

package/src/stats.test.ts

@@ -30,28 +30,28 @@ function makeGoalConfig(overrides: Partial<Config["goal"]> = {}): Config {
 
 describe("mondayOf", () => {
   test("monday returns same date", () => {
-    const d = new Date(2026, 2, 2); // Mon Mar 2
+    const d = new Date(2026, 2, 2);
     const m = mondayOf(d);
-    expect(m.getDay()).toBe(1); // Monday
+    expect(m.getDay()).toBe(1);
     expect(m.getDate()).toBe(2);
   });
 
   test("wednesday returns previous monday", () => {
-    const d = new Date(2026, 2, 4); // Wed Mar 4
+    const d = new Date(2026, 2, 4);
     const m = mondayOf(d);
     expect(m.getDay()).toBe(1);
     expect(m.getDate()).toBe(2);
   });
 
   test("sunday returns previous monday", () => {
-    const d = new Date(2026, 2, 8); // Sun Mar 8
+    const d = new Date(2026, 2, 8);
     const m = mondayOf(d);
     expect(m.getDay()).toBe(1);
     expect(m.getDate()).toBe(2);
   });
 
   test("handles month boundary", () => {
-    const d = new Date(2026, 2, 1); // Mar 1
+    const d = new Date(2026, 2, 1);
     const m = mondayOf(d);
     expect(m.getDay()).toBe(1);
     expect(m.getTime()).toBeLessThanOrEqual(d.getTime());
@@ -65,8 +65,8 @@ describe("workoutsInRange", () => {
       makeWorkout(2, "2026-02-15 10:00:00", 5000),
       makeWorkout(3, "2026-03-15 10:00:00", 5000),
     ];
-    const from = new Date(2026, 1, 1); // Feb 1
-    const to = new Date(2026, 2, 1); // Mar 1
+    const from = new Date(2026, 1, 1);
+    const to = new Date(2026, 2, 1);
     const result = workoutsInRange(workouts, from, to);
     expect(result).toHaveLength(1);
     expect(result[0]!.id).toBe(2);
@@ -82,10 +82,10 @@ describe("workoutsInRange", () => {
 
 describe("buildWeekSummaries", () => {
   test("buckets workouts into correct weeks", () => {
-    const now = new Date(2026, 2, 7); // Sat Mar 7
+    const now = new Date(2026, 2, 7);
     const workouts = [
-      makeWorkout(1, "2026-03-02 10:00:00", 5000), // Mon of current week
-      makeWorkout(2, "2026-02-23 10:00:00", 6000), // Previous week
+      makeWorkout(1, "2026-03-02 10:00:00", 5000),
+      makeWorkout(2, "2026-02-23 10:00:00", 6000),
     ];
     const summaries = buildWeekSummaries(workouts, now, 2);
     expect(summaries).toHaveLength(2);
@@ -97,12 +97,12 @@ describe("buildWeekSummaries", () => {
     const now = new Date(2026, 2, 7);
     const workouts = [
       makeWorkout(1, "2026-03-02 09:00:00", 1000),
-      makeWorkout(2, "2026-03-02 10:00:00", 2000), // same day
-      makeWorkout(3, "2026-03-04 10:00:00", 3000), // different day
+      makeWorkout(2, "2026-03-02 10:00:00", 2000),
+      makeWorkout(3, "2026-03-04 10:00:00", 3000),
     ];
     const summaries = buildWeekSummaries(workouts, now, 1);
     expect(summaries[0]!.meters).toBe(6000);
-    expect(summaries[0]!.sessions).toBe(2); // 2 unique days
+    expect(summaries[0]!.sessions).toBe(2);
   });
 
   test("returns empty summaries for no workouts", () => {
@@ -120,7 +120,7 @@ describe("computeGoalProgress", () => {
       makeWorkout(1, "2026-03-01 10:00:00", 100_000),
       makeWorkout(2, "2026-02-01 10:00:00", 100_000),
     ];
-    const now = new Date(2026, 2, 7); // Mar 7
+    const now = new Date(2026, 2, 7);
     const goal = computeGoalProgress(workouts, cfg, now);
     expect(goal.totalMeters).toBe(200_000);
     expect(goal.target).toBe(1_000_000);
@@ -141,9 +141,9 @@ describe("computeGoalProgress", () => {
   test("excludes workouts outside goal date range", () => {
     const cfg = makeGoalConfig();
     const workouts = [
-      makeWorkout(1, "2025-12-01 10:00:00", 50_000), // before start
-      makeWorkout(2, "2026-03-01 10:00:00", 100_000), // in range
-      makeWorkout(3, "2027-02-01 10:00:00", 50_000), // after end
+      makeWorkout(1, "2025-12-01 10:00:00", 50_000),
+      makeWorkout(2, "2026-03-01 10:00:00", 100_000),
+      makeWorkout(3, "2027-02-01 10:00:00", 50_000),
     ];
     const now = new Date(2026, 2, 7);
     const goal = computeGoalProgress(workouts, cfg, now);
@@ -153,7 +153,7 @@ describe("computeGoalProgress", () => {
   test("before start date: weeksElapsed is 0", () => {
     const cfg = makeGoalConfig({ start_date: "2026-06-01" });
     const workouts: Workout[] = [];
-    const now = new Date(2026, 2, 7); // before start
+    const now = new Date(2026, 2, 7);
     const goal = computeGoalProgress(workouts, cfg, now);
     expect(goal.weeksElapsed).toBe(0);
     expect(goal.currentAvgPace).toBe(0);
@@ -170,7 +170,7 @@ describe("computeGoalProgress", () => {
       makeWorkout(6, "2026-03-23 10:00:00", 20_000),
       makeWorkout(7, "2026-03-30 10:00:00", 20_000),
     ];
-    const now = new Date(2026, 2, 30, 18);
+    const now = new Date(2026, 3, 6, 18);
     const goal = computeGoalProgress(workouts, cfg, now);
     expect(goal.currentAvgPace).toBe(20_000);
   });
@@ -182,8 +182,19 @@ describe("computeGoalProgress", () => {
       makeWorkout(2, "2026-03-23 10:00:00", 15_000),
       makeWorkout(3, "2026-03-30 10:00:00", 15_000),
     ];
-    const now = new Date(2026, 2, 30, 18);
+    const now = new Date(2026, 3, 6, 18);
     const goal = computeGoalProgress(workouts, cfg, now);
     expect(goal.currentAvgPace).toBe(7_500);
   });
+
+  test("currentAvgPace excludes the current in-progress week", () => {
+    const cfg = makeGoalConfig();
+    const workouts = [
+      makeWorkout(1, "2026-04-06 10:00:00", 20_000),
+      makeWorkout(2, "2026-04-13 06:55:00", 5_500),
+    ];
+    const now = new Date(2026, 3, 13, 18);
+    const goal = computeGoalProgress(workouts, cfg, now);
+    expect(goal.currentAvgPace).toBe(5_000);
+  });
 });

package/src/stats.ts

@@ -18,13 +18,13 @@ export interface WeekSummary {
 export interface GoalProgress {
   target: number;
   totalMeters: number;
-  progress: number; // ratio 0–1
+  progress: number;
   weeksElapsed: number;
   totalWeeks: number;
   remainingMeters: number;
   remainingWeeks: number;
-  requiredPace: number; // meters/week needed going forward
-  currentAvgPace: number; // meters/week over the recent window
+  requiredPace: number;
+  currentAvgPace: number;
   onPace: boolean;
 }
 
@@ -138,16 +138,17 @@ export function computeGoalProgress(workouts: Workout[], cfg: Config, now?: Date
   if (weeksElapsed > 0) {
     const thisMonday = mondayOf(today);
     const recentStart = new Date(thisMonday);
-    recentStart.setDate(recentStart.getDate() - (RECENT_WEEKS - 1) * 7);
+    recentStart.setDate(recentStart.getDate() - RECENT_WEEKS * 7);
     const windowStart = recentStart < start ? start : recentStart;
+    const windowMs = thisMonday.getTime() - windowStart.getTime();
+    const weeksInWindow = Math.max(1, Math.round(windowMs / (1000 * 60 * 60 * 24 * 7)));
     let recentMeters = 0;
     for (const w of workouts) {
       const t = parsedDate(w);
-      if (t >= windowStart && t <= today) {
+      if (t >= windowStart && t < thisMonday) {
         recentMeters += w.distance;
       }
     }
-    const weeksInWindow = Math.min(RECENT_WEEKS, Math.max(1, weeksElapsed));
     currentAvgPace = Math.floor(recentMeters / weeksInWindow);
   }
   const targetWeekly = target / totalWeeks;