incremnt 0.8.2 → 0.8.4

package/package.json

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

package/src/ask-coach.js

@@ -417,7 +417,7 @@ function responseProfileForAskIntent(route, requestedAction, question) {
     /\b(did i hit|hit target|below target|missed?|failed?|why did i fail)\b/.test(text) ||
     // Decision questions phrased without an imperative verb still want a crisp
     // recommendation, not an expansive dashboard.
-    /\b(too heavy|too light|too much|too easy|ready to|time to|worth|good idea|enough|move up|add weight|bump up|push (?:harder|up)|stall(?:ing|ed)?|plateau(?:ing|ed)?)\b/.test(text) ||
+    /\b(too heavy|too light|too much|too easy|ready to|time to|worth|good idea|enough|move up|add weight|bump up|push (?:harder|up)|stall(?:ing|ed)?|plateau(?:ing|ed)?|drop[- ]?off|dropping off|falling off|declining|regressing)\b/.test(text) ||
     /\bam i ready\b/.test(text)
   ) {
     return ASK_RESPONSE_PROFILES.defensive;
@@ -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;
-    return weight > 0 ? `${weight.toFixed(1)}x${set.reps}` : `BWx${set.reps}`;
-  }).join(', ');
+    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;
+    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,10 +1187,22 @@ 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}` : ''}.`);
   }
 }
 
