incremnt 0.8.8 → 0.8.9

package/README.md

@@ -110,7 +110,7 @@ incremnt login --session-file ~/Downloads/session.json
 | `coach observations list` | Current persisted coach observations |
 | `coach observations seen --id <id>` | Mark a coach observation as seen |
 | `coach observations dismiss --id <id>` | Dismiss an observation and suppress matching follow-ups |
-| `programs create --file <file>` | Create an inactive saved program from generated-plan JSON |
+| `programs create --file <file>` | Create an inactive saved program from generated-plan JSON, including day-local supersets |
 | `programs propose --file <file>` | Submit a program proposal |
 | `programs proposals` | List proposals |
 | `programs proposal dismiss --id <id>` | Dismiss a proposal |

package/SKILL.md

@@ -26,7 +26,7 @@ Append `--dry-run` to any mutating command to preview the HTTP request as `{ dry
 
 | Command | Reversibility | Notes |
 |---|---|---|
-| `programs create --file <f>` | Reversible in iOS (created inactive) | Creates a saved inactive program from Coach-compatible generated-plan JSON. It does not activate or replace the current plan. Use `records` or `exercises history` first for canonical names. |
+| `programs create --file <f>` | Reversible in iOS (created inactive) | Creates a saved inactive program from Coach-compatible generated-plan JSON, including day-local supersets via `supersetKey`/`supersetOrder`. It does not activate or replace the current plan. Use `records` or `exercises history` first for canonical names. |
 | `programs propose --file <f>` | Reversible (proposal stays pending) | Weights omitted; iOS computes from history. Names must come from `records` or `exercises history`. |
 | `programs proposals` | Read-only lookup | Use before dismissing a proposal. |
 | `programs proposal dismiss --id <id>` | Irreversible | IDs come from `programs proposals`. |

package/package.json

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

package/src/contract.js

@@ -1,4 +1,4 @@
-export const contractVersion = 24;
+export const contractVersion = 25;
 
 export const capabilities = {
   readOnly: false,
@@ -281,7 +281,7 @@ export const writeCommandSchema = [
     description: 'Create a saved inactive program from a generated plan file',
     usage: 'programs create --file <file>',
     dryRun: true,
-    agentNotes: 'Mutation. Creates a brand-new inactive saved program from Coach-compatible generated-plan JSON; it does not activate or replace the current plan. External assistants should draft the JSON file, then run programs create --file <path>. Use records or exercises history before drafting exercise names; do not invent unusual exercise names.',
+    agentNotes: 'Mutation. Creates a brand-new inactive saved program from Coach-compatible generated-plan JSON; it does not activate or replace the current plan. External assistants should draft the JSON file, then run programs create --file <path>. Use records or exercises history before drafting exercise names; do not invent unusual exercise names. Supersets are supported with day-local supersetKey plus supersetOrder; the service converts them to native iOS supersetGroupId fields.',
     options: [
       { name: 'file', type: 'string', format: 'path', required: true, description: 'Path to Coach-compatible generated-plan JSON file' }
     ]
@@ -446,31 +446,48 @@ for (const command of writeCommandSchema) {
 }
 
 export const programDraftSchema = {
-  description: 'JSON structure for programs create --file and programs propose --file. Weights are omitted — iOS calculates from history.',
+  description: 'JSON structure for programs create --file and programs propose --file. This mirrors the current iOS program shape: concrete set reps, optional warmups/notes/RIR, and day-local supersetKey groups. Rep ranges and rest overrides are not supported.',
   required: ['name', 'daysPerWeek', 'equipmentTier', 'days'],
   properties: {
     name: { type: 'string', description: 'Program name' },
     equipmentTier: { type: 'string', enum: ['fullGym', 'benchDumbbells', 'dumbbellsOnly', 'bodyweightOnly'] },
     daysPerWeek: { type: 'integer', minimum: 1, maximum: 7, description: 'Training days per week' },
+    volumeLevel: { type: 'string', enum: ['minimum', 'moderate', 'high'], description: 'Program volume label. Optional, defaults to moderate.' },
+    currentDayIndex: { type: 'integer', minimum: 0, description: 'Initial current day index. Optional, defaults to 0.' },
     trainingWeekdays: { type: 'array', items: { type: 'integer', minimum: 0, maximum: 6 }, description: 'Days of week (0=Sun). Optional.' },
-    rationale: { type: 'string', description: 'Why this program was suggested. Optional.' },
     days: {
       type: 'array',
       minItems: 1,
       items: {
-        required: ['title', 'exercises'],
+        required: ['dayLabel', 'title', 'exercises'],
         properties: {
+          dayLabel: { type: 'string', description: 'Short day label, e.g. "Day 1".' },
           title: { type: 'string', description: 'Day name, e.g. "Upper A"' },
+          subtitle: { type: 'string', description: 'Optional day subtitle.' },
           exercises: {
             type: 'array',
             minItems: 1,
             items: {
-              required: ['name', 'sets', 'reps'],
+              required: ['name', 'muscleGroup', 'sets'],
               properties: {
                 name: { type: 'string', description: 'Exercise name (use canonical names from records or exercises history)' },
-                muscleGroup: { type: 'string', description: 'e.g. "Chest", "Back". Optional.' },
-                sets: { type: 'integer', minimum: 1 },
-                reps: { type: 'integer', minimum: 1 }
+                muscleGroup: { type: 'string', description: 'e.g. "Chest", "Back".' },
+                sets: {
+                  type: 'array',
+                  minItems: 1,
+                  items: {
+                    required: ['weight', 'reps'],
+                    properties: {
+                      weight: { type: 'number', minimum: 0, description: 'Planned load. Use 0 for bodyweight or app-computed/manual adjustment later.' },
+                      reps: { type: 'integer', minimum: 1, maximum: 30 },
+                      isWarmup: { type: 'boolean', description: 'Optional warmup marker.' }
+                    }
+                  }
+                },
+                note: { type: 'string', description: 'Optional prescription note.' },
+                rir: { type: 'integer', minimum: 0, maximum: 5, description: 'Optional app-supported RIR field.' },
+                supersetKey: { type: 'string', description: 'Optional day-local label shared by 2+ exercises to create a native iOS superset.' },
+                supersetOrder: { type: 'integer', minimum: 0, maximum: 24, description: 'Required when supersetKey is present; order within that superset group.' }
               }
             }
           }

package/src/program-draft.js

@@ -18,12 +18,15 @@ export const PROGRAM_DRAFT_LIMITS = {
   dayTitleMaxLen: 120,
   daySubtitleMaxLen: 120,
   noteMaxLen: 1000,
+  supersetKeyMaxLen: 64,
   minWeight: 0,
   maxWeight: 600,
   minReps: 1,
   maxReps: 30,
   minRir: 0,
   maxRir: 5,
+  minSupersetOrder: 0,
+  maxSupersetOrder: 24,
   minSetsPerExercise: 1,
   maxSetsPerExercise: 12,
   minExercisesPerDay: 1,
@@ -81,7 +84,7 @@ function normalizeProgramDraftSet(set) {
 }
 
 function normalizeProgramDraftExercise(exercise, canonicalizeExerciseName, strict = false) {
-  if (!hasOnlyAllowedKeys(exercise, new Set(['name', 'muscleGroup', 'sets', 'rir', 'note']))) return null;
+  if (!hasOnlyAllowedKeys(exercise, new Set(['name', 'muscleGroup', 'sets', 'rir', 'note', 'supersetKey', 'supersetOrder']))) return null;
 
   const name = normalizedExerciseDisplayName(exercise?.name, canonicalizeExerciseName);
   const muscleGroup = String(exercise?.muscleGroup ?? '').trim();
@@ -109,6 +112,20 @@ function normalizeProgramDraftExercise(exercise, canonicalizeExerciseName, stric
   const note = exercise?.note == null ? null : String(exercise.note);
   if (note && note.length > PROGRAM_DRAFT_LIMITS.noteMaxLen) return null;
 
+  const supersetKey = exercise?.supersetKey == null ? null : String(exercise.supersetKey).trim();
+  if (supersetKey != null && (
+    !supersetKey ||
+    supersetKey.length > PROGRAM_DRAFT_LIMITS.supersetKeyMaxLen
+  )) return null;
+
+  const supersetOrder = exercise?.supersetOrder == null ? null : Number(exercise.supersetOrder);
+  if (supersetKey == null && supersetOrder != null) return null;
+  if (supersetKey != null && (
+    !Number.isInteger(supersetOrder) ||
+    supersetOrder < PROGRAM_DRAFT_LIMITS.minSupersetOrder ||
+    supersetOrder > PROGRAM_DRAFT_LIMITS.maxSupersetOrder
+  )) return null;
+
   return {
     name,
     muscleGroup,
@@ -116,10 +133,33 @@ function normalizeProgramDraftExercise(exercise, canonicalizeExerciseName, stric
     nextSuggestion: '',
     sets,
     ...(note ? { note } : {}),
-    ...(rir != null ? { rir } : {})
+    ...(rir != null ? { rir } : {}),
+    ...(supersetKey != null ? { supersetKey, supersetOrder } : {})
   };
 }
 
+function hasValidDaySupersets(exercises) {
+  const grouped = new Map();
+  for (const exercise of exercises) {
+    if (!exercise.supersetKey) continue;
+    const existing = grouped.get(exercise.supersetKey) ?? [];
+    existing.push(exercise);
+    grouped.set(exercise.supersetKey, existing);
+  }
+
+  for (const group of grouped.values()) {
+    if (group.length < 2) return false;
+    const orders = new Set();
+    for (const exercise of group) {
+      if (!Number.isInteger(exercise.supersetOrder)) return false;
+      if (orders.has(exercise.supersetOrder)) return false;
+      orders.add(exercise.supersetOrder);
+    }
+  }
+
+  return true;
+}
+
 function normalizeProgramDraftDay(day, canonicalizeExerciseName, strict = false) {
   if (!hasOnlyAllowedKeys(day, new Set(['dayLabel', 'title', 'subtitle', 'exercises']))) return null;
 
@@ -139,6 +179,7 @@ function normalizeProgramDraftDay(day, canonicalizeExerciseName, strict = false)
     exercises.length < PROGRAM_DRAFT_LIMITS.minExercisesPerDay ||
     exercises.length > PROGRAM_DRAFT_LIMITS.maxExercisesPerDay
   ) return null;
+  if (!hasValidDaySupersets(exercises)) return null;
 
   return { dayLabel, title, subtitle, exercises };
 }
@@ -219,10 +260,15 @@ function defaultChildIdFactory() {
   return randomUUID();
 }
 
+function defaultSupersetIdFactory() {
+  return randomUUID();
+}
+
 export function buildProgramFromDraft(rawProgram, {
   now = new Date(),
   idFactory = defaultProgramIdFactory,
-  childIdFactory = defaultChildIdFactory
+  childIdFactory = defaultChildIdFactory,
+  supersetIdFactory = defaultSupersetIdFactory
 } = {}) {
   const draft = normalizeProgramDraft(rawProgram, { strict: true });
   if (!draft) {
@@ -230,28 +276,44 @@ export function buildProgramFromDraft(rawProgram, {
   }
 
   const createdAt = now instanceof Date ? now.toISOString() : new Date(now).toISOString();
-  const days = draft.days.map((day) => ({
-    id: childIdFactory('day'),
-    dayLabel: day.dayLabel,
-    title: day.title,
-    subtitle: day.subtitle,
-    exercises: day.exercises.map((exercise) => ({
-      id: childIdFactory('exercise'),
-      name: exercise.name,
-      muscleGroup: exercise.muscleGroup,
-      lastSuggestion: exercise.lastSuggestion,
-      nextSuggestion: exercise.nextSuggestion,
-      sets: exercise.sets.map((set) => ({
-        id: childIdFactory('set'),
-        weight: set.weight,
-        reps: set.reps,
-        isComplete: false,
-        isWarmup: set.isWarmup === true
-      })),
-      ...(exercise.note ? { note: exercise.note } : {}),
-      ...(exercise.rir != null ? { rir: exercise.rir } : {})
-    }))
-  }));
+  const days = draft.days.map((day) => {
+    const supersetGroupIds = new Map();
+    const groupIdForKey = (key) => {
+      if (!supersetGroupIds.has(key)) {
+        supersetGroupIds.set(key, supersetIdFactory('superset'));
+      }
+      return supersetGroupIds.get(key);
+    };
+
+    return {
+      id: childIdFactory('day'),
+      dayLabel: day.dayLabel,
+      title: day.title,
+      subtitle: day.subtitle,
+      exercises: day.exercises.map((exercise) => ({
+        id: childIdFactory('exercise'),
+        name: exercise.name,
+        muscleGroup: exercise.muscleGroup,
+        lastSuggestion: exercise.lastSuggestion,
+        nextSuggestion: exercise.nextSuggestion,
+        sets: exercise.sets.map((set) => ({
+          id: childIdFactory('set'),
+          weight: set.weight,
+          reps: set.reps,
+          isComplete: false,
+          isWarmup: set.isWarmup === true
+        })),
+        ...(exercise.note ? { note: exercise.note } : {}),
+        ...(exercise.rir != null ? { rir: exercise.rir } : {}),
+        ...(exercise.supersetKey
+          ? {
+              supersetGroupId: groupIdForKey(exercise.supersetKey),
+              supersetOrder: exercise.supersetOrder
+            }
+          : {})
+      }))
+    };
+  });
 
   return {
     id: idFactory('program'),