feat(export): track user body measurements history

- Change user_measurements PK to (user_id, run_id) to allow historical tracking.
- Implement SQLite migration to schema version 2.
- Enhance sync logging with record counts and token state visibility.
- Add weight trend query to documentation.
- Improve Whoop client debug logging.

Author: diwakergupta

docs/QUERY_EXAMPLES.sql

@@ -19,13 +19,24 @@ SELECT p.user_id,
        m.height_meter,
        m.weight_kilogram,
        m.max_heart_rate,
-       p.updated_at
+       m.updated_at
 FROM user_profile p
-JOIN user_measurements m ON m.user_id = p.user_id
+JOIN user_measurements m ON m.user_id = p.user_id AND m.run_id = p.run_id
 ORDER BY p.updated_at DESC
 LIMIT 1;
 
--- 4) Sleep score trend (latest 30)
+-- 4) Weight and body measurements trend (latest 30 runs)
+SELECT r.started_at,
+       m.weight_kilogram,
+       m.height_meter,
+       m.max_heart_rate
+FROM user_measurements m
+JOIN dump_runs r ON r.id = m.run_id
+WHERE r.status = 'success'
+ORDER BY r.started_at DESC
+LIMIT 30;
+
+-- 5) Sleep score trend (latest 30)
 SELECT r.local_date AS day,
        r.start_time,
        s.sleep_performance_percentage,

docs/SCHEMA.md

@@ -33,9 +33,9 @@ Schema source of truth: `src/export/schema.sql`
   - columns: `email`, `first_name`, `last_name`, `run_id`, `updated_at`
 
 - `user_measurements`
-  - one row per user measurements snapshot
-  - PK: `user_id`
-  - columns: `height_meter`, `weight_kilogram`, `max_heart_rate`, `run_id`, `updated_at`
+  - snapshot per user measurements per run
+  - PK: `(user_id, run_id)`
+  - columns: `height_meter`, `weight_kilogram`, `max_heart_rate`, `updated_at`
 
 ## Sleep tables
 

src/auth/token-store.ts

@@ -17,6 +17,7 @@ export interface NormalizedToken {
   tokenType?: string;
   refreshToken?: string;
   scope?: string;
+  expiresIn?: number;
   expiresAt?: Date;
 }
 
@@ -171,6 +172,7 @@ export function normalizeToken(token: StoredToken): NormalizedToken {
     tokenType: token.token_type,
     refreshToken: token.refresh_token,
     scope: token.scope,
+    expiresIn: token.expires_in,
     expiresAt: parseExpiresAt(token),
   };
 }

src/commands/server.ts

@@ -72,6 +72,11 @@ async function refreshTokenFile(params: {
   }
 
   await writeTokenFile(params.credentialsFile, refreshed);
+
+  params.logger.info("Token file updated after refresh", {
+    expiresInSeconds: refreshed.expires_in,
+    expiresAt: refreshed.expires_at,
+  });
 }
 
 export async function runServerCommand(cli: ServerCliOptions): Promise<void> {
@@ -187,6 +192,15 @@ export async function runServerCommand(cli: ServerCliOptions): Promise<void> {
         });
       }
 