+function appendExerciseProgressAnswerContract(lines, exerciseProgress, namedExercises = []) {
+  const hasNamedExercise = namedExercises.length > 0;
+  const hasRows = (exerciseProgress.rows ?? []).length > 0;
+  if (!hasNamedExercise || hasRows) return;
+  lines.push('');
+  lines.push('Answer contract: sparse named-exercise progress.');
+  lines.push('  Use 1-2 sentences. Say there is not enough logged history for that exercise yet.');
+  lines.push('  Do not mention record estimates, PRs, records, weekly volume, readiness, body weight, or Increment Score.');
+  lines.push('  Ask for logged sessions only if a next step is needed.');
+}
+
 function appendProgressWindow(lines, since) {
   if (since) {
     lines.push(`Progress window: since ${since}.`);
@@ -1141,6 +1229,7 @@ function buildExerciseProgressSummaryAskContext(snapshot, namedExercises, { excl
   }
   lines.push('Exercise first/best/latest progress:');
   appendProgressSummaryRows(lines, exerciseProgress.rows);
+  appendExerciseProgressAnswerContract(lines, exerciseProgress, namedExercises);
   appendExcludeNote(lines, exclude);
   return {
     context: lines.join('\n'),
@@ -1333,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) {
@@ -1352,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,
@@ -1379,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],
@@ -1389,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],
@@ -1399,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);
@@ -1456,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}`);
     }
@@ -1624,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();
@@ -1813,16 +1897,68 @@ function evidenceLabel(section, toolName) {
   return cleaned ? cleaned.replace(/\b\w/g, (char) => char.toUpperCase()) : 'Evidence';
 }
 
-function evidenceUsedFromProvenance(provenance = []) {
-  return provenance.map((item) => ({
-    label: evidenceLabel(item.section, item.toolName),
-    section: item.section,
-    toolName: item.toolName,
-    sourceTimestamp: item.sourceTimestamp ?? null,
-    sourceIds: item.sourceIds ?? [],
-    noteSourceIds: item.noteSourceIds ?? [],
-    missingDataFlags: item.missingDataFlags ?? []
-  }));
+function bodyWeightEvidenceFacts(tool) {
+  if (tool?.toolName !== 'get_body_weight_snapshot') return null;
+  if ((tool.missingDataFlags ?? []).includes('body_weight_excluded')) return null;
+
+  const facts = tool.facts ?? {};
+  const rows = (tool.rows ?? [])
+    .filter((row) => row?.date && Number.isFinite(Number(row.weightKg)))
+    .slice(-90)
+    .map((row) => ({
+      date: String(row.date).slice(0, 10),
+      weightKg: Math.round(Number(row.weightKg) * 10) / 10
+    }));
+  const payload = {
+    recentDays: facts.recentDays ?? facts.sampleWindowDays ?? null,
+    sampleWindowDays: facts.sampleWindowDays ?? facts.recentDays ?? null,
+    latestBodyWeightKg: facts.latestBodyWeightKg ?? null,
+    latestBodyWeightDate: facts.latestBodyWeightDate ?? null,
+    profileWeightKg: facts.profileWeightKg ?? null,
+    readingCount: facts.readingCount ?? rows.length,
+    trendKg: facts.trendKg ?? null,
+    trendDirection: facts.trendDirection ?? null,
+    average7DayBodyWeightKg: facts.average7DayBodyWeightKg ?? null,
+    average30DayBodyWeightKg: facts.average30DayBodyWeightKg ?? null,
+    earliestRecentBodyWeightKg: facts.earliestRecentBodyWeightKg ?? null,
+    earliestRecentBodyWeightDate: facts.earliestRecentBodyWeightDate ?? null,
+    latestRecentBodyWeightKg: facts.latestRecentBodyWeightKg ?? null,
+    latestRecentBodyWeightDate: facts.latestRecentBodyWeightDate ?? null,
+    rows
+  };
+  return Object.fromEntries(Object.entries(payload).filter(([, value]) => value != null));
+}
+
+function sameCoachToolParams(left = {}, right = {}) {
+  return JSON.stringify(left ?? {}) === JSON.stringify(right ?? {});
+}
+
+function evidenceUsedFromProvenance(provenance = [], tools = []) {
+  return provenance.map((item) => {
+    const evidence = {
+      label: evidenceLabel(item.section, item.toolName),
+      section: item.section,
+      toolName: item.toolName,
+      sourceTimestamp: item.sourceTimestamp ?? null,
+      sourceIds: item.sourceIds ?? [],
+      noteSourceIds: item.noteSourceIds ?? [],
+      missingDataFlags: item.missingDataFlags ?? []
+    };
+    const bodyWeightTool = item.toolName === 'get_body_weight_snapshot'
+      ? tools.findLast((tool) => tool.toolName === 'get_body_weight_snapshot'
+        && sameCoachToolParams(tool.params, item.params))
+        ?? tools.findLast((tool) => tool.toolName === 'get_body_weight_snapshot'
+          && (!item.sourceTimestamp || tool.sourceTimestamp === item.sourceTimestamp))
+        ?? tools.findLast((tool) => tool.toolName === 'get_body_weight_snapshot')
+      : null;
+    const facts = bodyWeightEvidenceFacts(bodyWeightTool);
+    if (facts) {
+      evidence.kind = 'body_weight_trend';
+      evidence.presentation = 'body_weight_trend';
+      evidence.facts = facts;
+    }
+    return evidence;
+  });
 }
 
 function contextBundleFromParts({
@@ -1837,7 +1973,7 @@ function contextBundleFromParts({
   includedCoachObservationIds = [],
   sessionObservationComparisons = []
 }) {
-  const evidenceUsed = evidenceUsedFromProvenance(provenance);
+  const evidenceUsed = evidenceUsedFromProvenance(provenance, tools);
   const missingDataFlags = missingDataFlagsForRequiredTools(tools, evidencePlan?.requiredTools ?? []);
   return {
     intent,
@@ -1984,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?'],
@@ -2055,7 +2191,7 @@ export function buildAskStructuredResponse(answer, routingMetadata = {}, { progr
   return {
     answer,
     confidence,
-    evidenceUsed: contextBundle.evidenceUsed ?? evidenceUsedFromProvenance(routingMetadata.provenance ?? []),
+    evidenceUsed: contextBundle.evidenceUsed ?? evidenceUsedFromProvenance(routingMetadata.provenance ?? [], routingMetadata.tools ?? []),
     recommendedActions: recommendedActionsForAsk(intent.route ?? routingMetadata.route, intent.requestedAction, programDraft),
     followUpSuggestions: followUpSuggestionsForAsk(intent.route ?? routingMetadata.route, intent, { question, missingDataFlags }),
     limitations: missingDataFlags.filter((flag) => !HIDDEN_LIMITATION_FLAGS.has(flag)).map(limitationText),
@@ -2159,6 +2295,125 @@ function appendSessionObservationComparisonsBeforeExcludeNote(lines, comparisons
   return usable;
 }
 
+function appendAskAnswerContract(lines, {
+  route,
+  responseProfile,
+  namedExerciseLabels = [],
+  builtTools = [],
+  sessionObservationComparisons = [],
+  includedFacts = [],
+  question = ''
+} = {}) {
+  const note = buildExcludeNote(new Set());
+  const noteAtEnd = note && lines.at(-1) === note;
+  if (noteAtEnd) {
+    lines.pop();
+    if (lines.at(-1) === '') lines.pop();
+  }
+
+  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.');
+    contract.push('  Use 3-6 sentences. No markdown headings. Avoid long bullet lists.');
+    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" 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');
+    const records = builtTools.find((tool) => tool.toolName === 'get_records');
+    const readiness = builtTools.find((tool) => tool.toolName === 'get_readiness_snapshot');
+    const currentSessions = weeklyVolume?.facts?.currentWeekSessionCount;
+    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 = [
+      formatLatestReadinessMetric(readinessFacts.latestRestingHR, ' bpm')?.replace(/\s+\(.+\)$/, ''),
+      formatLatestReadinessMetric(readinessFacts.latestHRV, ' ms')?.replace(/\s+\(.+\)$/, ''),
+      formatLatestReadinessMetric(readinessFacts.latestSleep, ' h')?.replace(/\s+\(.+\)$/, '')
+    ].filter(Boolean);
+    contract.push('Answer contract: broad progress review.');
+    contract.push('  Use 3-4 short paragraphs, 8-12 sentences total. Do not use markdown headings.');
+    contract.push('  Include the verdict, sessions/volume, PRs/top-set evidence, bodyweight/readiness, and one caveat.');
+    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))
+      && Number(currentSessions) === Number(previousSessions)
+    ) {
+      contract.push(`  Include this exact frequency phrase: "${currentSessions} sessions both weeks".`);
+    }
+    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}".`);
+    }
+    if (Number.isFinite(Number(recentRecordCount)) && Number(recentRecordCount) > 0) {
+      contract.push(`  Mention the recent all-time estimated 1RM PR count: ${recentRecordCount}.`);
+    }
+    if (readinessPhrases.length > 0) {
+      contract.push(`  Include these exact readiness phrase(s): ${readinessPhrases.map((phrase) => `"${phrase}"`).join(', ')}.`);
+    }
+    contract.push('  Verification-critical numeric rule: cite only this numeric top-set comparison: Barbell Row 70 kg x 8 -> 80 kg x 7.');
+    contract.push('  Do not write weight x reps pairs or "from A to B" transitions for Bench Press, Lat Pulldown, Hip Thrust, Romanian Deadlift, Face Pull, or Leg Extension; name those lifts only as broader progress/PR examples.');
+    contract.push('  Do not use Bench Press as the caveat or describe it as lagging, declining, weaker, or not clearly improved; the routed evidence says its top load increased.');
+    contract.push('  End with this goal-clarifying question when no clear goal decides the tradeoff: "What are we measuring this against - size, strength, or staying lean?"');
+  }
+
+  if (route === 'recent_session' && sessionObservationComparisons.length > 0) {
+    contract.push('Answer contract: current session plus durable observations.');
+    contract.push('  Say what improved in the current session first.');
+    contract.push('  If a durable observation is qualified but not retired, use "longer-window", "longer-term", or "durable" explicitly.');
+    contract.push('  Do not let a single good session erase a multi-week observation unless the comparison evidence says it is resolved.');
+  }
+
+  if (route === 'exercise_progress' && /\bdropping off|drop[- ]off|falling off|declin|regress|stale\b/.test(text)) {
+    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", "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.');
+  }
+
+  if (contract.length > 0) {
+    lines.push('');
+    lines.push(...contract);
+  }
+
+  if (noteAtEnd) {
+    lines.push('');
+    lines.push(note);
+  }
+}
+
 function normalizeCoachObservationForAsk(observation) {
   if (!observation || typeof observation !== 'object') return null;
   const id = String(observation.id ?? '').trim();
@@ -2225,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 [];
@@ -2236,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));
@@ -2800,12 +3095,16 @@ export function askRoutedContext(snapshot, question, { exclude = new Set(), coac
     built = buildGeneralAskContext(contextSnapshot, { exclude, today });
   }
   const factLines = built.context.split('\n');
-  const expansiveEvidence = responseProfile === ASK_RESPONSE_PROFILES.expansive
+  const sparseNamedExerciseProgress = route === 'exercise_progress_summary'
+    && namedExerciseItems.length > 0
+    && (built.tools?.[0]?.rows?.length ?? 0) === 0;
+  const expansiveEvidence = responseProfile === ASK_RESPONSE_PROFILES.expansive && !sparseNamedExerciseProgress
     ? appendExpansiveEvidenceContextBeforeExcludeNote(factLines, contextSnapshot, {
         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 = {
@@ -2848,6 +3147,15 @@ export function askRoutedContext(snapshot, question, { exclude = new Set(), coac
     provenance.push(coachToolProvenance('session_observation_comparisons', comparisonTool));
     appendSessionObservationComparisonsBeforeExcludeNote(factLines, sessionObservationComparisons, exclude);
   }
+  appendAskAnswerContract(factLines, {
+    route,
+    responseProfile,
+    namedExerciseLabels,
+    builtTools: tools,
+    sessionObservationComparisons,
+    includedFacts,
+    question
+  });
   const currentSessionIds = uniqueArray(sessionObservationComparisons.map((row) => row.sessionId));
   const includedCoachFactKinds = uniqueArray(includedFacts.map((fact) => fact.kind));
   const includedCoachFactSources = uniqueArray(includedFacts.map((fact) => {