incremnt 0.1.13 → 0.1.16

package/src/queries.js

@@ -58,7 +58,8 @@ function sessionSummary(session) {
     recommendations: session.recommendations ?? {},
     historicalContext: session.historicalContext ?? null,
     prescriptionSnapshot: session.prescriptionSnapshot ?? null,
-    aiCoachNotes: session.aiCoachNotes ?? null
+    aiCoachNotes: session.summary?.aiCoachNotes ?? null,
+    aiCoachModel: session.summary?.aiCoachModel ?? null
   };
 }
 
@@ -648,6 +649,39 @@ export function cycleSummaryContext(snapshot, programId) {
     ? { completed: matchingSummary.totalSetsCompleted ?? 0, planned: matchingSummary.totalSetsPlanned ?? 0 }
     : null;
 
+  // Health metrics spanning the cycle
+  const cycleStart = String(cycleSessions[0] ? completionDateForSession(cycleSessions[0]) : '');
+  const cycleEnd = String(cycleSessions[cycleSessions.length - 1]
+    ? completionDateForSession(cycleSessions[cycleSessions.length - 1]) : '');
+  const cycleCardio = (snapshot.healthMetrics?.otherWorkouts ?? [])
+    .filter((w) => w.date >= cycleStart && w.date <= cycleEnd);
+  const cycleRestingHR = (snapshot.healthMetrics?.restingHR ?? [])
+    .filter((m) => m.date >= cycleStart && m.date <= cycleEnd);
+  const cycleHRV = (snapshot.healthMetrics?.hrv ?? [])
+    .filter((m) => m.date >= cycleStart && m.date <= cycleEnd);
+  const cycleVO2Max = (snapshot.healthMetrics?.vo2Max ?? [])
+    .filter((m) => m.date >= cycleStart && m.date <= cycleEnd);
+  const cycleSleep = (snapshot.healthMetrics?.sleep ?? [])
+    .filter((m) => m.date >= cycleStart && m.date <= cycleEnd);
+
+  const avgRestingHR = cycleRestingHR.length > 0
+    ? Math.round(cycleRestingHR.reduce((s, m) => s + m.value, 0) / cycleRestingHR.length)
+    : null;
+  const avgHRV = cycleHRV.length > 0
+    ? Math.round(cycleHRV.reduce((s, m) => s + m.value, 0) / cycleHRV.length)
+    : null;
+  const latestVO2Max = cycleVO2Max.length > 0
+    ? Math.round(cycleVO2Max.at(-1).value * 10) / 10
+    : null;
+  const avgSleepMins = cycleSleep.length > 0
+    ? Math.round(cycleSleep.reduce((s, m) => s + m.durationMins, 0) / cycleSleep.length)
+    : null;
+  const cycleBodyWeight = (snapshot.healthMetrics?.bodyWeight ?? [])
+    .filter((m) => m.date >= cycleStart && m.date <= cycleEnd);
+  const latestBodyWeightKg = cycleBodyWeight.length > 0
+    ? Math.round(cycleBodyWeight.at(-1).value * 10) / 10
+    : null;
+
   return {
     programName: program.name,
     cycleNumber: cycleWeekNumber,
@@ -661,7 +695,13 @@ export function cycleSummaryContext(snapshot, programId) {
     cycleIntent,
     adaptationNote,
     previousCycles,
-    exerciseTrends
+    exerciseTrends,
+    cycleCardio: cycleCardio.length > 0 ? cycleCardio : null,
+    avgRestingHR,
+    avgHRV,
+    latestVO2Max,
+    avgSleepMins,
+    latestBodyWeightKg
   };
 }
 
@@ -692,24 +732,26 @@ export function workoutSummaryContext(snapshot, sessionId) {
     };
   });
 
-  // Find recent sessions with same dayName for comparison (up to 3, excluding current)
+  // Find recent sessions with same dayName for comparison (up to 3, excluding current).
+  // Match across programs so context survives program switches.
   const recentComparisons = sessions
     .filter(
       (s) =>
         s.id !== sessionId &&
-        s.dayName === dayName &&
-        s.programId === session.programId
+        s.dayName === dayName
     )
     .sort((a, b) => String(completionDateForSession(b)).localeCompare(String(completionDateForSession(a))))
     .slice(0, 3)
     .map((s) => ({
       date: completionDateForSession(s),
       totalVolume: s.summary?.totalVolume ?? s.volume ?? 0,
-      effortScore: s.summary?.effortScore ?? null
+      effortScore: s.summary?.effortScore ?? null,
+      programName: s.programName ?? null
     }));
 