+      logger.info("Starting sync with token state", {
+        reason,
+        tokenExpiresInSeconds: token.expiresIn,
+        tokenExpiresAt: token.expiresAt,
+        tokenExpired: isTokenExpired(token),
+        configuredRefreshMinutes: config.server.jwtRefreshMinutes,
+        output: config.export.output,
+      });
+
       const client = new WhoopClient({
         accessToken: token.accessToken,
         userAgent: "whoosh/0.1.0",
@@ -207,7 +221,17 @@ export async function runServerCommand(cli: ServerCliOptions): Promise<void> {
       }
 
       markSyncSuccess(healthState);
-      logger.info("Scheduled sync completed", { reason });
+      logger.info("Scheduled sync completed", {
+        reason,
+        mode: plan.mode,
+        output: config.export.output,
+        records: {
+          sleeps: dump.sleep_collection.records.length,
+          recoveries: dump.recovery_collection.records.length,
+          workouts: dump.workout_collection.records.length,
+          cycles: dump.cycle_collection.records.length,
+        },
+      });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       markSyncFailure(healthState, errorMessage);

src/export/schema.sql

@@ -33,14 +33,15 @@ CREATE TABLE IF NOT EXISTS user_profile (
   FOREIGN KEY (run_id) REFERENCES dump_runs(id)
 );
 
--- User body measurements keyed by user id.
+-- User body measurements snapshot per run.
 CREATE TABLE IF NOT EXISTS user_measurements (
-  user_id INTEGER PRIMARY KEY,
+  user_id INTEGER NOT NULL,
   height_meter REAL,
   weight_kilogram REAL,
   max_heart_rate INTEGER,
   run_id INTEGER NOT NULL,
   updated_at TEXT NOT NULL,
+  PRIMARY KEY (user_id, run_id),
   FOREIGN KEY (run_id) REFERENCES dump_runs(id)
 );
 

src/export/sqlite.ts

@@ -5,7 +5,7 @@ import { AppError } from "../util/errors";
 import type { Logger } from "../util/logger";
 import type { CycleRecord, RecoveryRecord, SleepRecord, WhoopDump, WorkoutRecord } from "../whoop/types";
 
-const SCHEMA_VERSION = 1;
+const SCHEMA_VERSION = 2;
 
 export interface SqliteExportOptions {
   dbPath: string;
@@ -35,6 +35,32 @@ function applyPragmas(db: Database): void {
 
 function applySchema(db: Database, schemaSql: string): void {
   db.exec(schemaSql);
+
+  const currentVersionRow = db.query(
+    "SELECT MAX(version) as version FROM schema_migrations",
+  ).get() as { version: number | null } | null;
+  const currentVersion = currentVersionRow?.version ?? 0;
+
+  if (currentVersion < 2) {
+    // Migration to version 2: Change user_measurements PK to (user_id, run_id).
+    // SQLite doesn't support changing PK on an existing table directly.
+    db.exec(`
+      CREATE TABLE IF NOT EXISTS user_measurements_new (
+        user_id INTEGER NOT NULL,
+        height_meter REAL,
+        weight_kilogram REAL,
+        max_heart_rate INTEGER,
+        run_id INTEGER NOT NULL,
+        updated_at TEXT NOT NULL,
+        PRIMARY KEY (user_id, run_id),
+        FOREIGN KEY (run_id) REFERENCES dump_runs(id)
+      );
+      INSERT INTO user_measurements_new SELECT * FROM user_measurements;
+      DROP TABLE user_measurements;
+      ALTER TABLE user_measurements_new RENAME TO user_measurements;
+    `);
+  }
+
   db.query(
     "INSERT INTO schema_migrations (version, applied_at) VALUES (?, ?) ON CONFLICT(version) DO NOTHING",
   ).run(SCHEMA_VERSION, new Date().toISOString());
@@ -280,11 +306,10 @@ function upsertUserMeasurements(db: Database, runId: number, dump: WhoopDump): v
   db.query(
     `INSERT INTO user_measurements (user_id, height_meter, weight_kilogram, max_heart_rate, run_id, updated_at)
       VALUES (?, ?, ?, ?, ?, ?)
-      ON CONFLICT(user_id) DO UPDATE SET
+      ON CONFLICT(user_id, run_id) DO UPDATE SET
         height_meter = excluded.height_meter,
         weight_kilogram = excluded.weight_kilogram,
         max_heart_rate = excluded.max_heart_rate,
-        run_id = excluded.run_id,
         updated_at = excluded.updated_at`,
   ).run(
     dump.user_data.user_id,

src/whoop/client.ts

@@ -47,11 +47,30 @@ export class WhoopClient {
   }
 
   private async getJSON<T>(url: string): Promise<T> {
-    const response = await fetchWithRetry(url, {
-      method: "GET",
-      headers: this.buildHeaders(),
-    }, {
-      fetchImpl: this.fetchImpl,
+    const startedAt = Date.now();
+    this.logger?.debug("HTTP GET start", { url });
+
+    let response: Response;
+    try {
+      response = await fetchWithRetry(url, {
+        method: "GET",
+        headers: this.buildHeaders(),
+      }, {
+        fetchImpl: this.fetchImpl,
+      });
+    } catch (error) {
+      this.logger?.error("HTTP GET failed", {
+        url,
+        elapsedMs: Date.now() - startedAt,
+        error: error instanceof Error ? error.message : String(error),
+      });
+      throw error;
+    }
+
+    this.logger?.debug("HTTP GET success", {
+      url,
+      status: response.status,
+      elapsedMs: Date.now() - startedAt,
     });
 
     let json: unknown;