incremnt 0.8.4 → 0.8.6

package/src/queries.js

@@ -541,6 +541,49 @@ export function recommendationForExercise(recommendations, exerciseName) {
   return null;
 }
 
+function resolvedRecommendationForProgramExercise(snapshot, { programId, dayIndex, exerciseIndex, exerciseName }) {
+  const rows = Array.isArray(snapshot?.resolvedProgramRecommendations)
+    ? snapshot.resolvedProgramRecommendations
+    : [];
+  if (rows.length === 0) return null;
+
+  const programKey = String(programId ?? '');
+  const exact = rows.find((row) =>
+    String(row?.programId ?? '') === programKey &&
+    Number(row?.dayIndex) === Number(dayIndex) &&
+    Number(row?.exerciseIndex) === Number(exerciseIndex)
+  );
+  if (exact) return exact;
+
+  const canonical = canonicalExerciseName(exerciseName);
+  return rows.find((row) =>
+    String(row?.programId ?? '') === programKey &&
+    Number(row?.dayIndex) === Number(dayIndex) &&
+    canonicalExerciseName(row?.exerciseName ?? row?.exerciseSlug) === canonical
+  ) ?? null;
+}
+
+function publicRecommendationResolution(row) {
+  if (!row) return null;
+  return {
+    status: row.status ?? 'none',
+    reason: row.reason ?? null,
+    workingSetCount: row.workingSetCount ?? null,
+    warmupSetCount: row.warmupSetCount ?? null,
+    targetRepsCount: row.targetRepsCount ?? null,
+    displayText: row.displayText ?? (row.recommendation ? formatRecommendation(row.recommendation) : null),
+    recommendation: row.recommendation ? formatRecommendation(row.recommendation) : null
+  };
+}
+
+function setRowForProgramDetail(set) {
+  return {
+    reps: set?.reps ?? null,
+    weight: set?.weight ?? null,
+    isWarmup: Boolean(set?.isWarmup)
+  };
+}
+
 function databaseExerciseNames(name) {
   const canonical = canonicalExerciseName(name);
   return normalizedExerciseAliasMapping[canonical] ?? [normalizeExerciseName(name)];
@@ -1129,24 +1172,141 @@ export function programDetail(snapshot, programId) {
     days: (program.days ?? []).map((day, index) => ({
       dayIndex: index,
       title: day.title ?? null,
-      exercises: (day.exercises ?? []).map((exercise) => {
-        const rec = recommendationForExercise(snapshot.exerciseRecommendations, exercise.name);
+      exercises: (day.exercises ?? []).map((exercise, exerciseIndex) => {
+        const resolved = resolvedRecommendationForProgramExercise(snapshot, {
+          programId: program.id,
+          dayIndex: index,
+          exerciseIndex,
+          exerciseName: exercise.name
+        });
+        const rec = resolved
+          ? (resolved.status === 'current' ? resolved.recommendation : null)
+          : recommendationForExercise(snapshot.exerciseRecommendations, exercise.name);
         return {
           name: exercise.name,
           muscleGroup: exercise.muscleGroup ?? null,
           supersetGroupId: exercise.supersetGroupId ?? null,
           supersetOrder: exercise.supersetOrder ?? null,
-          sets: (exercise.sets ?? []).map((set) => ({
-            reps: set.reps ?? null,
-            weight: set.weight ?? null
-          })),
-          ...(rec ? { recommendation: formatRecommendation(rec) } : {})
+          sets: (exercise.sets ?? []).map(setRowForProgramDetail),
+          ...(rec ? { recommendation: formatRecommendation(rec) } : {}),
+          ...(resolved ? { recommendationResolution: publicRecommendationResolution(resolved) } : {})
         };
       })
     }))
   };
 }
 
+function programChangeValueText(value) {
+  if (value == null) return null;
+  if (typeof value === 'string') return value;
+  if (typeof value === 'number' || typeof value === 'boolean') return String(value);
+  if (typeof value === 'object') {
+    if (value.value != null) return String(value.value);
+    if (value.type && value.value == null) return null;
+  }
+  return JSON.stringify(value);
+}
+
+function compactProgramChangePatch(patch) {
+  return {
+    path: patch.path ?? null,
+    field: patch.field ?? null,
+    dayIndex: patch.dayIndex ?? null,
+    dayTitle: patch.dayTitle ?? null,
+    exerciseName: patch.exerciseName ?? null,
+    exerciseSlug: patch.exerciseSlug ?? null,
+    setIndex: patch.setIndex ?? null,
+    before: programChangeValueText(patch.before),
+    after: programChangeValueText(patch.after)
+  };
+}
+
+function splitProgramChangeList(value) {
+  if (value == null || value === '') return [];
+  return String(value).split('|').map((item) => item.trim()).filter(Boolean);
+}
+
+function affectedExercisesFromPatch(patch) {
+  if (patch.exerciseName) return [patch.exerciseName];
+  if (patch.field !== 'exerciseList') return [];
+
+  const before = splitProgramChangeList(patch.before);
+  const after = splitProgramChangeList(patch.after);
+  const beforeSet = new Set(before);
+  const afterSet = new Set(after);
+  const changed = [
+    ...before.filter((name) => !afterSet.has(name)),
+    ...after.filter((name) => !beforeSet.has(name))
+  ];
+  return changed.length > 0 ? changed : after;
+}
+
+function compactProgramChangeRecord(record) {
+  const patches = (record.patches ?? []).map(compactProgramChangePatch);
+  return {
+    id: record.id ?? null,
+    createdAt: record.createdAt ?? null,
+    source: record.source ?? null,
+    kind: record.kind ?? null,
+    status: record.status ?? null,
+    summary: record.summary ?? null,
+    rationale: record.rationale ?? null,
+    relatedActionId: record.relatedActionId ?? null,
+    relatedObservationId: record.relatedObservationId ?? null,
+    beforeDigest: record.beforeDigest ?? null,
+    afterDigest: record.afterDigest ?? null,
+    affectedExercises: uniqueArray(patches.flatMap(affectedExercisesFromPatch)),
+    affectedDays: uniqueArray(patches.map((patch) => patch.dayTitle).filter(Boolean)),
+    affectedFields: uniqueArray(patches.map((patch) => patch.field).filter(Boolean)),
+    patches
+  };
+}
+
+export function programChangeHistory(snapshot, { programId = null, limit = 20 } = {}) {
+  const program = resolveProgramForQuery(snapshot, programId);
+  if (!program) return null;
+  const boundedLimit = boundedInteger(limit, { defaultValue: 20, min: 1, max: 100 });
+  const records = Array.isArray(program.changeHistory) ? program.changeHistory : [];
+  const sortedRecords = records
+    .slice()
+    .sort((lhs, rhs) => String(rhs.createdAt ?? '').localeCompare(String(lhs.createdAt ?? '')));
+  const changes = sortedRecords
+    .slice(0, boundedLimit)
+    .map(compactProgramChangeRecord);
+  return {
+    programId: program.id,
+    programName: program.name,
+    limit: boundedLimit,
+    totalChanges: records.length,
+    changes
+  };
+}
+
+export function getProgramChangeHistory(snapshot, { programId = null, limit = 20 } = {}) {
+  const payload = programChangeHistory(snapshot, { programId, limit });
+  if (!payload) {
+    return coachToolResult('get_program_change_history', { programId, limit }, {
+      missingDataFlags: ['no_active_program']
+    });
+  }
+  return coachToolResult('get_program_change_history', {
+    programId: payload.programId,
+    limit: payload.limit
+  }, {
+    rows: payload.changes,
+    facts: {
+      programId: payload.programId,
+      programName: payload.programName,
+      totalChanges: payload.totalChanges,
+      returnedChanges: payload.changes.length,
+      restoreAvailable: false
+    },
+    sourceIds: payload.changes.map((change) => change.id).filter(Boolean),
+    sourceTimestamp: payload.changes[0]?.createdAt ?? null,
+    missingDataFlags: payload.totalChanges === 0 ? ['no_program_change_history'] : []
+  });
+}
+
 export function formatRecommendation(rec) {
   if (!rec || !rec.kind) return null;
   const amount = rec.amount ?? 0;
@@ -2350,26 +2510,22 @@ export function askContext(snapshot, { exclude = new Set(), today = new Date() }
         const day = days[i];
         const upNext = i === currentDayIndex ? ' [UP NEXT]' : '';
         lines.push(`  ${day.title ?? `Day ${i + 1}`}${upNext}:`);
-        for (const exercise of day.exercises ?? []) {
+        for (const [exerciseIndex, exercise] of (day.exercises ?? []).entries()) {
           const sets = exercise.sets ?? [];
           if (sets.length === 0) continue;
-          // Group identical sets for compact display: e.g. "4×10 @ 100kg"
-          const groups = [];
-          let run = 1;
-          for (let j = 1; j <= sets.length; j++) {
-            const prev = sets[j - 1];
-            const curr = sets[j];
-            if (curr && curr.weight === prev.weight && curr.reps === prev.reps) {
-              run++;
-            } else {
-              groups.push(`${run}×${prev.reps}${prev.weight > 0 ? ` @ ${prev.weight}kg` : ''}`);
-              run = 1;
-            }
-          }
-          const rec = recommendationForExercise(snapshot.exerciseRecommendations, exercise.name);
+          const groups = plannedSetGroups(sets);
+          const resolved = resolvedRecommendationForProgramExercise(snapshot, {
+            programId: program.id,
+            dayIndex: i,
+            exerciseIndex,
+            exerciseName: exercise.name
+          });
+          const rec = resolved
+            ? (resolved.status === 'current' ? resolved.recommendation : null)
+            : recommendationForExercise(snapshot.exerciseRecommendations, exercise.name);
           const recLabel = rec ? formatRecommendation(rec) : null;
           const recSuffix = recLabel ? ` → next: ${recLabel}` : '';
-          lines.push(`    ${exercise.name}: ${groups.join(', ')}${recSuffix}`);
+          lines.push(`    ${exercise.name}: ${groups}${recSuffix}`);
         }
       }
     }
@@ -2543,10 +2699,11 @@ function plannedSetGroups(sets = []) {
   for (let i = 1; i <= sets.length; i++) {
     const prev = sets[i - 1];
     const curr = sets[i];
-    if (curr && curr.weight === prev.weight && curr.reps === prev.reps) {
+    if (curr && curr.weight === prev.weight && curr.reps === prev.reps && Boolean(curr.isWarmup) === Boolean(prev.isWarmup)) {
       run++;
     } else {
-      groups.push(`${run}×${prev.reps ?? '?'}${Number(prev.weight) > 0 ? ` @ ${prev.weight}kg` : ''}`);
+      const prefix = prev.isWarmup ? 'warmup ' : '';
+      groups.push(`${prefix}${run}×${prev.reps ?? '?'}${Number(prev.weight) > 0 ? ` @ ${prev.weight}kg` : ''}`);
       run = 1;
     }
   }
@@ -3070,12 +3227,24 @@ export function getNextSession(snapshot, { historyLimit = 8, today = new Date(),
   const currentDayIndex = program?.currentDayIndex ?? 0;
   const day = program?.days?.[currentDayIndex] ?? null;
   const exerciseCanonicals = exercisesForDay(day);
-  const exercises = (day?.exercises ?? []).map((exercise) => ({
-    name: exercise.name ?? exercise.exerciseName,
-    plannedSets: plannedSetGroups(exercise.sets ?? exercise.targetSets ?? []),
-    note: clippedUserNote(exercise.note),
-    recommendation: recommendationForExercise(snapshot.exerciseRecommendations, exercise.name ?? exercise.exerciseName)
-  }));
+  const exercises = (day?.exercises ?? []).map((exercise, exerciseIndex) => {
+    const exerciseName = exercise.name ?? exercise.exerciseName;
+    const resolved = resolvedRecommendationForProgramExercise(snapshot, {
+      programId: program?.id,
+      dayIndex: currentDayIndex,
+      exerciseIndex,
+      exerciseName
+    });
+    return {
+      name: exerciseName,
+      plannedSets: plannedSetGroups(exercise.sets ?? exercise.targetSets ?? []),
+      note: clippedUserNote(exercise.note),
+      recommendation: resolved
+        ? (resolved.status === 'current' ? resolved.recommendation : null)
+        : recommendationForExercise(snapshot.exerciseRecommendations, exerciseName),
+      ...(resolved ? { recommendationResolution: publicRecommendationResolution(resolved) } : {})
+    };
+  });
   const history = getExerciseHistory(snapshot, {
     exercises: [...exerciseCanonicals].map((canonical) => ({ canonical, displayName: canonical })),
     limit: historyLimit,
@@ -4554,6 +4723,18 @@ export const COACH_READ_TOOL_SCHEMAS = Object.freeze({
     },
     outputSchema: COACH_TOOL_RESULT_SCHEMA
   }),
+  get_program_change_history: Object.freeze({
+    description: 'Read recent durable program prescription and schedule changes for the active or requested program.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        programId: { type: 'string', description: 'Optional program ID; defaults to active program.' },
+        limit: { type: 'integer', minimum: 1, maximum: 100, default: 20 }
+      },
+      additionalProperties: false
+    },
+    outputSchema: COACH_TOOL_RESULT_SCHEMA
+  }),
   get_training_profile: Object.freeze({
     description: 'Summarize stable lifter profile evidence from current program, logged exercises, cadence, and recent notes.',
     inputSchema: {
@@ -4744,6 +4925,12 @@ function normalizeCoachToolInput(toolName, input = {}) {
       limitExercises: boundedInteger(source.limitExercises, { defaultValue: 10, min: 1, max: 50 })
     };
   }
+  if (toolName === 'get_program_change_history') {
+    return {
+      programId: source.programId ? String(source.programId) : null,
+      limit: boundedInteger(source.limit, { defaultValue: 20, min: 1, max: 100 })
+    };
+  }
   if (toolName === 'get_training_profile') {
     return {
       since: normalizeDateOnly(source.since),
@@ -4807,6 +4994,7 @@ export function executeCoachReadTool(snapshot, toolName, input = {}) {
   if (toolName === 'get_increment_score') return getIncrementScore(snapshot, params);
   if (toolName === 'get_exercise_progress_summary') return getExerciseProgressSummary(snapshot, params);
   if (toolName === 'get_program_progress') return getProgramProgress(snapshot, params);
+  if (toolName === 'get_program_change_history') return getProgramChangeHistory(snapshot, params);
   if (toolName === 'get_training_profile') return getTrainingProfile(snapshot, params);
   if (toolName === 'get_athlete_snapshot') return getAthleteSnapshot(snapshot, params);
   if (toolName === 'get_muscle_volume_trend') return getMuscleVolumeTrend(snapshot, params);
@@ -5524,6 +5712,17 @@ export function executeReadCommand(snapshot, normalizedCommand, options = {}) {
     };
   }
 
+  if (normalizedCommand === 'program-history') {
+    const payload = programChangeHistory(snapshot, {
+      programId: requiredOption(options, 'program-id'),
+      limit: options.limit
+    });
+    if (!payload) {
+      return { ok: false, error: options['program-id'] ? `Program not found: ${options['program-id']}` : 'No programs found' };
+    }
+    return { ok: true, payload };
+  }
+
   if (normalizedCommand === 'exercise-progress-summary') {
     const exerciseName = requiredOption(options, 'name', 'exercise');
     return {

package/src/remote.js

@@ -139,6 +139,7 @@ const remoteCommandHandlers = {
   'program-summary': executeRemoteRead,
   'program-detail': executeRemoteRead,
   'program-progress': executeRemoteRead,
+  'program-history': executeRemoteRead,
   'exercise-progress-summary': executeRemoteRead,
   'cycle-summary-list': executeRemoteRead,
   'cycle-summary-show': executeRemoteRead,
@@ -257,6 +258,12 @@ function endpointForCommand(baseUrl, normalizedCommand, options) {
       if (options.limitExercises) url.searchParams.set('limitExercises', options.limitExercises);
       return url;
     }
+    case 'program-history': {
+      const url = resolveServiceUrl(baseUrl, '/cli/programs/history');
+      if (options['program-id']) url.searchParams.set('program-id', options['program-id']);
+      if (options.limit) url.searchParams.set('limit', options.limit);
+      return url;
+    }
     case 'cycle-summary-list': {
       const cyclesUrl = resolveServiceUrl(baseUrl, '/cli/cycles');
       if (options['program-id']) {

package/src/sync-service.js

@@ -25,6 +25,7 @@ import { sanitizeHistory, detectSystemPromptLeak, stripXMLTagBlocks } from './pr
 import { enrichScoreSnapshots } from './score-context.js';
 import { extractAskProgramDraft } from './program-draft.js';
 import { extractPlanChangeset } from './plan-changeset.js';
+import { extractProgramScheduleAction } from './program-schedule-action.js';
 
 const MAX_BODY_BYTES = 10 * 1024 * 1024; // 10 MB
 const DEFAULT_RATE_LIMIT_WINDOW_MS = 60_000;
@@ -285,6 +286,7 @@ export function sanitizeAskStructuredResponseForStorage(structured) {
   const limitations = askStorageStringArray(structured.limitations, { maxItems: ASK_STRUCTURED_MAX_ITEMS, maxLength: 240 });
   const answerVerification = sanitizeAskAnswerVerificationReceipt(structured.answerVerification);
   const programDraft = sanitizeAskProgramDraftForStorage(structured.programDraft);
+  const programScheduleAction = sanitizeAskProgramDraftForStorage(structured.programScheduleAction);
 
   return {
     ...(answer ? { answer } : {}),
@@ -294,7 +296,8 @@ export function sanitizeAskStructuredResponseForStorage(structured) {
     followUpSuggestions,
     limitations,
     ...(answerVerification ? { answerVerification } : {}),
-    programDraft
+    programDraft,
+    programScheduleAction
   };
 }
 
@@ -648,6 +651,7 @@ export function buildAskInteractionLogPayload({
     followUpSuggestionCount: Array.isArray(structured?.followUpSuggestions) ? structured.followUpSuggestions.length : undefined,
     limitationCount: Array.isArray(structured?.limitations) ? structured.limitations.length : undefined,
     hasProgramDraft: structured?.programDraft != null ? true : undefined,
+    hasProgramScheduleAction: structured?.programScheduleAction != null ? true : undefined,
     askVerificationStatus: answerVerification.status,
     askVerificationRetryCount: typeof answerVerification.retryCount === 'number' ? answerVerification.retryCount : undefined,
     askVerificationDegraded: answerVerification.degraded === true ? true : undefined,
@@ -1260,6 +1264,16 @@ function routeRequest(url, method) {
     };
   }
 
+  if (pathname === '/cli/programs/history') {
+    return {
+      command: 'program-history',
+      options: {
+        'program-id': url.searchParams.get('program-id') ?? undefined,
+        limit: url.searchParams.get('limit') ?? undefined
+      }
+    };
+  }
+
   const programShowMatch = pathname.match(/^\/cli\/programs\/([^/]+)$/);
   if (programShowMatch) {
     return { command: 'program-detail', options: { id: programShowMatch[1] } };
@@ -5379,7 +5393,12 @@ export function createSyncServiceRequestHandler({
               canonicalizeExerciseName: canonicalExerciseName
             });
             const changesetParsed = extractPlanChangeset(parsed.answerText);
+            const scheduleActionParsed = extractProgramScheduleAction(changesetParsed.answerText, {
+              expectedStartDate: routedContext.metadata?.programScheduleActionStartDate ?? null,
+              requireTrailing: true
+            });
             const requestedPlanAdjustment = requestedCoachObservation?.intent === 'plan_adjustment';
+            const requestedProgramScheduleAction = routedContext.metadata?.intent?.requestedAction === 'schedule_program_action';
             const draft = missingRequestedCoachObservation && requestedCoachObservation?.intent === 'successor_plan'
               ? undefined
               : parsed.programDraft;
@@ -5388,8 +5407,11 @@ export function createSyncServiceRequestHandler({
             const changeset = !requestedPlanAdjustment || missingRequestedCoachObservation
               ? undefined
               : changesetParsed.planChangeset;
-            const answer = stripXMLTagBlocks(changesetParsed.answerText);
-            return { askResult: result, programDraft: draft, planChangeset: changeset, assistantAnswer: answer };
+            const programScheduleAction = requestedProgramScheduleAction
+              ? scheduleActionParsed.programScheduleAction ?? undefined
+              : undefined;
+            const answer = stripXMLTagBlocks(scheduleActionParsed.answerText);
+            return { askResult: result, programDraft: draft, planChangeset: changeset, programScheduleAction, assistantAnswer: answer };
           };
 
           let attempt = await generateAttempt(ctx);
@@ -5499,7 +5521,8 @@ export function createSyncServiceRequestHandler({
                 ...attempt,
                 assistantAnswer: safeAskVerificationFallback(),
                 programDraft: undefined,
-                planChangeset: undefined
+                planChangeset: undefined,
+                programScheduleAction: undefined
               };
             }
           }
@@ -5525,7 +5548,7 @@ export function createSyncServiceRequestHandler({
             });
           }
 
-          const { askResult, assistantAnswer, programDraft, planChangeset } = attempt;
+          const { askResult, assistantAnswer, programDraft, planChangeset, programScheduleAction } = attempt;
           const promptSurface = askResult.promptSurface
             ?? (persistedKind === 'weekly-checkin' ? 'weekly-checkin' : 'ask');
           const promptVersion = askResult.promptVersion
@@ -5539,7 +5562,7 @@ export function createSyncServiceRequestHandler({
             ...(programDraftRetryCount > 0 ? { programDraftRetryCount } : {}),
             ...(planChangesetRetryCount > 0 ? { planChangesetRetryCount } : {})
           };
-          const structured = buildAskStructuredResponse(assistantAnswer, routingMetadata, { programDraft, planChangeset, question });
+          const structured = buildAskStructuredResponse(assistantAnswer, routingMetadata, { programDraft, planChangeset, programScheduleAction, question });
           console.log(`ask-coach-meta ${JSON.stringify(buildAskInteractionLogPayload({
             accountId: account.id,
             status: 'ok',
@@ -5642,7 +5665,8 @@ export function createSyncServiceRequestHandler({
             metadata,
             structured,
             programDraft,
-            planChangeset
+            planChangeset,
+            programScheduleAction
           });
         } catch (err) {
           console.error('AI ask error:', err.message);