incremnt 0.5.0 → 0.6.1

package/README.md

@@ -59,14 +59,12 @@ incremnt login --session-file ~/Downloads/session.json
 | `programs current` | Active program state |
 | `programs list` | All programs |
 | `programs show --id <id>` | Full program detail |
-| `cycles list [--program-id <id>]` | Completed cycle summaries |
-| `cycles show --id <id>` | Details for a completed cycle summary |
 | `exercises history --name <name>` | Set-by-set history for an exercise |
 | `records` | Personal records (best e1RM per exercise) |
-| `goals list` / `goals show --id <id>` | Strength plan goals |
 | `health summary` / `health ai` | Health metrics and AI summary |
 | `training load` | ATL/CTL/TSB and workload context |
 | `ask history` / `ask show --id <id>` | Coach conversation history |
+| `increment-score current` | Latest Increment Score summary with components, drivers, trend, and data-quality flags |
 | `increment-score history` | Historical Increment Score snapshots |
 | `increment-score upload --file <file>` | Upload Increment Score snapshots |
 | `programs propose --file <file>` | Submit a program proposal |
@@ -121,7 +119,7 @@ incremnt login --session-file ~/Downloads/session.json
 
 ## MCP Server
 
-The package includes an [MCP](https://modelcontextprotocol.io) server that exposes the same read queries and program proposal commands as tools for AI assistants like Claude.
+The package includes an [MCP](https://modelcontextprotocol.io) server for AI assistants like Claude and Codex.
 
 Run `incremnt mcp install` to auto-register the server with Claude Desktop, Claude Code, and Codex CLI (see [Setup](#setup) above).
 
@@ -142,7 +140,12 @@ The MCP server uses the same auth session as the CLI — run `incremnt login` fi
 
 ### MCP tool surface
 
-The MCP server exposes the same read/write contract as the CLI command surface, including sessions, programs, cycles, goals, health, training load, ask history/show, Increment Score history/upload, program proposal and share workflows, plus typed coach read tools (e.g. `get_increment_score`).
+The MCP server exposes two tool families:
+
+- Command-shaped tools from the public CLI contract, including sessions, programs, cycles, goals, health, training load, ask history/show, `increment-score-current`, `increment-score-history`, `increment-score-upload`, program proposals, and program shares.
+- Typed coach read tools for agent-native context retrieval, including `get_increment_score`, `get_recent_sessions`, `get_exercise_history`, `get_next_session`, `get_readiness_snapshot`, `get_body_weight_snapshot`, `get_goal_status`, and `get_records`.
+
+`get_increment_score` returns the same privacy-safe score summary as `increment-score current`: score, snapshot timestamp, formula version, data tier, component scores, positive/negative drivers, day-over-day delta, recent trend, and data-quality flags. It does not expose raw HealthKit values.
 
 You can inspect the exact machine-readable contract at any time:
 

package/package.json

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

package/src/auth.js

@@ -275,7 +275,11 @@ async function fetchRemoteContract(baseUrl, token) {
 
   const payload = await response.json();
   if (payload.contractVersion !== contractVersion) {
-    const error = new Error(`Remote incremnt sync service is incompatible with this CLI. Expected contract v${contractVersion}, got v${payload.contractVersion}.`);
+    const cliBehind = typeof payload.contractVersion === 'number' && payload.contractVersion > contractVersion;
+    const hint = cliBehind
+      ? ' Your CLI is out of date — run `npm install -g incremnt@latest` to upgrade.'
+      : ' The sync service is older than this CLI — wait for the service to redeploy, or use an older CLI version.';
+    const error = new Error(`Remote incremnt sync service is incompatible with this CLI. Expected contract v${contractVersion}, got v${payload.contractVersion}.${hint}`);
     error.code = 'REMOTE_CONTRACT_MISMATCH';
     throw error;
   }

package/src/contract.js

@@ -1,4 +1,4 @@
-export const contractVersion = 10;
+export const contractVersion = 11;
 
 export const capabilities = {
   readOnly: false,
@@ -87,13 +87,15 @@ export const commandSchema = [
   {
     command: 'goals list',
     id: 'goals-list',
-    description: 'List strength plans and lift goals',
+    description: 'Legacy read-only strength plan and lift goal data',
+    hidden: true,
     options: []
   },
   {
     command: 'goals show',
     id: 'goals-show',
-    description: 'Show strength plan goal details',
+    description: 'Legacy read-only strength plan goal details',
+    hidden: true,
     usage: 'goals show --id <plan-id>',
     options: [
       { name: 'id', type: 'string', required: true, description: 'Plan ID' }
@@ -102,7 +104,8 @@ export const commandSchema = [
   {
     command: 'cycles list',
     id: 'cycle-summary-list',
-    description: 'List cycle summaries',
+    description: 'Legacy read-only cycle summaries',
+    hidden: true,
     options: [
       { name: 'program-id', type: 'string', required: false, description: 'Filter by program ID' }
     ]
@@ -110,7 +113,8 @@ export const commandSchema = [
   {
     command: 'cycles show',
     id: 'cycle-summary-show',
-    description: 'Show cycle summary details',
+    description: 'Legacy read-only cycle summary details',
+    hidden: true,
     usage: 'cycles show --id <summary-id>',
     options: [
       { name: 'id', type: 'string', required: true, description: 'Cycle summary ID' }
@@ -162,6 +166,14 @@ export const commandSchema = [
       { name: 'token', type: 'string', required: true, description: 'Program share token' }
     ]
   },
+  {
+    command: 'increment-score current',
+    id: 'increment-score-current',
+    description: 'Show the latest Increment Score snapshot summary',
+    options: [
+      { name: 'historyDays', type: 'number', required: false, description: 'Recent score history window (default 14, max 60)' }
+    ]
+  },
   {
     command: 'increment-score history',
     id: 'increment-score-history',

package/src/format.js

@@ -689,6 +689,50 @@ function formatIncrementScoreHistory(payload) {
   return lines.join('\n');
 }
 
+function formatIncrementScoreCurrent(payload) {
+  if (!payload?.available) {
+    return 'No Increment Score snapshots found.';
+  }
+
+  const lines = [
+    ` ${chalk.bold('INCREMENT SCORE')}${dimDot()}${chalk.bold(String(payload.score))}${dimDot()}${chalk.dim(payload.dataTier ?? '')}`,
+    ''
+  ];
+
+  if (payload.snapshotAt) lines.push(` Snapshot ${chalk.dim(formatShortDate(payload.snapshotAt))}`);
+  if (payload.formulaVersion) lines.push(` Formula  ${chalk.dim(payload.formulaVersion)}`);
+  if (payload.dayOverDayDelta != null) {
+    const sign = payload.dayOverDayDelta > 0 ? '+' : '';
+    lines.push(` Delta    ${chalk.dim(`${sign}${payload.dayOverDayDelta}`)}`);
+  }
+  if (lines.at(-1) !== '') lines.push('');
+
+  if (payload.components && typeof payload.components === 'object' && Object.keys(payload.components).length > 0) {
+    lines.push(` ${chalk.bold('Components')}`);
+    for (const [name, value] of Object.entries(payload.components)) {
+      lines.push(`   ${name.padEnd(12)} ${chalk.dim(String(value))}`);
+    }
+    lines.push('');
+  }
+
+  const drivers = (label, list) => {
+    if (!Array.isArray(list) || list.length === 0) return;
+    lines.push(` ${chalk.bold(label)}`);
+    for (const text of list.slice(0, 3)) lines.push(`   ${text}`);
+    lines.push('');
+  };
+  drivers('Top positive drivers', payload.topPositiveDrivers);
+  drivers('Top negative drivers', payload.topNegativeDrivers);
+
+  if (Array.isArray(payload.dataQualityNotes) && payload.dataQualityNotes.length > 0) {
+    lines.push(` ${chalk.bold('Data quality')}`);
+    for (const note of payload.dataQualityNotes) lines.push(`   ${note}`);
+  }
+
+  while (lines.at(-1) === '') lines.pop();
+  return lines.join('\n');
+}
+
 function formatIncrementScoreUpload(payload) {
   const inserted = payload?.inserted ?? payload?.count ?? 0;
   return ` Uploaded ${chalk.bold(String(inserted))} Increment Score snapshot${inserted === 1 ? '' : 's'}.`;
@@ -711,7 +755,7 @@ export function formatHelp(opts = {}) {
     `   incremnt <command> [options]`,
     '',
     header('COMMANDS'),
-    ...commandSchema.map((c) => cmd(c.usage ?? c.command, c.description)),
+    ...commandSchema.filter((c) => !c.hidden).map((c) => cmd(c.usage ?? c.command, c.description)),
     '',
     header('WRITE COMMANDS'),
     ...writeCommandSchema.map((c) => cmd(c.usage ?? c.command, c.description)),
@@ -763,6 +807,7 @@ export function formatPretty(command, payload) {
     'programs-propose': formatProposalCreated,
     'programs-proposals': formatProposalsList,
     'proposal-dismiss': formatProposalDismissed,
+    'increment-score-current': formatIncrementScoreCurrent,
     'increment-score-history': formatIncrementScoreHistory,
     'increment-score-upload': formatIncrementScoreUpload
   }[command];

package/src/lib.js

@@ -73,7 +73,15 @@ export async function runCli(argv, stdout, stderr) {
   })[command] ?? command;
 
   const sessionState = await readSessionState();
-  const isAuthenticated = Boolean(sessionState?.session && !isSessionExpired(sessionState.session));
+  const hasTransport = Boolean(
+    sessionState?.session?.transport?.baseUrl
+    || sessionState?.session?.transport?.fixturePath
+  );
+  const isAuthenticated = Boolean(
+    sessionState?.session
+    && !isSessionExpired(sessionState.session)
+    && hasTransport
+  );
 
   if (!command || options.help) {
     await printLogo(stdout);

package/src/mcp.js

@@ -8,6 +8,7 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
 import { commandSchema, writeCommands, writeCommandSchema } from './contract.js';
+import { listCoachReadTools } from './queries.js';
 import { readSessionState } from './state.js';
 import { createTransport } from './transport.js';
 
@@ -26,6 +27,32 @@ function commandShape(cmd) {
   return shape;
 }
 
+function coachToolShape(tool) {
+  const shape = {};
+  const props = tool.inputSchema?.properties ?? {};
+  const required = new Set(tool.inputSchema?.required ?? []);
+
+  for (const [name, schema] of Object.entries(props)) {
+    let field;
+    if (schema.type === 'integer' || schema.type === 'number') {
+      field = z.number();
+    } else if (schema.type === 'boolean') {
+      field = z.boolean();
+    } else if (schema.type === 'array') {
+      field = z.array(z.any());
+    } else if (schema.type === 'object') {
+      field = z.record(z.string(), z.any());
+    } else {
+      field = z.string();
+    }
+    if (!required.has(name)) field = field.optional();
+    if (schema.description) field = field.describe(schema.description);
+    shape[name] = field;
+  }
+
+  return shape;
+}
+
 export function registerMcpTools(server, {
   readSessionStateFn = readSessionState,
   createTransportFn = createTransport
@@ -68,6 +95,41 @@ export function registerMcpTools(server, {
     });
   }
 
+  for (const tool of listCoachReadTools()) {
+    server.tool(tool.name, tool.description, coachToolShape(tool), async (args) => {
+      try {
+        const sessionState = await readSessionStateFn();
+        const transport = await createTransportFn({}, sessionState);
+
+        if (transport.expired) {
+          return {
+            content: [{ type: 'text', text: 'Session expired. Run `incremnt login` to re-authenticate.' }],
+            isError: true
+          };
+        }
+
+        const result = await transport.executeCoachReadTool(tool.name, args);
+        return {
+          content: [{ type: 'text', text: JSON.stringify(result, null, 2) }]
+        };
+      } catch (error) {
+        const message = error && error.message ? error.message : String(error);
+
+        if (error && error.code === 'SNAPSHOT_NOT_FOUND') {
+          return {
+            content: [{ type: 'text', text: 'Not logged in. Run `incremnt login` first.' }],
+            isError: true
+          };
+        }
+
+        return {
+          content: [{ type: 'text', text: message }],
+          isError: true
+        };
+      }
+    });
+  }
+
   return server;
 }
 
@@ -88,6 +150,11 @@ export function createSandboxServer() {
       sandbox: true,
       ok: true
     }),
+    executeCoachReadTool: async (toolName) => ({
+      toolName,
+      sandbox: true,
+      ok: true
+    }),
     executeWriteCommand: async (commandId) => ({
       commandId,
       sandbox: true,

package/src/openrouter.js

@@ -24,7 +24,7 @@ const TRACE_DETAIL_METADATA = 'metadata';
 const TRACE_DETAIL_RAW_INTERNAL = 'raw_internal';
 
 export const AI_PROMPT_VERSIONS = Object.freeze({
-  workout: 'workout_v2026_04_24_2',
+  workout: 'workout_v2026_05_06_1',
   cycle: 'cycle_v2026_04_18_1',
   vitals: 'vitals_v2026_04_16_1',
   checkpoint: 'checkpoint_v2026_04_16_1',
@@ -70,8 +70,7 @@ function exerciseNamesFromContext(source) {
     source.exercises?.map((exercise) => exercise.exerciseName ?? exercise.name),
     source.sessions?.flatMap((session) => session.exercises?.map((exercise) => exercise.exerciseName ?? exercise.name) ?? []),
     source.prsThisWeek?.map((pr) => pr.exerciseName),
-    source.stalledExercises?.map((exercise) => exercise.exerciseName),
-    source.goalProgress?.map((goal) => goal.exerciseName)
+    source.stalledExercises?.map((exercise) => exercise.exerciseName)
   ]);
 }
 
@@ -108,8 +107,7 @@ function includedSectionsForSurface(surface, source) {
     return [
       'week',
       hasItems(source.prsThisWeek) ? 'prs' : null,
-      hasItems(source.stalledExercises) ? 'stalled_exercises' : null,
-      hasItems(source.goalProgress) ? 'goal_progress' : null
+      hasItems(source.stalledExercises) ? 'stalled_exercises' : null
     ].filter(Boolean);
   default:
     return [];
@@ -713,12 +711,6 @@ export function formatCycleContext(ctx) {
     `Program: ${ctx.programName}, Week ${ctx.cycleNumber}${intentLabel}, ${ctx.totalSessions} session(s).`
   ];
 
-  const phaseLines = formatProgramPhaseContext(ctx.programPhase);
-  if (phaseLines.length > 0) {
-    lines.push('');
-    lines.push(...phaseLines);
-  }
-
   if (ctx.prioritySignals?.length > 0) {
     lines.push('');
     lines.push('Priority signals (ranked):');
@@ -798,14 +790,6 @@ export function formatCycleContext(ctx) {
     }
   }
 
-  if (ctx.goalProgress) {
-    lines.push('');
-    lines.push('Goal progress:');
-    for (const g of ctx.goalProgress) {
-      lines.push(`  ${g.exerciseName}: ${g.progressPercent ?? '?'}% toward ${g.targetE1RM} e1RM`);
-    }
-  }
-
   if (ctx.previousCycles?.length > 0) {
     lines.push('');
     lines.push('Previous cycles:');
@@ -892,7 +876,7 @@ The app already shows PRs, total volume, effort score, exercise breakdown, and p
 Rules:
 - No bullet points, no questions.
 - Be specific — use exact exercise names from the session data. Do not shorten or generalize.
-- Only mention exercises that appear in the current session, the next session list, or the recorded PR list. Never reference skipped or absent exercises by name.
+- Only mention exercises that appear in the current session, the next session list, the recorded PR list, or the plan comparison block. You may name a skipped exercise from plan comparison if it adds insight (e.g. context for the day's shape), but at most one such mention, and never speculate on why it was skipped unless the context states a reason.
 - Do not summarize PRs with a count in workout notes. Name the specific lift or lifts instead.
 - Never use the phrase "rep PR" in a workout note.
 - Do not state a percentage change unless the exact percentage is directly supported by the comparison block.
@@ -963,10 +947,6 @@ export function formatWorkoutContext(ctx) {
     const timeOfDay = hour < 12 ? 'morning' : hour < 17 ? 'afternoon' : 'evening';
     lines.push(`Completed: ${dayNames[d.getUTCDay()]}, ${timeOfDay}.`);
   }
-  if (ctx.programWeekNumber) {
-    const phase = ctx.programProgressionType ? ` (${ctx.programProgressionType})` : '';
-    lines.push(`Program week: ${ctx.programWeekNumber}${phase}.`);
-  }
   if (ctx.sessionsThisWeek) {
     lines.push(`Sessions this week: ${ctx.sessionsThisWeek}.`);
   }
@@ -1201,12 +1181,6 @@ export function formatCheckpointContext(ctx) {
     `Program: ${ctx.programName}, Checkpoint at week ${ctx.checkpointWeek} of ${ctx.totalWeeks}.`
   ];
 
-  const phaseLines = formatProgramPhaseContext(ctx.programPhase);
-  if (phaseLines.length > 0) {
-    lines.push('');
-    lines.push(...phaseLines);
-  }
-
   lines.push('');
   lines.push('Exercise targets:');
   for (const ex of ctx.exercises) {
@@ -1419,10 +1393,6 @@ function formatWeeklyCheckinContext(context) {
   const lines = [];
   lines.push(`Today: ${context.todayIso}`);
   lines.push(`Week range: ${context.weekRangeIso?.start} to ${context.weekRangeIso?.end}`);
-  const phaseLines = formatProgramPhaseContext(context.programPhase);
-  if (phaseLines.length > 0) {
-    lines.push(...phaseLines);
-  }
   lines.push(`Sessions this week: ${context.sessionCount}`);
   if (context.adherencePct != null) {
     lines.push(`Adherence: ${context.completedSets}/${context.plannedSets} sets (${context.adherencePct}%)`);
@@ -1446,47 +1416,9 @@ function formatWeeklyCheckinContext(context) {
     const sign = context.bodyweightDeltaKg >= 0 ? '+' : '';
     lines.push(`Bodyweight 7d delta: ${sign}${context.bodyweightDeltaKg}kg`);
   }
-  if (Array.isArray(context.goalProgress) && context.goalProgress.length > 0) {
-    lines.push('Goal progress:');
-    for (const g of context.goalProgress) {
-      const deadline = g.finishDate ? ` (finish ${g.finishDate})` : '';
-      lines.push(`  - ${g.exerciseName}: ${g.progressPercent}% toward ${g.targetE1RM}kg${deadline}`);
-    }
-  }
   return lines.join('\n');
 }
 
-export function formatProgramPhaseContext(programPhase) {
-  if (!programPhase || typeof programPhase !== 'object') return [];
-  const current = programPhase.current;
-  if (!current?.phase || typeof current.displayWeek !== 'number') return [];
-
-  const describe = (phase) => {
-    if (!phase?.phase) return null;
-    const week = typeof phase.displayWeek === 'number' ? `week ${phase.displayWeek}` : 'week ?';
-    return `${week} ${phase.phase}${phase.isDeload ? ' (deload)' : ''}`;
-  };
-  const describeList = (phases) => {
-    if (!Array.isArray(phases) || phases.length === 0) return null;
-    return phases.map(describe).filter(Boolean).join(', ');
-  };
-
-  const lines = ['Program phase:'];
-  lines.push(`  Current: ${describe(current)}`);
-  const previous = describe(programPhase.previousWeek);
-  if (previous) lines.push(`  Previous: ${previous}`);
-  const next = describe(programPhase.nextWeek);
-  if (next) lines.push(`  Next: ${next}`);
-  if (programPhase.isPostDeloadReturn === true) {
-    lines.push('  Post-deload return: yes');
-  }
-  const range = describeList(programPhase.phasesInRange);
-  if (range) lines.push(`  Range phases: ${range}`);
-  const previousRange = describeList(programPhase.previousRangePhases);
-  if (previousRange) lines.push(`  Previous range phases: ${previousRange}`);
-  return lines;
-}
-
 export async function generateWeeklyCheckinRecap(context, { apiKey, model, timeoutMs, priorCommitment, user, sessionId, contextMetadata } = {}) {
   const contextText = formatWeeklyCheckinContext(context);
   const userLines = [fenceContent('training_data', contextText)];