-  // Detect PRs — compare each exercise's best e1RM against all prior sessions
+  // Count prior sessions per exercise and track best e1RM scores
   const priorBests = new Map();
+  const exerciseSessionCounts = new Map();
   for (const s of sessions) {
     if (s.id === sessionId) continue;
     const sDate = String(completionDateForSession(s));
@@ -717,9 +759,10 @@ export function workoutSummaryContext(snapshot, sessionId) {
     if (sDate >= currentDate) continue;
 
     for (const exercise of s.exercises ?? []) {
+      const key = normalizeExerciseName(exercise.name);
+      exerciseSessionCounts.set(key, (exerciseSessionCounts.get(key) ?? 0) + 1);
       for (const set of exercise.sets ?? []) {
         if (!set.isComplete) continue;
-        const key = normalizeExerciseName(exercise.name);
         const score = Number(set.weight) * (1 + Number(set.reps) / 30);
         const current = priorBests.get(key);
         if (!current || score > current) priorBests.set(key, score);
@@ -727,14 +770,22 @@ export function workoutSummaryContext(snapshot, sessionId) {
     }
   }
 
+  // Attach prior session count to each exercise
+  for (const ex of exercises) {
+    const key = normalizeExerciseName(ex.exerciseName);
+    ex.priorSessions = exerciseSessionCounts.get(key) ?? 0;
+  }
+
+  // Detect PRs — skip first-time exercises (every set is trivially a "PR")
   const prs = [];
   for (const exercise of session.exercises ?? []) {
     const key = normalizeExerciseName(exercise.name);
+    if (!priorBests.has(key)) continue;
     for (const set of exercise.sets ?? []) {
       if (!set.isComplete) continue;
       const score = Number(set.weight) * (1 + Number(set.reps) / 30);
       const prior = priorBests.get(key);
-      if (!prior || score > prior) {
+      if (score > prior) {
         prs.push({
           exerciseName: exercise.name,
           weight: set.weight,
@@ -760,19 +811,246 @@ export function workoutSummaryContext(snapshot, sessionId) {
     }
   }
 
+  const isAdhoc = !session.programId;
+
+  // Include other workouts from the 7 days before this session for coach context
+  const sessionDateStr = String(sessionDate);
+  const weekBefore = new Date(new Date(sessionDateStr).getTime() - 7 * 24 * 60 * 60 * 1000)
+    .toISOString().slice(0, 10);
+  const nearbyCardio = (snapshot.healthMetrics?.otherWorkouts ?? [])
+    .filter((w) => w.date >= weekBefore && w.date <= sessionDateStr);
+
+  const restingHROnDay = (snapshot.healthMetrics?.restingHR ?? [])
+    .find((m) => m.date === sessionDateStr);
+  const hrvOnDay = (snapshot.healthMetrics?.hrv ?? [])
+    .find((m) => m.date === sessionDateStr);
+  const sleepNight = (snapshot.healthMetrics?.sleep ?? [])
+    .find((m) => m.date === sessionDateStr);
+  const vo2MaxRecent = (snapshot.healthMetrics?.vo2Max ?? [])
+    .filter((m) => m.date >= weekBefore && m.date <= sessionDateStr);
+  const vo2MaxLatest = vo2MaxRecent.length > 0
+    ? Math.round(vo2MaxRecent.at(-1).value * 10) / 10
+    : null;
+  const bodyWeightOnDay = (snapshot.healthMetrics?.bodyWeight ?? [])
+    .find((m) => m.date === sessionDateStr);
+  const bodyWeightKg = bodyWeightOnDay
+    ? Math.round(bodyWeightOnDay.value * 10) / 10
+    : null;
+
   const result = {
     sessionDate,
     dayName,
+    programName: session.programName ?? null,
+    isAdhoc,
     totalVolume: session.summary?.totalVolume ?? session.volume ?? 0,
     effortScore: session.summary?.effortScore ?? null,
     exercises,
     recentComparisons,
-    prs
+    prs,
+    nearbyCardio: nearbyCardio.length > 0 ? nearbyCardio : null,
+    restingHROnDay: restingHROnDay?.value ?? null,
+    hrvOnDay: hrvOnDay?.value ?? null,
+    vo2MaxLatest,
+    sleepNight: sleepNight ?? null,
+    bodyWeightKg
   };
   if (planComparison) result.planComparison = planComparison;
   return result;
 }
 
+export function askContext(snapshot) {
+  const sessions = snapshot.sessions ?? [];
+  const lines = [];
+
+  lines.push(`Training overview: ${sessions.length} total workouts logged.`);
+
+  // Training frequency (last 4 weeks)
+  const fourWeeksAgo = new Date(Date.now() - 28 * 24 * 60 * 60 * 1000).toISOString();
+  const recentCount = sessions.filter((s) => String(completionDateForSession(s)) >= fourWeeksAgo).length;
+  if (recentCount > 0) {
+    const perWeek = (recentCount / 4).toFixed(1);
+    lines.push(`Recent frequency: ${perWeek} sessions/week (last 4 weeks).`);
+  }
+
+  // Current program
+  const program = activeProgram(snapshot);
+  if (program) {
+    lines.push(`Current program: ${program.name}, ${program.daysPerWeek} days/week, equipment: ${program.equipmentTier ?? 'unknown'}.`);
+  }
+
+  // Best e1RM records (top 15)
+  const bestByExercise = new Map();
+  for (const session of sessions) {
+    for (const exercise of session.exercises ?? []) {
+      const key = normalizeExerciseName(exercise.name);
+      for (const set of exercise.sets ?? []) {
+        if (!set.isComplete) continue;
+        const e1rm = Number(set.weight) * (1 + Number(set.reps) / 30);
+        const current = bestByExercise.get(key);
+        if (!current || e1rm > current.e1rm) {
+          bestByExercise.set(key, { name: exercise.name, e1rm });
+        }
+      }
+    }
+  }
+
+  const records = [...bestByExercise.values()]
+    .filter((r) => r.e1rm > 0)
+    .sort((a, b) => b.e1rm - a.e1rm)
+    .slice(0, 15);
+
+  if (records.length > 0) {
+    lines.push('');
+    lines.push('Best estimated 1RM records:');
+    for (const r of records) {
+      lines.push(`  ${r.name}: ${r.e1rm.toFixed(1)} kg`);
+    }
+  }
+
+  // Recent sessions (last 10)
+  const recentSessions = sessions.slice(-10);
+  if (recentSessions.length > 0) {
+    lines.push('');
+    lines.push('Recent sessions (newest last):');
+    for (const session of recentSessions) {
+      const dateStr = completionDateForSession(session);
+      const dayLabel = session.dayName ?? session.programName ?? 'Workout';
+      const exerciseNames = (session.exercises ?? []).map((e) => e.name).join(', ');
+      const volume = session.summary?.totalVolume ?? session.volume ?? 0;
+      let line = `  ${dateStr} - ${dayLabel}: ${exerciseNames}`;
+      if (volume > 0) line += ` (${volume} kg volume)`;
+      lines.push(line);
+
+      for (const exercise of session.exercises ?? []) {
+        const completedSets = (exercise.sets ?? []).filter((s) => s.isComplete);
+        if (completedSets.length === 0) continue;
+        const topSet = completedSets.reduce((best, s) => {
+          const score = Number(s.weight) * Number(s.reps);
+          const bestScore = Number(best.weight) * Number(best.reps);
+          return score > bestScore ? s : best;
+        });
+        lines.push(`    ${exercise.name}: ${completedSets.length} sets, top ${Number(topSet.weight).toFixed(1)}x${topSet.reps}`);
+      }
+    }
+  }
+
+  appendHealthMetricsContext(lines, snapshot.healthMetrics, { recentDays: 14 });
+
+  return lines.join('\n');
+}
+
+function appendHealthMetricsContext(lines, metrics, { recentDays = 14 } = {}) {
+  if (!metrics) return;
+
+  const cutoff = new Date(Date.now() - recentDays * 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
+
+  const recentWorkouts = (metrics.otherWorkouts ?? []).filter((w) => w.date >= cutoff);
+  if (recentWorkouts.length > 0) {
+    lines.push('');
+    lines.push(`Other workouts (last ${recentDays} days):`);
+    for (const w of recentWorkouts) {
+      const parts = [`${w.durationSecs ? Math.round(w.durationSecs / 60) : '?'} min`];
+      if (w.distanceKm) parts.push(`${w.distanceKm.toFixed(1)} km`);
+      if (w.avgHR) parts.push(`avg HR ${w.avgHR} bpm`);
+      if (w.calories) parts.push(`${w.calories} kcal`);
+      if (w.effortScore) parts.push(`effort ${w.effortScore}/10`);
+      lines.push(`  ${w.date} ${w.workoutType}: ${parts.join(', ')}`);
+    }
+  }
+
+  const recentRestingHR = (metrics.restingHR ?? []).filter((m) => m.date >= cutoff);
+  if (recentRestingHR.length > 0) {
+    const avg = Math.round(recentRestingHR.reduce((s, m) => s + m.value, 0) / recentRestingHR.length);
+    const latest = recentRestingHR[recentRestingHR.length - 1];
+    lines.push('');
+    lines.push(`Resting HR (last ${recentDays} days): avg ${avg} bpm, latest ${Math.round(latest.value)} bpm (${latest.date})`);
+  }
+
+  const recentHRV = (metrics.hrv ?? []).filter((m) => m.date >= cutoff);
+  if (recentHRV.length > 0) {
+    const avg = Math.round(recentHRV.reduce((s, m) => s + m.value, 0) / recentHRV.length);
+    const latest = recentHRV[recentHRV.length - 1];
+    lines.push(`HRV (last ${recentDays} days): avg ${avg} ms, latest ${Math.round(latest.value)} ms (${latest.date})`);
+  }
+
+  const recentVO2Max = (metrics.vo2Max ?? []).filter((m) => m.date >= cutoff);
+  if (recentVO2Max.length > 0) {
+    const latest = recentVO2Max[recentVO2Max.length - 1];
+    lines.push(`VO2 Max: ${Math.round(latest.value * 10) / 10} ml/kg/min (${latest.date})`);
+  }
+
+  const recentSleep = (metrics.sleep ?? []).filter((m) => m.date >= cutoff);
+  if (recentSleep.length > 0) {
+    const avgMins = Math.round(recentSleep.reduce((s, m) => s + m.durationMins, 0) / recentSleep.length);
+    const avgHours = (avgMins / 60).toFixed(1);
+    lines.push(`Sleep (last ${recentDays} days): avg ${avgHours}h/night`);
+  }
+
+  const recentBodyWeight = (metrics.bodyWeight ?? []).filter((m) => m.date >= cutoff);
+  if (recentBodyWeight.length > 0) {
+    const latest = recentBodyWeight[recentBodyWeight.length - 1];
+    const earliest = recentBodyWeight[0];
+    const delta = (latest.value - earliest.value).toFixed(1);
+    const trend = delta > 0 ? `+${delta}` : delta;
+    lines.push(`Body weight (last ${recentDays} days): latest ${latest.value.toFixed(1)} kg (${latest.date}), ${recentBodyWeight.length} readings, trend ${trend} kg`);
+  }
+}
+
+function healthSummary(snapshot, days = 14) {
+  const metrics = snapshot.healthMetrics;
+  if (!metrics) return { available: false };
+
+  const cutoff = new Date(Date.now() - days * 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
+
+  const recentWorkouts = (metrics.otherWorkouts ?? []).filter((w) => w.date >= cutoff);
+  const recentRestingHR = (metrics.restingHR ?? []).filter((m) => m.date >= cutoff);
+  const recentHRV = (metrics.hrv ?? []).filter((m) => m.date >= cutoff);
+  const recentVO2Max = (metrics.vo2Max ?? []).filter((m) => m.date >= cutoff);
+  const recentSleep = (metrics.sleep ?? []).filter((m) => m.date >= cutoff);
+
+  const avg = (arr) => arr.length > 0 ? arr.reduce((s, m) => s + m.value, 0) / arr.length : null;
+
+  return {
+    available: true,
+    days,
+    cardio: recentWorkouts.map((w) => ({
+      date: w.date,
+      workoutType: w.workoutType,
+      durationMins: w.durationSecs ? Math.round(w.durationSecs / 60) : null,
+      distanceKm: w.distanceKm ?? null,
+      avgHR: w.avgHR ?? null,
+      calories: w.calories ?? null
+    })),
+    restingHR: {
+      avg: recentRestingHR.length > 0 ? Math.round(avg(recentRestingHR)) : null,
+      latest: recentRestingHR.length > 0 ? { value: Math.round(recentRestingHR.at(-1).value), date: recentRestingHR.at(-1).date } : null,
+      readings: recentRestingHR.length
+    },
+    hrv: {
+      avg: recentHRV.length > 0 ? Math.round(avg(recentHRV)) : null,
+      latest: recentHRV.length > 0 ? { value: Math.round(recentHRV.at(-1).value), date: recentHRV.at(-1).date } : null,
+      readings: recentHRV.length
+    },
+    vo2Max: {
+      latest: recentVO2Max.length > 0 ? { value: Math.round(recentVO2Max.at(-1).value * 10) / 10, date: recentVO2Max.at(-1).date } : null,
+      readings: recentVO2Max.length
+    },
+    sleep: {
+      avgHours: recentSleep.length > 0 ? Math.round(recentSleep.reduce((s, m) => s + m.durationMins, 0) / recentSleep.length / 60 * 10) / 10 : null,
+      nights: recentSleep.length
+    },
+    bodyWeight: (() => {
+      const recent = (metrics.bodyWeight ?? []).filter((m) => m.date >= cutoff);
+      if (recent.length === 0) return { latest: null, readings: 0 };
+      return {
+        latest: { value: Math.round(recent.at(-1).value * 10) / 10, date: recent.at(-1).date },
+        trend: Math.round((recent.at(-1).value - recent[0].value) * 10) / 10,
+        readings: recent.length
+      };
+    })()
+  };
+}
+
 function requiredOption(options, primaryKey, legacyKey = null) {
   return options[primaryKey] ?? (legacyKey ? options[legacyKey] : undefined);
 }
@@ -894,5 +1172,10 @@ export function executeReadCommand(snapshot, normalizedCommand, options = {}) {
     return { ok: true, payload };
   }
 
+  if (normalizedCommand === 'health-summary') {
+    const days = Number.parseInt(options.days ?? '14', 10);
+    return { ok: true, payload: healthSummary(snapshot, Number.isNaN(days) ? 14 : days) };
+  }
+
   return { ok: false, error: `Unknown read command: ${normalizedCommand}` };
 }

package/src/remote.js

@@ -29,10 +29,15 @@ const remoteCommandHandlers = {
   'program-list': executeRemoteRead,
   'program-summary': executeRemoteRead,
   'program-detail': executeRemoteRead,
+  'cycle-summary-list': executeRemoteRead,
+  'cycle-summary-show': executeRemoteRead,
   'planned-vs-actual': executeRemoteRead,
   'why-did-this-change': executeRemoteRead,
   'goals-list': executeRemoteRead,
-  'goals-show': executeRemoteRead
+  'goals-show': executeRemoteRead,
+  'health-summary': executeRemoteRead,
+  'ask-history': executeRemoteRead,
+  'ask-show': executeRemoteRead
 };
 
 async function executeRemoteRead(options, sessionState, normalizedCommand) {
@@ -111,6 +116,15 @@ function endpointForCommand(baseUrl, normalizedCommand, options) {
       return resolveServiceUrl(baseUrl, '/cli/programs/current');
     case 'program-detail':
       return resolveServiceUrl(baseUrl, options.id ? `/cli/programs/${options.id}` : '/cli/programs/active');
+    case 'cycle-summary-list': {
+      const cyclesUrl = resolveServiceUrl(baseUrl, '/cli/cycles');
+      if (options['program-id']) {
+        cyclesUrl.searchParams.set('program-id', options['program-id']);
+      }
+      return cyclesUrl;
+    }
+    case 'cycle-summary-show':
+      return resolveServiceUrl(baseUrl, `/cli/cycles/${options.id}`);
     case 'exercise-history': {
       const historyUrl = resolveServiceUrl(baseUrl, '/cli/exercises/history');
       historyUrl.searchParams.set('name', options.name ?? options.exercise);
@@ -122,6 +136,22 @@ function endpointForCommand(baseUrl, normalizedCommand, options) {
       return resolveServiceUrl(baseUrl, '/cli/goals');
     case 'goals-show':
       return resolveServiceUrl(baseUrl, options.id ? `/cli/goals/${options.id}` : '/cli/goals');
+    case 'health-summary': {
+      const healthUrl = resolveServiceUrl(baseUrl, '/cli/health/summary');
+      if (options.days) {
+        healthUrl.searchParams.set('days', options.days);
+      }
+      return healthUrl;
+    }
+    case 'ask-history': {
+      const askUrl = resolveServiceUrl(baseUrl, '/cli/ask/history');
+      if (options.limit) {
+        askUrl.searchParams.set('limit', options.limit);
+      }
+      return askUrl;
+    }
+    case 'ask-show':
+      return resolveServiceUrl(baseUrl, `/cli/ask/history/${options.id}`);
     default:
       return resolveServiceUrl(baseUrl, '/');
   }
@@ -136,6 +166,14 @@ function resourceNotFoundMessage(normalizedCommand, options) {
     return `Session not found: ${options['session-id']}`;
   }
 
+  if (normalizedCommand === 'cycle-summary-show') {
+    return `Cycle summary not found: ${options.id}`;
+  }
+
+  if (normalizedCommand === 'ask-show') {
+    return `Conversation not found: ${options.id}`;
+  }
+
   return 'Requested resource was not found.';
 }