incremnt 0.8.3 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incremnt",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Command-line tool for querying your incremnt strength training data",
   "license": "MIT",
   "type": "module",

package/src/ask-coach.js

@@ -539,18 +539,18 @@ function pushAskContextHeader(lines, snapshot, today = new Date()) {
 const ASK_FACT_KIND_BY_ROUTE = Object.freeze({
   general: ['goal_signal', 'preference', 'constraint', 'injury', 'tone'],
   progress_review: ['goal_signal', 'preference', 'constraint', 'injury', 'tone'],
-  exercise_progress: ['goal_signal', 'injury', 'constraint', 'preference'],
-  exercise_progress_summary: ['goal_signal', 'injury', 'constraint', 'preference'],
-  program_progress: ['goal_signal', 'preference', 'constraint', 'injury'],
+  exercise_progress: ['goal_signal', 'injury', 'constraint', 'preference', 'tone'],
+  exercise_progress_summary: ['goal_signal', 'injury', 'constraint', 'preference', 'tone'],
+  program_progress: ['goal_signal', 'preference', 'constraint', 'injury', 'tone'],
   training_profile: ['goal_signal', 'preference', 'constraint', 'injury', 'tone'],
-  program_design: ['goal_signal', 'preference', 'constraint', 'injury'],
-  next_session: ['constraint', 'injury', 'preference', 'goal_signal'],
-  recent_session: ['injury', 'constraint', 'goal_signal'],
+  program_design: ['goal_signal', 'preference', 'constraint', 'injury', 'tone'],
+  next_session: ['constraint', 'injury', 'preference', 'goal_signal', 'tone'],
+  recent_session: ['injury', 'constraint', 'goal_signal', 'tone'],
   recovery: ['injury', 'constraint', 'tone'],
-  body_weight: ['goal_signal'],
-  volume: ['goal_signal', 'constraint'],
-  records: ['goal_signal'],
-  score: ['goal_signal', 'constraint']
+  body_weight: ['goal_signal', 'tone'],
+  volume: ['goal_signal', 'constraint', 'tone'],
+  records: ['goal_signal', 'tone'],
+  score: ['goal_signal', 'constraint', 'tone']
 });
 
 function normalizeCoachFactForContext(row) {
@@ -611,6 +611,13 @@ function appendCoachFactsContext(lines, facts) {
       .join(', ');
     lines.push(`  [${fact.kind}] ${fact.fact}${provenance ? ` (${provenance})` : ''}`);
   }
+  const toneFacts = facts
+    .filter((fact) => fact.kind === 'tone')
+    .map((fact) => fact.fact)
+    .filter(Boolean);
+  if (toneFacts.length > 0) {
+    lines.push(`Answer style preference to carry explicitly: ${toneFacts.join(' ')}`);
+  }
   return facts.map((fact) => fact.id).filter(Boolean);
 }
 
@@ -857,17 +864,29 @@ function appendReadinessSummary(lines, readiness) {
 // Per-route prose builders that compose tool results into the routed
 // Ask Coach context, attaching provenance for each section.
 
+function appendWeeklyVolumeEvidence(lines, weeklyVolume) {
+  const facts = weeklyVolume?.facts ?? {};
+  const isPartial = facts.currentWeekIsPartial === true;
+  const currentLabel = isPartial ? 'Week-to-date strength volume' : 'This week strength volume';
+  const previousLabel = 'Previous full week strength volume';
+  lines.push(`${currentLabel}: ${facts.currentWeekVolume} kg across ${facts.currentWeekSessionCount} session${facts.currentWeekSessionCount === 1 ? '' : 's'}.`);
+  lines.push(`${previousLabel}: ${facts.previousWeekVolume} kg across ${facts.previousWeekSessionCount} session${facts.previousWeekSessionCount === 1 ? '' : 's'}.`);
+  if (facts.deltaPct != null) {
+    const prefix = facts.deltaPct >= 0 ? '+' : '';
+    const comparison = isPartial
+      ? 'Week-to-date versus previous full week strength volume'
+      : 'Week-over-week strength volume change';
+    lines.push(`${comparison}: ${prefix}${facts.deltaPct}%.`);
+  }
+}
+
 function buildVolumeAskContext(snapshot, { exclude = new Set(), today = new Date() } = {}) {
   const lines = [];
   const weeklyVolume = executeCoachReadTool(snapshot, 'get_weekly_volume', { today });
   pushAskContextHeader(lines, snapshot, today);
 
   lines.push('');
-  lines.push(`This week strength volume: ${weeklyVolume.facts.currentWeekVolume} kg across ${weeklyVolume.facts.currentWeekSessionCount} session${weeklyVolume.facts.currentWeekSessionCount === 1 ? '' : 's'}.`);
-  lines.push(`Previous week strength volume: ${weeklyVolume.facts.previousWeekVolume} kg across ${weeklyVolume.facts.previousWeekSessionCount} session${weeklyVolume.facts.previousWeekSessionCount === 1 ? '' : 's'}.`);
-  if (weeklyVolume.facts.deltaPct != null) {
-    lines.push(`Week-over-week strength volume change: ${weeklyVolume.facts.deltaPct >= 0 ? '+' : ''}${weeklyVolume.facts.deltaPct}%.`);
-  }
+  appendWeeklyVolumeEvidence(lines, weeklyVolume);
   const thisWeekRows = weeklyVolume.rows.filter((row) => row.week === 'current');
   if (thisWeekRows.length > 0) {
     lines.push('This week sessions:');
@@ -911,10 +930,48 @@ function buildIncrementScoreAskContext(snapshot, { exclude = new Set(), today =
 }
 
 function formattedCompletedSets(sets = []) {
-  return sets.map((set) => {
+  const groups = [];
+  for (const set of sets) {
+    const weight = Number(set.weight) || 0;
+    const label = weight > 0 ? `${formatCompactWeight(weight)}kg` : 'BW';
+    const previous = groups.at(-1);
+    if (previous?.label === label) {
+      previous.reps.push(set.reps);
+    } else {
+      groups.push({ label, reps: [set.reps] });
+    }
+  }
+  return groups.map((group) => `${group.label}: ${group.reps.join('/')}`).join(', ');
+}
+
+function formattedCompletedSetShorthand(sets = []) {
+  const groups = [];
+  for (const set of sets) {
     const weight = Number(set.weight) || 0;
-    return weight > 0 ? `${weight.toFixed(1)}x${set.reps}` : `BWx${set.reps}`;
-  }).join(', ');
+    const label = weight > 0 ? formatCompactWeight(weight) : 'BW';
+    const previous = groups.at(-1);
+    if (previous?.label === label) {
+      previous.reps.push(set.reps);
+    } else {
+      groups.push({ label, reps: [set.reps] });
+    }
+  }
+  return groups.map((group) => `${group.label}x${group.reps.join('/')}`).join(', ');
+}
+
+function formattedSetShorthandList(sets = []) {
+  return sets
+    .map((set) => {
+      const weight = Number(set.weight) || 0;
+      const label = weight > 0 ? formatCompactWeight(weight) : 'BW';
+      return `${label}x${set.reps}`;
+    })
+    .join(', ');
+}
+
+function formatCompactWeight(weight) {
+  const rounded = Math.round(Number(weight) * 10) / 10;
+  return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
 }
 
 function formatRepDelta(delta) {
@@ -971,6 +1028,11 @@ function formatComparableSetDelta(exercise) {
   if (currentSets.length !== previousSets.length || currentTotalReps !== previousTotalReps) {
     details.push(`total reps ${currentTotalReps} vs ${previousTotalReps}${currentSets.length !== previousSets.length ? ` across ${currentSets.length} vs ${previousSets.length} sets` : ''}`);
   }
+  const currentSetList = formattedSetShorthandList(currentSets);
+  const previousSetList = formattedSetShorthandList(previousSets);
+  if (currentSetList && previousSetList) {
+    details.push(`current sets ${currentSetList}; previous sets ${previousSetList}`);
+  }
   if (regressionFlag) {
     details.push('regression flag: reps dropped sharply despite the load/set context');
   }
@@ -1079,7 +1141,9 @@ function buildExerciseProgressAskContext(snapshot, namedExercises, { exclude = n
     for (const row of exerciseHistoryTool.rows) {
       const comparison = formatTopSetComparison(row);
       const warmups = row.warmupSetCount > 0 ? `; ${row.warmupSetCount} warmup set${row.warmupSetCount === 1 ? '' : 's'} excluded` : '';
-      lines.push(`  ${row.date}${formatRecencySuffix(row)} - ${row.exerciseName}: ${formattedCompletedSets(row.sets)}${comparison ? `; ${comparison}` : ''}${warmups}`);
+      const shorthand = formattedCompletedSetShorthand(row.sets);
+      lines.push(`  ${row.date}${formatRecencySuffix(row)} - ${row.exerciseName}: ${formattedCompletedSets(row.sets)}${shorthand ? ` (compact: ${shorthand})` : ''}${comparison ? `; ${comparison}` : ''}${warmups}`);
+      if (row.recommendation) lines.push(`    Recommendation after session: ${formatRecommendation(row.recommendation)}`);
     }
     appendExerciseHistoryNotes(lines, exerciseHistoryTool.rows);
   }
@@ -1091,9 +1155,21 @@ function buildExerciseProgressAskContext(snapshot, namedExercises, { exclude = n
 
 function formatProgressPoint(point) {
   if (!point) return 'unknown';
-  const load = Number(point.weight) > 0 ? `${point.weight}x${point.reps}` : `BWx${point.reps}`;
-  const metric = point.progressMetric === 'reps' ? `reps ${point.progressValue ?? point.reps}` : `e1RM ${point.e1rm}`;
-  return `${point.date}: ${load} (${metric})`;
+  const load = Number(point.weight) > 0 ? `${formatCompactWeight(point.weight)}x${point.reps}` : `BWx${point.reps}`;
+  return `${point.date}: ${load}`;
+}
+
+function progressVerdict(row) {
+  const bestDelta = Number(row?.bestDeltaFromFirst);
+  const latestDelta = Number(row?.latestDeltaFromFirst);
+  const latestFromBest = Number(row?.latestDeltaFromBest);
+  if (Number.isFinite(bestDelta) && bestDelta > 0 && Number.isFinite(latestFromBest) && latestFromBest < 0) {
+    return 'peaked early, then dipped';
+  }
+  if (Number.isFinite(latestDelta) && latestDelta > 0) return 'latest is up from first';
+  if (Number.isFinite(latestDelta) && latestDelta < 0) return 'latest is down from first';
+  if (Number.isFinite(latestDelta)) return 'latest matches first';
+  return null;
 }
 
 function appendProgressSummaryRows(lines, rows = []) {
@@ -1111,7 +1187,8 @@ function appendProgressSummaryRows(lines, rows = []) {
     const latestDropFromBest = row.latestDeltaFromBest == null
       ? ''
       : `, latest vs best ${row.latestDeltaFromBest > 0 ? '+' : ''}${row.latestDeltaFromBest}`;
-    lines.push(`  ${row.exerciseName}: first ${formatProgressPoint(row.first)}; best ${formatProgressPoint(row.best)}; latest ${formatProgressPoint(row.latest)}${bestDelta}${latestDelta}${latestDropFromBest}.`);
+    const verdict = progressVerdict(row);
+    lines.push(`  ${row.exerciseName}: first ${formatProgressPoint(row.first)}; best ${formatProgressPoint(row.best)}; latest ${formatProgressPoint(row.latest)}${bestDelta}${latestDelta}${latestDropFromBest}${verdict ? `; tracking verdict: ${verdict}` : ''}.`);
   }
 }
 
@@ -1345,9 +1422,11 @@ function appendExpansiveEvidenceContextBeforeExcludeNote(lines, snapshot, {
   exclude = new Set(),
   today = new Date(),
   namedExercises = [],
-  existingSections = []
+  existingSections = [],
+  omitSections = []
 } = {}) {
   const sections = new Set(existingSections);
+  const omitted = new Set(omitSections);
   const note = buildExcludeNote(exclude);
   const noteAtEnd = note && lines.at(-1) === note;
   if (noteAtEnd) {
@@ -1364,24 +1443,20 @@ function appendExpansiveEvidenceContextBeforeExcludeNote(lines, snapshot, {
     addedSections.push(section);
   };
 
-  if (!sections.has('increment_score')) {
+  if (!sections.has('increment_score') && !omitted.has('increment_score')) {
     const incrementScore = executeCoachReadTool(snapshot, 'get_increment_score', { historyDays: 21 });
     appendIncrementScoreEvidence(lines, incrementScore);
     addTool('increment_score', incrementScore);
   }
 
-  if (!sections.has('weekly_volume')) {
+  if (!sections.has('weekly_volume') && !omitted.has('weekly_volume')) {
     const weeklyVolume = executeCoachReadTool(snapshot, 'get_weekly_volume', { today });
     lines.push('');
-    lines.push(`This week strength volume: ${weeklyVolume.facts.currentWeekVolume} kg across ${weeklyVolume.facts.currentWeekSessionCount} session${weeklyVolume.facts.currentWeekSessionCount === 1 ? '' : 's'}.`);
-    lines.push(`Previous week strength volume: ${weeklyVolume.facts.previousWeekVolume} kg across ${weeklyVolume.facts.previousWeekSessionCount} session${weeklyVolume.facts.previousWeekSessionCount === 1 ? '' : 's'}.`);
-    if (weeklyVolume.facts.deltaPct != null) {
-      lines.push(`Week-over-week strength volume change: ${weeklyVolume.facts.deltaPct >= 0 ? '+' : ''}${weeklyVolume.facts.deltaPct}%.`);
-    }
+    appendWeeklyVolumeEvidence(lines, weeklyVolume);
     addTool('weekly_volume', weeklyVolume);
   }
 
-  if (!sections.has('records')) {
+  if (!sections.has('records') && !omitted.has('records')) {
     const records = executeCoachReadTool(snapshot, 'get_records', {
       exercises: namedExercises,
       limit: namedExercises.length > 0 ? Math.max(5, namedExercises.length) : 10,
@@ -1391,7 +1466,7 @@ function appendExpansiveEvidenceContextBeforeExcludeNote(lines, snapshot, {
     addTool('records', records);
   }
 
-  if (!sections.has('body_weight')) {
+  if (!sections.has('body_weight') && !omitted.has('body_weight')) {
     const bodyWeight = executeCoachReadTool(snapshot, 'get_body_weight_snapshot', {
       recentDays: 30,
       exclude: [...exclude],
@@ -1401,7 +1476,7 @@ function appendExpansiveEvidenceContextBeforeExcludeNote(lines, snapshot, {
     addTool('body_weight', bodyWeight);
   }
 
-  if (!sections.has('readiness')) {
+  if (!sections.has('readiness') && !omitted.has('readiness')) {
     const readiness = executeCoachReadTool(snapshot, 'get_readiness_snapshot', {
       recentDays: 14,
       exclude: [...exclude],
@@ -1411,7 +1486,7 @@ function appendExpansiveEvidenceContextBeforeExcludeNote(lines, snapshot, {
     addTool('readiness', readiness);
   }
 
-  if (!sections.has('goal_status')) {
+  if (!sections.has('goal_status') && !omitted.has('goal_status')) {
     const goalStatus = executeCoachReadTool(snapshot, 'get_goal_status', { limit: 5 });
     appendGoalStatusEvidence(lines, goalStatus);
     addTool('goal_status', goalStatus);
@@ -1468,6 +1543,7 @@ function buildRecentSessionAskContext(snapshot, { exclude = new Set(), today = n
       const setsStr = formattedCompletedSets(exercise.sets);
       const warmups = exercise.warmupSetCount > 0 ? `; ${exercise.warmupSetCount} warmup set${exercise.warmupSetCount === 1 ? '' : 's'} excluded` : '';
       if (setsStr) lines.push(`  ${exercise.name}: ${setsStr}${warmups}`);
+      if (exercise.recommendation) lines.push(`    Recommendation after session: ${formatRecommendation(exercise.recommendation)}`);
       const setDelta = formatComparableSetDelta(exercise);
       if (setDelta) lines.push(`    ${setDelta}`);
     }
@@ -1636,11 +1712,7 @@ function buildProgressReviewAskContext(snapshot, { exclude = new Set(), since =
 
   // Weekly volume with week-over-week direction.
   lines.push('');
-  lines.push(`This week strength volume: ${weeklyVolume.facts.currentWeekVolume} kg across ${weeklyVolume.facts.currentWeekSessionCount} session${weeklyVolume.facts.currentWeekSessionCount === 1 ? '' : 's'}.`);
-  lines.push(`Previous week strength volume: ${weeklyVolume.facts.previousWeekVolume} kg across ${weeklyVolume.facts.previousWeekSessionCount} session${weeklyVolume.facts.previousWeekSessionCount === 1 ? '' : 's'}.`);
-  if (weeklyVolume.facts.deltaPct != null) {
-    lines.push(`Week-over-week strength volume change: ${weeklyVolume.facts.deltaPct >= 0 ? '+' : ''}${weeklyVolume.facts.deltaPct}%.`);
-  }
+  appendWeeklyVolumeEvidence(lines, weeklyVolume);
 
   // Per-session top sets so the model can see real progression, not just names.
   const recent = recentSessions.rows.slice().reverse();
@@ -2048,7 +2120,7 @@ function followUpSuggestionsForAsk(route, intent, { question = '', missingDataFl
     volume: ['What should I do next session?', 'Is this too much weekly volume?'],
     next_session: ['What should I watch for during that session?', 'Should I adjust the first exercise?'],
     recovery: ['Should I train tomorrow?', 'What would be a conservative version?'],
-    recent_session: ['Why did that session feel hard?', 'What should I change next time?'],
+    recent_session: ['What should I take from that session?', 'What should I aim for next time?', 'What should I change next time?'],
     body_weight: bodyWeightFollowUpCandidates(missingDataFlags),
     score: ['What is pulling my score down?', 'What should I focus on this week?'],
     program_progress: ['Pull this block summary.', 'Break down a specific lift.', 'What is the next decision?'],
@@ -2229,6 +2301,7 @@ function appendAskAnswerContract(lines, {
   namedExerciseLabels = [],
   builtTools = [],
   sessionObservationComparisons = [],
+  includedFacts = [],
   question = ''
 } = {}) {
   const note = buildExcludeNote(new Set());
@@ -2241,6 +2314,15 @@ function appendAskAnswerContract(lines, {
   const contract = [];
   const fullExerciseNames = namedExerciseLabels.filter(Boolean);
   const text = String(question ?? '').toLowerCase();
+  const toneFacts = includedFacts
+    .filter((fact) => fact.kind === 'tone')
+    .map((fact) => fact.fact)
+    .filter(Boolean);
+
+  if (fullExerciseNames.length > 0) {
+    contract.push('Answer contract: named exercise identity.');
+    contract.push(`  Use the exact exercise name(s): ${fullExerciseNames.join(', ')}.`);
+  }
 
   if (responseProfile === ASK_RESPONSE_PROFILES.defensive) {
     contract.push('Answer contract: defensive decision.');
@@ -2248,12 +2330,17 @@ function appendAskAnswerContract(lines, {
     contract.push('  Name the relevant exercise exactly as written in the evidence.');
     contract.push('  Use compact set notation from the evidence when citing sets, e.g. 70x5 or 67.5x7.');
     contract.push('  Do not mention record estimates or PRs unless the user explicitly asked about them.');
-    contract.push('  If the latest relevant session is older than 14 days, do not use the word "recent"; say "latest logged" or give the days-ago label.');
+    contract.push('  If the latest relevant session is older than 14 days, do not use the word "recent" anywhere; say "latest logged", "stale", or give the days-ago label.');
     if (fullExerciseNames.length > 0) {
       contract.push(`  Relevant exercise name(s) to preserve: ${fullExerciseNames.join(', ')}.`);
     }
   }
 
+  if (toneFacts.some((fact) => /\bconcise\b/i.test(fact))) {
+    contract.push('Answer contract: typed tone fact.');
+    contract.push('  Mention the user preference for concise coaching cues using the word "concise".');
+  }
+
   if (route === 'progress_review') {
     const weeklyVolume = builtTools.find((tool) => tool.toolName === 'get_weekly_volume');
     const recentSessions = builtTools.find((tool) => tool.toolName === 'get_recent_sessions');
@@ -2263,6 +2350,7 @@ function appendAskAnswerContract(lines, {
     const previousSessions = weeklyVolume?.facts?.previousWeekSessionCount;
     const strengthSessionCount = recentSessions?.rows?.length;
     const volumeDeltaPct = weeklyVolume?.facts?.deltaPct;
+    const currentWeekIsPartial = weeklyVolume?.facts?.currentWeekIsPartial === true;
     const recentRecordCount = records?.facts?.recentRecordCount;
     const readinessFacts = readiness?.facts ?? {};
     const readinessPhrases = [
@@ -2276,10 +2364,14 @@ function appendAskAnswerContract(lines, {
     if (Number.isFinite(Number(strengthSessionCount)) && Number(strengthSessionCount) > 0) {
       contract.push(`  Include this exact strength-session phrase: "${strengthSessionCount} sessions".`);
     }
-    if (Number.isFinite(Number(currentSessions)) && Number.isFinite(Number(previousSessions))) {
+    if (
+      Number.isFinite(Number(currentSessions))
+      && Number.isFinite(Number(previousSessions))
+      && Number(currentSessions) === Number(previousSessions)
+    ) {
       contract.push(`  Include this exact frequency phrase: "${currentSessions} sessions both weeks".`);
     }
-    if (Number.isFinite(Number(volumeDeltaPct))) {
+    if (Number.isFinite(Number(volumeDeltaPct)) && !currentWeekIsPartial) {
       const direction = Number(volumeDeltaPct) < 0 ? 'drop' : 'increase';
       contract.push(`  Include this exact weekly volume phrase: "${Math.abs(Number(volumeDeltaPct))}% ${direction}".`);
     }
@@ -2306,7 +2398,7 @@ function appendAskAnswerContract(lines, {
     contract.push('Answer contract: verify the alleged drop-off against logged sets.');
     contract.push('  Lead by accepting or rejecting the premise from logged working sets.');
     contract.push('  If current working top load is higher than the prior comparable session, say it increased and do not describe the lift as declining.');
-    contract.push('  When rejecting the premise because top load increased, avoid the words "drop-off", "dropping off", "decline", "declining", "regress", or "regressing" in the answer.');
+    contract.push('  When rejecting the premise because top load increased, avoid the words "drop-off", "dropping off", "decline", "declining", "falling", "regress", or "regressing" in the answer.');
     contract.push('  Mention warmups separately when the evidence marks warmup sets excluded.');
     contract.push('  Do not mention record estimates unless the user asked for them.');
   }
@@ -2388,6 +2480,44 @@ function compactExerciseRows(items, key = 'exercise') {
     .map((name) => compactEvidenceRow(name, 'relevant lift history available'));
 }
 
+function muscleVolumeTrendEvidenceRows(evidence) {
+  const rows = Array.isArray(evidence?.muscles)
+    ? evidence.muscles
+    : (evidence?.muscle ? [{ muscle: evidence.muscle }] : []);
+  const isPartial = evidence?.currentWeek?.isPartial === true || evidence?.currentWeekIsPartial === true;
+  return rows
+    .slice(0, 3)
+    .map((row) => {
+      const muscle = String(row?.muscle ?? '').trim();
+      if (!muscle) return null;
+      return compactEvidenceRow(muscle, muscleVolumeTrendEvidenceValue(row, { isPartial }));
+    })
+    .filter(Boolean);
+}
+
+function muscleVolumeTrendEvidenceValue(row, { isPartial = false } = {}) {
+  const pieces = [];
+  const share = wholePercent(row?.latestSharePct);
+  if (share) pieces.push(`${share} of ${isPartial ? 'this week-to-date volume' : "this week's volume"}`);
+  const delta = directionalPercent(row?.deltaVsPriorAvgPct);
+  if (delta) pieces.push(delta);
+  return pieces.length > 0 ? pieces.join(' · ') : 'muscle breakdown available';
+}
+
+function wholePercent(value) {
+  const number = Number(value);
+  if (!Number.isFinite(number)) return null;
+  return `${Math.round(number)}%`;
+}
+
+function directionalPercent(value) {
+  const number = Number(value);
+  if (!Number.isFinite(number)) return null;
+  const rounded = Math.round(number);
+  if (rounded === 0) return 'flat versus recent weeks';
+  return `${rounded > 0 ? 'up' : 'down'} ${Math.abs(rounded)}%`;
+}
+
 function humanObservationEvidenceRows(observation) {
   const evidence = observation?.evidence;
   if (!evidence || typeof evidence !== 'object') return [];
@@ -2399,6 +2529,8 @@ function humanObservationEvidenceRows(observation) {
       rows.push(compactEvidenceRow('Weekly score', `${Math.round(Number(evidence.latestScore))} from ${Math.round(Number(evidence.previousScore))}`));
     }
     rows.push(compactEvidenceRow('Change', signedNumber(evidence.delta, { suffix: ' points' })));
+  } else if (kind === 'muscle_volume_trend') {
+    rows.push(...muscleVolumeTrendEvidenceRows(evidence));
   } else if (kind === 'training_balance_skew') {
     rows.push(compactEvidenceRow('Push work', Number.isFinite(Number(evidence.pushSets)) ? `${Math.round(Number(evidence.pushSets))} sets` : null));
     rows.push(compactEvidenceRow('Pull work', Number.isFinite(Number(evidence.pullSets)) ? `${Math.round(Number(evidence.pullSets))} sets` : null));
@@ -2971,7 +3103,8 @@ export function askRoutedContext(snapshot, question, { exclude = new Set(), coac
         exclude,
         today,
         namedExercises: namedExerciseItems,
-        existingSections: built.sections
+        existingSections: built.sections,
+        omitSections: ['recent_session', 'exercise_progress', 'exercise_progress_summary', 'next_session'].includes(route) ? ['records'] : []
       })
     : { sections: [], tools: [], provenance: [] };
   built = {
@@ -3020,6 +3153,7 @@ export function askRoutedContext(snapshot, question, { exclude = new Set(), coac
     namedExerciseLabels,
     builtTools: tools,
     sessionObservationComparisons,
+    includedFacts,
     question
   });
   const currentSessionIds = uniqueArray(sessionObservationComparisons.map((row) => row.sessionId));

package/src/openrouter.js

@@ -29,8 +29,8 @@ export const AI_PROMPT_VERSIONS = Object.freeze({
   cycle: 'cycle_v2026_04_18_1',
   vitals: 'vitals_v2026_04_16_1',
   checkpoint: 'checkpoint_v2026_04_16_1',
-  ask: 'ask_v2026_06_02_1',
-  askAgentic: 'ask_agentic_v2026_06_02_1',
+  ask: 'ask_v2026_06_13_1',
+  askAgentic: 'ask_agentic_v2026_06_13_1',
   weeklyCheckin: 'weekly_checkin_v2026_04_23_1',
   coachCommitments: 'coach_commitments_v2026_04_25_1',
   coachFacts: 'coach_facts_v2026_04_25_1'
@@ -1457,7 +1457,7 @@ const ASK_CORE_RULES = `Core rules:
 const ASK_EXPANSIVE_RULES = `Default Ask Coach style:
 - Give the rich version by default: warm, detailed, specific, and data-dense, even for vague questions like "how am I doing?" or "tell me nice things".
 - Volunteer useful score evidence when provided: rounded Increment Score headline, direction (up/down/flat — not the point-delta number), and positive/negative drivers. Never recite score sub-scores, decimals, daily score lists, or a day-over-day delta number.
-- Volunteer useful records, PRs, and e1RMs when provided, but only when the routed evidence includes actual record rows and the answer is not a sparse-data uncertainty answer. Use them as evidence, not hype. Call a record value an estimated 1RM (e1RM), never a lifted set load.
+- Volunteer records, PRs, and e1RMs only when the user asks about records, PRs, maxes, strongest lifts, or strength milestones. For session reviews, missed targets, and next-session load decisions, prioritize plan targets, logged reps, and persisted recommendations; do not mention e1RM unless the user explicitly asks for it. Call a record value an estimated 1RM (e1RM), never a lifted set load.
 - For broad reads, synthesize sessions, volume, score drivers, records, body weight, readiness, goals, standouts, regressions, and caveats. Do not punt to a follow-up when the evidence is already present.
 - For session recaps, name the best real parts and the meaningful regression or watch item if one exists. Extra detail is good when it helps the user understand the workout.
 - Be concise only if the user asks for a quick answer or selected a concise tone.`;

package/src/prompt-changelog.js

@@ -22,6 +22,24 @@ export const PROMPT_CHANGELOG_TYPES = Object.freeze([
 ]);
 
 export const PROMPT_CHANGELOG = Object.freeze([
+  {
+    version: 'ask_agentic_v2026_06_13_1',
+    surface: 'askAgentic',
+    date: '2026-06-13',
+    type: 'safety',
+    summary:
+      'Gate estimated 1RM/PR/record language to explicit max, PR, record, strongest-lift, or strength-milestone questions. Session reviews, missed-target answers, and next-session load decisions should prioritize plan targets, logged reps, and persisted recommendations instead of volunteering e1RM.',
+    eval: 'ask_target_miss_incline_bench'
+  },
+  {
+    version: 'ask_v2026_06_13_1',
+    surface: 'ask',
+    date: '2026-06-13',
+    type: 'safety',
+    summary:
+      'Gate estimated 1RM/PR/record language to explicit max, PR, record, strongest-lift, or strength-milestone questions. Session reviews, missed-target answers, and next-session load decisions should prioritize plan targets, logged reps, and persisted recommendations instead of volunteering e1RM.',
+    eval: 'ask_target_miss_incline_bench'
+  },
   {
     version: 'ask_agentic_v2026_06_02_1',
     surface: 'askAgentic',

package/src/queries.js

@@ -2717,6 +2717,7 @@ function coachToolResult(toolName, params, {
 export function getWeeklyVolume(snapshot, { today = new Date() } = {}) {
   const todayIso = dateOnlyString(today);
   const weekStart = startOfCurrentIsoWeek(today);
+  const currentWeekEnd = isoDateOffset(weekStart, 6);
   const previousWeekEnd = new Date(new Date(`${weekStart}T00:00:00.000Z`).getTime() - 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
   const previousWeekStart = new Date(new Date(`${weekStart}T00:00:00.000Z`).getTime() - 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
   const thisWeek = sessionsInDateRange(snapshot, weekStart, todayIso);
@@ -2755,6 +2756,9 @@ export function getWeeklyVolume(snapshot, { today = new Date() } = {}) {
       currentWeekSessionCount: thisWeek.length,
       previousWeekVolume: Math.round(previousWeekVolume),
       previousWeekSessionCount: previousWeek.length,
+      currentWeekEnd,
+      currentWeekIsPartial: todayIso < currentWeekEnd,
+      currentWeekObservedThrough: todayIso,
       deltaPct: previousWeekVolume > 0 ? Math.round(((thisWeekVolume - previousWeekVolume) / previousWeekVolume) * 100) : null
     },
     sourceIds: rows.map((row) => row.sessionId),
@@ -2798,6 +2802,7 @@ function isoDateOffset(isoDate, days) {
 export function getMuscleVolumeTrend(snapshot, { today = new Date(), weeks = 4 } = {}) {
   const todayIso = dateOnlyString(today);
   const currentWeekStart = startOfCurrentIsoWeek(today);
+  const currentWeekEnd = isoDateOffset(currentWeekStart, 6);
   const boundedWeeks = Math.max(1, Math.min(12, Math.round(Number(weeks) || 4)));
 
   // Oldest -> newest so downstream arrays read chronologically.
@@ -2875,6 +2880,12 @@ export function getMuscleVolumeTrend(snapshot, { today = new Date(), weeks = 4 }
     rows,
     facts: {
       weekStarts,
+      currentWeek: {
+        start: currentWeekStart,
+        end: currentWeekEnd,
+        observedThrough: todayIso,
+        isPartial: todayIso < currentWeekEnd
+      },
       weeklyTotals: weeklyTotals.map((value) => Math.round(value)),
       muscleCount: muscles.length,
       muscles
@@ -2904,6 +2915,7 @@ export function getRecentSessions(snapshot, { limit = 3, today = new Date(), rec
           warmupSetCount: warmupSetCount(exercise.sets ?? []),
           workingSetCount: sets.length,
           topSet: topCompletedSet(sets),
+          recommendation: recommendationForExercise(session.recommendations, exercise.name),
           previousComparableSession: previousComparableExerciseSession(sortedSessions, session, exercise),
           sets
         };
@@ -3003,6 +3015,7 @@ export function getExerciseHistory(snapshot, { exercises = [], limit = 6, today
         warmupSetCount: warmupSetCount(exercise.sets ?? []),
         workingSetCount: completedSets.length,
         topSet: topCompletedSet(completedSets),
+        recommendation: recommendationForExercise(session.recommendations, exercise.name),
         sets: completedSets
       });
       if (historyRows.length >= limit) break;
@@ -3806,7 +3819,12 @@ export function getAthleteSnapshot(snapshot, { today = new Date(), windowDays =
 
   if (!excluded.has('score')) {
     const score = getIncrementScore(snapshot, { historyDays: Math.min(boundedWindowDays, 60) });
-    facts.score = Object.keys(score.facts ?? {}).length > 0 ? {
+    // Gate on the score's own availability flag, not on whether facts is
+    // non-empty. A real snapshot whose latest entry has a non-numeric score
+    // comes back available:false with facts:{}, and an available snapshot
+    // always carries available:true. Keying off Object.keys(facts) conflated
+    // these two and could null out a legitimately scored athlete.
+    facts.score = score.facts?.available === true ? {
       value: score.facts.score ?? null,
       band: score.facts.scoreBand ?? null,
       dayOverDayDelta: score.facts.dayOverDayDelta ?? null,
@@ -3825,6 +3843,7 @@ export function getAthleteSnapshot(snapshot, { today = new Date(), windowDays =
       currentWeekSessions: volume.facts.currentWeekSessionCount ?? 0,
       previousWeek: volume.facts.previousWeekVolume ?? 0,
       previousWeekSessions: volume.facts.previousWeekSessionCount ?? 0,
+      currentWeekIsPartial: volume.facts.currentWeekIsPartial ?? false,
       deltaPct: volume.facts.deltaPct ?? null
     };
     sourceIds.push(...volume.sourceIds);
@@ -3835,8 +3854,14 @@ export function getAthleteSnapshot(snapshot, { today = new Date(), windowDays =
   if (!excluded.has('muscleVolume')) {
     const trendWeeks = Math.max(2, Math.min(5, Math.round(boundedWindowDays / 7)));
     const muscleTrend = getMuscleVolumeTrend(snapshot, { today: asOf, weeks: trendWeeks });
+    const currentWeek = muscleTrend.facts.currentWeek;
     facts.muscleVolume = {
       weekStarts: muscleTrend.facts.weekStarts,
+      currentWeek: currentWeek
+        ? {
+            isPartial: currentWeek.isPartial === true
+          }
+        : null,
       weeklyTotals: muscleTrend.facts.weeklyTotals,
       muscles: (muscleTrend.facts.muscles ?? []).slice(0, 6).map((row) => ({
         muscle: row.muscle,
@@ -3850,6 +3875,23 @@ export function getAthleteSnapshot(snapshot, { today = new Date(), windowDays =
     missingDataFlags.push(...muscleTrend.missingDataFlags);
   }
 
+  if (!excluded.has('bodyweight')) {
+    const bw = getBodyWeightSnapshot(snapshot, { recentDays: Math.max(boundedWindowDays, 30), today: asOf });
+    if (bw.facts?.latestBodyWeightKg != null) {
+      facts.bodyweight = {
+        latestKg: bw.facts.latestBodyWeightKg ?? null,
+        latestDate: bw.facts.latestBodyWeightDate ?? null,
+        trendKg: bw.facts.trendKg ?? null,
+        trendDirection: bw.facts.trendDirection ?? null,
+        avg7DayKg: bw.facts.average7DayBodyWeightKg ?? null,
+        avg30DayKg: bw.facts.average30DayBodyWeightKg ?? null
+      };
+    }
+    sourceIds.push(...bw.sourceIds);
+    sourceTimestamps.push(bw.sourceTimestamp);
+    missingDataFlags.push(...bw.missingDataFlags);
+  }
+
   if (!excluded.has('recovery')) {
     const readiness = getReadinessSnapshot(snapshot, {
       recentDays: Math.min(boundedWindowDays, 60),
@@ -4533,7 +4575,7 @@ export const COACH_READ_TOOL_SCHEMAS = Object.freeze({
         windowDays: { type: 'integer', minimum: 1, maximum: 365, default: 35 },
         exclude: {
           type: 'array',
-          items: { type: 'string', enum: ['recovery', 'records', 'notes', 'score', 'volume', 'muscleVolume'] },
+          items: { type: 'string', enum: ['recovery', 'records', 'notes', 'score', 'volume', 'muscleVolume', 'bodyweight'] },
           default: []
         }
       },

package/src/sync-service.js

@@ -28,6 +28,7 @@ import { extractPlanChangeset } from './plan-changeset.js';
 
 const MAX_BODY_BYTES = 10 * 1024 * 1024; // 10 MB
 const DEFAULT_RATE_LIMIT_WINDOW_MS = 60_000;
+const COACH_OBSERVATION_DAILY_REFRESH_COOLDOWN_MS = 20 * 60 * 60 * 1000;
 const WEEKLY_CHECKIN_COMPLETION_USER_TURNS = 3;
 const WEEKLY_CHECKIN_RECAP_LOCAL_HOUR = 16;
 const DEFAULT_RATE_LIMIT_RULES = {
@@ -70,6 +71,8 @@ const DEFAULT_RATE_LIMIT_RULES = {
   'program-share-list': 60,
   'program-share-public': 120,
   'program-share-revoke': 30,
+  'workout-share-create': 30,
+  'workout-share-public': 120,
   'mobile-sync-bootstrap': 60,
   'mobile-sync-pull': 120,
   'mobile-sync-push': 60,
@@ -947,6 +950,38 @@ function coachObservationGenerationMetadata(result, sourceTrigger) {
   };
 }
 
+function skippedCoachObservationGenerationMetadata(skippedReason, sourceTrigger) {
+  return {
+    attempted: false,
+    generated: 0,
+    persisted: 0,
+    skippedReason,
+    sourceTrigger: sourceTrigger ?? null
+  };
+}
+
+function recentDailyRefreshObservation(observations, now = new Date()) {
+  const threshold = now.getTime() - COACH_OBSERVATION_DAILY_REFRESH_COOLDOWN_MS;
+  return (Array.isArray(observations) ? observations : []).some((observation) => {
+    if (observation?.sourceTrigger !== 'daily_refresh') return false;
+    const generatedAt = new Date(observation.generatedAt ?? observation.windowEnd ?? 0).getTime();
+    return Number.isFinite(generatedAt) && generatedAt >= threshold;
+  });
+}
+
+async function coachObservationGenerationSkipReason({
+  account,
+  uploadResult,
+  sourceTrigger,
+  listCurrentCoachObservationsForAccount
+}) {
+  if (sourceTrigger !== 'daily_refresh') return null;
+  if (Number(uploadResult?.inserted ?? 0) <= 0) return 'no_score_snapshot_change';
+  if (typeof listCurrentCoachObservationsForAccount !== 'function') return null;
+  const observations = await listCurrentCoachObservationsForAccount(account, { limit: 20 });
+  return recentDailyRefreshObservation(observations) ? 'recent_daily_refresh' : null;
+}
+
 function normalizeAskCoachObservationFollowUp(value) {
   if (!value || typeof value !== 'object') return null;
   const id = String(value.id ?? '').trim();
@@ -1177,6 +1212,20 @@ function routeRequest(url, method) {
     }
   }
 
+  if (pathname === '/cli/workout-share') {
+    return { command: 'workout-share-create', options: {} };
+  }
+
+  {
+    const workoutSharePublicMatch = pathname.match(/^\/workout-share\/([^/]+)$/);
+    if (workoutSharePublicMatch) {
+      return {
+        command: 'workout-share-public',
+        options: { token: decodeURIComponent(workoutSharePublicMatch[1]) }
+      };
+    }
+  }
+
   {
     const programShareRevokeMatch = pathname.match(/^\/cli\/program-share\/([^/]+)\/revoke$/);
     if (programShareRevokeMatch) {
@@ -2316,6 +2365,8 @@ export function createSyncServiceRequestHandler({
   listProgramSharesForAccount = null,
   readPublicProgramShare = null,
   revokeProgramShareForAccount = null,
+  createWorkoutShareForAccount = null,
+  readPublicWorkoutShare = null,
   updateAnalysisConsentForAccount = null,
   updateDisplayNameForAccount = null,
   saveAskConversationForAccount = null,
@@ -3004,6 +3055,45 @@ export function createSyncServiceRequestHandler({
         }
       }
 
+      if (route.command === 'workout-share-public') {
+        if (request.method !== 'GET') {
+          methodNotAllowed(response, 'Use GET for /workout-share/:token.');
+          return;
+        }
+        if (!readPublicWorkoutShare) {
+          methodNotAllowed(response, 'Workout sharing is not enabled for this service mode.');
+          return;
+        }
+        try {
+          const shared = await readPublicWorkoutShare(route.options.token);
+          if (shared.status === 'not_found') {
+            notFound(response, 'Workout share not found.');
+            return;
+          }
+          if (shared.status === 'revoked' || shared.status === 'expired') {
+            json(response, 410, { error: 'Workout share is no longer available.' });
+            return;
+          }
+          json(response, 200, {
+            ok: true,
+            token: route.options.token,
+            version: shared.share.version,
+            workoutName: shared.share.workoutName,
+            workoutPayload: shared.share.workoutPayload,
+            createdAt: shared.share.createdAt,
+            expiresAt: shared.share.expiresAt
+          });
+          return;
+        } catch (error) {
+          if (error?.message === 'Invalid workout share token.') {
+            badRequest(response, error.message);
+            return;
+          }
+          internalError(response, error, onError);
+          return;
+        }
+      }
+
       if (route.command === 'google-mobile') {
         if (request.method !== 'POST') {
           methodNotAllowed(response, 'Use POST for /auth/google/mobile.');
@@ -3322,18 +3412,33 @@ export function createSyncServiceRequestHandler({
             const result = await insertScoreSnapshotsForAccount(account, body.snapshots);
             if (generateCoachObservationsForAccount) {
               const sourceTrigger = coachObservationSourceTriggerForScoreSnapshots(body.snapshots);
+              let skipReason = null;
               try {
-                const generationResult = await generateCoachObservationsForAccount(account, { sourceTrigger });
-                result.coachObservations = coachObservationGenerationMetadata(generationResult, sourceTrigger);
+                skipReason = await coachObservationGenerationSkipReason({
+                  account,
+                  uploadResult: result,
+                  sourceTrigger,
+                  listCurrentCoachObservationsForAccount
+                });
               } catch (error) {
-                console.error('Coach observation generation after score upload failed:', error.message);
-                result.coachObservations = {
-                  attempted: true,
-                  generated: 0,
-                  persisted: 0,
-                  skippedReason: 'generation_failed',
-                  sourceTrigger
-                };
+                console.error('Coach observation generation skip check failed:', error.message);
+              }
+              if (skipReason) {
+                result.coachObservations = skippedCoachObservationGenerationMetadata(skipReason, sourceTrigger);
+              } else {
+                try {
+                  const generationResult = await generateCoachObservationsForAccount(account, { sourceTrigger });
+                  result.coachObservations = coachObservationGenerationMetadata(generationResult, sourceTrigger);
+                } catch (error) {
+                  console.error('Coach observation generation after score upload failed:', error.message);
+                  result.coachObservations = {
+                    attempted: true,
+                    generated: 0,
+                    persisted: 0,
+                    skippedReason: 'generation_failed',
+                    sourceTrigger
+                  };
+                }
               }
             }
             json(response, 200, result);
@@ -3604,6 +3709,53 @@ export function createSyncServiceRequestHandler({
         }
       }
 
+      if (route.command === 'workout-share-create') {
+        if (request.method !== 'POST') {
+          methodNotAllowed(response, 'Use POST for /cli/workout-share.');
+          return;
+        }
+        if (!createWorkoutShareForAccount) {
+          methodNotAllowed(response, 'Workout sharing is not enabled for this service mode.');
+          return;
+        }
+        const account = connectedWriteAuthenticator
+          ? await connectedWriteAuthenticator(requestToken)
+          : null;
+        if (!account) {
+          if (await rejectInsufficientScopeForReadToken(response, request, requestToken, readAuthenticator)) {
+            return;
+          }
+          unauthorized(response, request);
+          return;
+        }
+        try {
+          const body = await readJsonBody(request);
+          const workoutPayload = body.workoutPayload ?? body;
+          const share = await createWorkoutShareForAccount(account, workoutPayload);
+          json(response, 201, {
+            ok: true,
+            shareId: share.id,
+            tokenHint: share.tokenHint,
+            token: share.token,
+            workoutName: share.workoutName,
+            createdAt: share.createdAt,
+            expiresAt: share.expiresAt,
+            revokedAt: share.revokedAt,
+            version: share.version,
+            link: `${resolvedPublicOrigin}/workout-share/${share.token}`,
+            deepLink: `incremnt://workout-share/${share.token}?base=${encodeURIComponent(resolvedPublicOrigin)}`
+          });
+          return;
+        } catch (error) {
+          if (error?.message === 'Workout share payload is malformed.') {
+            badRequest(response, error.message);
+            return;
+          }
+          internalError(response, error, onError);
+          return;
+        }
+      }
+
       if (route.command === 'program-share-list') {
         if (request.method !== 'GET') {
           methodNotAllowed(response, 'Use GET for /cli/programs/:programId/shares.');
@@ -4024,45 +4176,8 @@ export function createSyncServiceRequestHandler({
           const limit = parseLimit(route.options.limit, { defaultValue: 5, max: 20 });
           let refresh = null;
           if (route.options.refresh === 'morning_open') {
-            const writeAccount = writeAuthenticator
-              ? await writeAuthenticator(requestToken)
-              : requestToken === token
-                ? account
-                : null;
-            if (!writeAccount) {
-              if (await rejectInsufficientScopeForReadToken(response, request, requestToken, readAuthenticator)) {
-                return;
-              }
-              unauthorized(response, request);
-              return;
-            }
             const sourceTrigger = 'daily_refresh';
-            if (generateCoachObservationsForAccount) {
-              try {
-                const generationResult = await generateCoachObservationsForAccount(writeAccount, {
-                  sourceTrigger,
-                  refresh: route.options.refresh
-                });
-                refresh = coachObservationGenerationMetadata(generationResult, sourceTrigger);
-              } catch (error) {
-                console.error('Coach observation generation on morning open failed:', error.message);
-                refresh = {
-                  attempted: true,
-                  generated: 0,
-                  persisted: 0,
-                  skippedReason: 'generation_failed',
-                  sourceTrigger
-                };
-              }
-            } else {
-              refresh = {
-                attempted: false,
-                generated: 0,
-                persisted: 0,
-                skippedReason: 'generation_unavailable',
-                sourceTrigger
-              };
-            }
+            refresh = skippedCoachObservationGenerationMetadata('morning_open_read_only', sourceTrigger);
           }
           const observations = await listCurrentCoachObservationsForAccount(account, {
             limit