incremnt 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incremnt",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Command-line tool for querying your incremnt strength training data",
   "license": "MIT",
   "type": "module",
@@ -13,5 +13,8 @@
   "scripts": {
     "test": "node --test",
     "dev:sync-fixture": "node ./scripts/dev-sync-fixture-server.js"
+  },
+  "dependencies": {
+    "chalk": "^5.6.2"
   }
 }

package/src/format.js

@@ -1,44 +1,72 @@
+import chalk from 'chalk';
+
 const shortMonths = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 const shortDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 
-function formatShortDate(dateString) {
+// --- Shared helpers ---
+
+function parseDate(dateString) {
   const date = new Date(dateString);
-  if (Number.isNaN(date.getTime())) {
-    return dateString;
-  }
+  return Number.isNaN(date.getTime()) ? null : date;
+}
 
-  return `${date.getDate()} ${shortMonths[date.getMonth()]}`;
+function formatShortDate(dateString) {
+  const date = parseDate(dateString);
+  return date ? `${date.getDate()} ${shortMonths[date.getMonth()]}` : dateString;
 }
 
 function formatDayAndDate(dateString) {
-  const date = new Date(dateString);
-  if (Number.isNaN(date.getTime())) {
-    return dateString;
-  }
+  const date = parseDate(dateString);
+  return date
+    ? `${shortDays[date.getDay()]} ${date.getDate()} ${shortMonths[date.getMonth()]}`
+    : dateString;
+}
+
+function header(text) {
+  return chalk.bold(` ${text}`);
+}
+
+function dimDot() {
+  return chalk.dim(' \u00b7 ');
+}
+
+function formatWeight(weight) {
+  return chalk.bold.cyan(`${Number(weight).toFixed(1)} kg`);
+}
 
-  return `${shortDays[date.getDay()]} ${date.getDate()} ${shortMonths[date.getMonth()]}`;
+function formatDuration(seconds) {
+  return `${Math.round(seconds / 60)} min`;
 }
 
+function keyValue(key, value, keyWidth = 12) {
+  return ` ${chalk.dim(key.padEnd(keyWidth))} ${chalk.bold(value)}`;
+}
+
+// --- Formatters ---
+
 function formatRecords(payload) {
   if (!Array.isArray(payload) || payload.length === 0) {
     return 'No records found.';
   }
 
   const maxNameLength = Math.max(...payload.map((record) => record.exerciseName.length));
+  const lines = [header('PERSONAL RECORDS'), ''];
 
-  return payload.map((record) => {
+  for (const record of payload) {
     const name = record.exerciseName.padEnd(maxNameLength);
     const date = formatShortDate(record.sessionDate);
     const isBodyweight = Number(record.weight) === 0;
 
     if (isBodyweight) {
       const reps = `${record.reps} reps`.padStart(12);
-      return `${name}  ${reps}  BW \u00b7 ${date}`;
+      lines.push(` ${name}  ${chalk.bold.cyan(reps)}  ${chalk.dim('BW')}${dimDot()}${chalk.dim(date)}`);
+    } else {
+      const weight = `${Number(record.weight).toFixed(1)} kg`.padStart(12);
+      lines.push(` ${name}  ${chalk.bold.cyan(weight)}  ${chalk.dim('e1RM')}${dimDot()}${chalk.dim(date)}`);
     }
+  }
 
-    const weight = `${Number(record.weight).toFixed(1)} kg`.padStart(12);
-    return `${name}  ${weight}  e1RM \u00b7 ${date}`;
-  }).join('\n');
+  return lines.join('\n');
 }
 
 function formatSessionInsights(payload) {
@@ -46,27 +74,300 @@ function formatSessionInsights(payload) {
     return 'No sessions found.';
   }
 
-  return payload.map((session) => {
-    const date = formatDayAndDate(session.sessionDate);
+  const lines = [header('RECENT SESSIONS'), ''];
+  const maxDateLength = Math.max(...payload.map((session) => formatDayAndDate(session.sessionDate).length));
+
+  for (const session of payload) {
+    const date = formatDayAndDate(session.sessionDate).padEnd(maxDateLength);
     const dayName = session.dayName ?? 'Workout';
     const exercises = `${session.exerciseCount ?? '?'} exercises`;
-    const duration = session.durationSeconds
-      ? `${Math.round(session.durationSeconds / 60)} min`
-      : '';
-    const suffix = duration ? ` \u00b7 ${exercises} \u00b7 ${duration}` : ` \u00b7 ${exercises}`;
+    const duration = session.durationSeconds ? formatDuration(session.durationSeconds) : '';
+    const suffix = duration
+      ? `${dimDot()}${chalk.dim(exercises)}${dimDot()}${chalk.dim(duration)}`
+      : `${dimDot()}${chalk.dim(exercises)}`;
+
+    lines.push(` ${chalk.bold(date)}  ${dayName}${suffix}`);
+  }
 
-    return `${date}  ${dayName}${suffix}`;
-  }).join('\n');
+  return lines.join('\n');
 }
 
-export function formatPretty(command, payload) {
-  if (command === 'records') {
-    return formatRecords(payload);
+function formatSessionShow(payload) {
+  if (!payload) {
+    return 'Session not found.';
+  }
+
+  const date = formatDayAndDate(payload.sessionDate);
+  const lines = [` ${chalk.bold('SESSION')}${dimDot()}${date}`, ''];
+
+  if (payload.programName) {
+    lines.push(keyValue('Program', payload.programName));
+  }
+
+  if (payload.dayName) {
+    const dayDetail = payload.programDayIndex != null
+      ? `${payload.dayName} (Day ${payload.programDayIndex + 1})`
+      : payload.dayName;
+    lines.push(keyValue('Day', dayDetail));
+  }
+
+  if (payload.historicalContext?.programWeekNumber) {
+    lines.push(keyValue('Week', String(payload.historicalContext.programWeekNumber)));
   }
 
-  if (command === 'session-insights') {
-    return formatSessionInsights(payload);
+  if (payload.totalVolume) {
+    lines.push(keyValue('Volume', `${Number(payload.totalVolume).toLocaleString()} kg`));
   }
 
-  return null;
+  if (payload.durationSeconds) {
+    lines.push(keyValue('Duration', formatDuration(payload.durationSeconds)));
+  }
+
+  if (payload.effortScore != null) {
+    lines.push(keyValue('Effort', String(payload.effortScore)));
+  }
+
+  if (payload.averageHeartRate != null || payload.maxHeartRate != null) {
+    const parts = [];
+    if (payload.averageHeartRate != null) {
+      parts.push(`${payload.averageHeartRate} avg`);
+    }
+
+    if (payload.maxHeartRate != null) {
+      parts.push(`${payload.maxHeartRate} max`);
+    }
+
+    lines.push(keyValue('HR', parts.join(chalk.dim(' \u00b7 '))));
+  }
+
+  if (payload.activeCalories != null) {
+    lines.push(keyValue('Calories', `${payload.activeCalories} kcal`));
+  }
+
+  return lines.join('\n');
+}
+
+function formatExerciseHistory(payload) {
+  if (!Array.isArray(payload) || payload.length === 0) {
+    return 'No history found.';
+  }
+
+  const exerciseName = payload[0]?.exerciseName ?? 'Exercise';
+  const lines = [` ${chalk.bold(exerciseName.toUpperCase())}${dimDot()}History`, ''];
+  const maxDateLength = Math.max(...payload.map((entry) => formatShortDate(entry.sessionDate).length));
+
+  for (const entry of payload) {
+    const date = formatShortDate(entry.sessionDate).padEnd(maxDateLength);
+    const weight = entry.weight > 0 ? `${formatWeight(entry.weight)} \u00d7 ${entry.reps}` : `${chalk.bold.cyan(`${entry.reps} reps`)}`;
+    const rir = entry.rir != null ? `   ${chalk.dim(`RIR ${entry.rir}`)}` : '';
+    lines.push(` ${chalk.dim(date)}   ${weight}${rir}`);
+  }
+
+  return lines.join('\n');
+}
+
+function formatProgramSummary(payload) {
+  if (!payload) {
+    return 'No active program.';
+  }
+
+  const lines = [header('CURRENT PROGRAM'), ''];
+
+  lines.push(keyValue('Name', payload.programName));
+  lines.push(keyValue('Week', String(payload.currentWeek)));
+
+  if (payload.currentDayTitle) {
+    const nextDay = payload.currentDayIndex != null
+      ? `${payload.currentDayTitle} (Day ${payload.currentDayIndex + 1})`
+      : payload.currentDayTitle;
+    lines.push(keyValue('Next', nextDay));
+  }
+
+  if (payload.trainingWeekdays?.length > 0) {
+    const dayNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+    const schedule = payload.trainingWeekdays.map((d) => dayNames[d] ?? d).join(', ');
+    lines.push(keyValue('Schedule', schedule));
+  }
+
+  lines.push(keyValue('Cycles', `${payload.completedCyclesCount} completed`));
+
+  return lines.join('\n');
+}
+
+function formatProgramList(payload) {
+  if (!Array.isArray(payload) || payload.length === 0) {
+    return 'No programs found.';
+  }
+
+  const lines = [header('PROGRAMS'), ''];
+
+  for (const program of payload) {
+    const dot = program.isActive ? chalk.green('\u25cf') : chalk.dim('\u25cb');
+    const name = program.isActive ? chalk.bold(program.programName) : program.programName;
+    const week = `Week ${program.currentWeek}`;
+    const day = program.currentDayTitle ? `Day ${program.currentDayIndex + 1} (${program.currentDayTitle})` : `Day ${program.currentDayIndex + 1}`;
+    lines.push(` ${dot} ${name}    ${chalk.dim(`${week}${' \u00b7 '}${day}`)}`);
+  }
+
+  return lines.join('\n');
+}
+
+function formatPlannedVsActual(payload) {
+  if (!payload) {
+    return 'No comparison data found.';
+  }
+
+  const date = formatShortDate(payload.sessionDate);
+  const dayTitle = payload.dayTitle ?? 'Workout';
+  const lines = [` ${chalk.bold('PLANNED vs ACTUAL')}${dimDot()}${dayTitle} (${date})`, ''];
+
+  for (const exercise of payload.exercises ?? []) {
+    lines.push(` ${chalk.bold(exercise.exerciseName)}`);
+
+    if (exercise.plannedSets.length > 0) {
+      const weights = [...new Set(exercise.plannedSets.map((s) => s.weight))];
+      const reps = [...new Set(exercise.plannedSets.map((s) => s.reps))];
+      const setCount = exercise.plannedSets.length;
+      const weightStr = weights.length === 1 ? `${weights[0]} kg` : `${Math.min(...weights)}-${Math.max(...weights)} kg`;
+      const repStr = reps.length === 1 ? `${setCount}\u00d7${reps[0]}` : `${setCount}\u00d7${reps.join('/')}`;
+      const rirStr = exercise.plannedRir != null ? `  ${chalk.dim(`RIR ${exercise.plannedRir}`)}` : '';
+      lines.push(`   ${chalk.dim('Planned')}  ${repStr} @ ${weightStr}${rirStr}`);
+    }
+
+    if (exercise.actualSets.length > 0) {
+      const repsList = exercise.actualSets.map((s) => s.reps).join(', ');
+      const weights = [...new Set(exercise.actualSets.map((s) => s.weight))];
+      const weightStr = weights.length === 1 ? `${weights[0]} kg` : `${Math.min(...weights)}-${Math.max(...weights)} kg`;
+      const rirStr = exercise.actualRir != null ? `  ${chalk.dim(`RIR ${exercise.actualRir}`)}` : '';
+      lines.push(`   ${chalk.dim('Actual')}   ${repsList} @ ${weightStr}${rirStr}`);
+    }
+
+    lines.push('');
+  }
+
+  // Remove trailing blank line
+  if (lines.at(-1) === '') {
+    lines.pop();
+  }
+
+  return lines.join('\n');
+}
+
+function formatWhyDidThisChange(payload) {
+  if (!payload) {
+    return 'No session context found.';
+  }
+
+  const date = formatShortDate(payload.sessionDate);
+  const lines = [` ${chalk.bold('SESSION CONTEXT')}${dimDot()}${date}`, ''];
+
+  if (payload.programWeekNumber != null) {
+    lines.push(keyValue('Week', String(payload.programWeekNumber)));
+  }
+
+  if (payload.sessionIntent) {
+    lines.push(keyValue('Intent', payload.sessionIntent));
+  }
+
+  if (payload.programProgressionType) {
+    lines.push(keyValue('Progression', payload.programProgressionType));
+  }
+
+  if (payload.effortScore != null) {
+    lines.push(keyValue('Effort', String(payload.effortScore)));
+  }
+
+  if (payload.averageHeartRate != null || payload.maxHeartRate != null) {
+    const parts = [];
+    if (payload.averageHeartRate != null) {
+      parts.push(`${payload.averageHeartRate} avg`);
+    }
+
+    if (payload.maxHeartRate != null) {
+      parts.push(`${payload.maxHeartRate} max`);
+    }
+
+    lines.push(keyValue('HR', parts.join(chalk.dim(' \u00b7 '))));
+  }
+
+  if (payload.latestAdaptationSummary) {
+    lines.push(keyValue('Adaptation', payload.latestAdaptationSummary));
+  }
+
+  const recommendations = payload.recommendations ?? {};
+  const recEntries = Object.entries(recommendations);
+
+  if (recEntries.length > 0) {
+    lines.push('');
+    lines.push(` ${chalk.bold('Recommendations')}`);
+
+    for (const [exerciseName, rec] of recEntries) {
+      const description = rec.kind === 'increaseWeight'
+        ? `Increase weight by ${rec.amount} ${rec.unit ?? 'kg'}`
+        : rec.kind === 'maintainWeight'
+          ? 'Maintain current weight'
+          : rec.kind ?? 'Adjust';
+      lines.push(`   ${exerciseName.padEnd(20)} ${chalk.dim(description)}`);
+    }
+  }
+
+  return lines.join('\n');
+}
+
+// --- Main export ---
+
+export function formatHelp() {
+  const cmd = (name, desc) => `   ${chalk.bold(name.padEnd(38))} ${chalk.dim(desc)}`;
+  const lines = [
+    '',
+    header('INCREMNT') + dimDot() + chalk.dim('strength tracking CLI'),
+    '',
+    header('USAGE'),
+    `   incremnt <command> [options]`,
+    '',
+    header('COMMANDS'),
+    cmd('sessions list', 'List recent sessions'),
+    cmd('sessions show --id <id>', 'Show session details'),
+    cmd('sessions compare --id <id>', 'Compare planned vs actual'),
+    cmd('sessions explain --id <id>', 'Explain session context'),
+    cmd('programs list', 'List all programs'),
+    cmd('programs current', 'Show active program'),
+    cmd('exercises history --name <name>', 'Exercise history'),
+    cmd('records', 'Personal records'),
+    '',
+    header('AUTH'),
+    cmd('login --base-url <url>', 'Sign in (device flow)'),
+    cmd('login --base-url <url> --token <t>', 'Sign in with token'),
+    cmd('login --snapshot <file>', 'Use local snapshot'),
+    cmd('login --session-file <file>', 'Import session file'),
+    cmd('logout', 'Clear session'),
+    '',
+    header('OTHER'),
+    cmd('status', 'Connection & auth info'),
+    cmd('contract', 'API contract info'),
+    cmd('--json', 'Force JSON output'),
+    cmd('--help', 'Show this help'),
+    '',
+    header('ALIASES'),
+    `   ${chalk.dim('insights')} ${chalk.dim('→')} sessions list${dimDot()}${chalk.dim('prs')} ${chalk.dim('→')} records`,
+    `   ${chalk.dim('history')} ${chalk.dim('→')} exercises history${dimDot()}${chalk.dim('program')} ${chalk.dim('→')} programs current`,
+    ''
+  ];
+
+  return lines.join('\n');
+}
+
+export function formatPretty(command, payload) {
+  const formatter = {
+    records: formatRecords,
+    'session-insights': formatSessionInsights,
+    'session-show': formatSessionShow,
+    'exercise-history': formatExerciseHistory,
+    'program-summary': formatProgramSummary,
+    'program-list': formatProgramList,
+    'planned-vs-actual': formatPlannedVsActual,
+    'why-did-this-change': formatWhyDidThisChange
+  }[command];
+
+  return formatter ? formatter(payload) : null;
 }

package/src/lib.js

@@ -11,7 +11,7 @@ import {
 } from './auth.js';
 import { clearSessionState, isSessionExpired, readSessionState, resolveConfigDir } from './state.js';
 import { createTransport } from './transport.js';
-import { formatPretty } from './format.js';
+import { formatPretty, formatHelp } from './format.js';
 
 function parseArgs(argv) {
   const commandTokens = [];
@@ -68,9 +68,9 @@ export async function runCli(argv, stdout, stderr) {
     explain: 'why-did-this-change'
   })[command] ?? command;
 
-  if (!command) {
-    stderr.write('Usage: incremnt <sessions list|sessions show|sessions compare|sessions explain|programs list|programs current|exercises history|records|status|contract|login|logout> [options]\n');
-    return 1;
+  if (!command || options.help) {
+    stdout.write(`${formatHelp()}\n`);
+    return 0;
   }
 
   const sessionState = await readSessionState();
@@ -160,7 +160,11 @@ export async function runCli(argv, stdout, stderr) {
               } else if (providers.length === 1 && auth?.providers?.google?.configured) {
                 verificationUrl = `${baseUrlNormalized}/auth/google/start?userCode=${userCodeParam}`;
               } else {
-                verificationUrl = `${baseUrlNormalized}${challenge.verificationUri ?? '/auth/device/approve'}?userCode=${userCodeParam}`;
+                const path = challenge.verificationUri ?? '/auth/device/approve';
+                if (!/^\/[a-zA-Z0-9\-._~/]+$/.test(path)) {
+                  throw new Error(`Server returned an invalid verificationUri: ${path}`);
+                }
+                verificationUrl = `${baseUrlNormalized}${path}?userCode=${userCodeParam}`;
               }
 
               stderr.write('Signing in...\n');
@@ -266,8 +270,14 @@ export async function runCli(argv, stdout, stderr) {
 
   try {
     const payload = await transport.executeReadCommand(normalizedCommand, options);
-    const pretty = options.pretty ? formatPretty(normalizedCommand, payload) : null;
-    stdout.write(pretty ? `${pretty}\n` : `${JSON.stringify(payload, null, 2)}\n`);
+    const wantJson = options.json || !(stdout.isTTY ?? false);
+    if (wantJson) {
+      stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+    } else {
+      const pretty = formatPretty(normalizedCommand, payload);
+      stdout.write(`${pretty ?? JSON.stringify(payload, null, 2)}\n`);
+    }
+
     return 0;
   } catch (error) {
     stderr.write(`${error.message}\n`);