incremnt 0.1.5 → 0.1.8

package/README.md

@@ -12,7 +12,7 @@ npm install -g incremnt
 
 ### Hosted sync (recommended)
 
-After connecting with Apple in the iOS app (Settings > Workout Sync), your workouts sync automatically. To access them from the CLI:
+After connecting with Apple in the iOS app (Settings > Cloud Sync), your workouts sync automatically. To access them from the CLI:
 
 ```bash
 incremnt login

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "incremnt",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "Command-line tool for querying your incremnt strength training data",
   "license": "MIT",
   "type": "module",
   "bin": {
-    "incremnt": "./src/index.js"
+    "incremnt": "./src/index.js",
+    "incremnt-mcp": "./src/mcp.js"
   },
   "files": [
     "src/"
@@ -15,6 +16,8 @@
     "dev:sync-fixture": "node ./scripts/dev-sync-fixture-server.js"
   },
   "dependencies": {
-    "chalk": "^5.6.2"
+    "@modelcontextprotocol/sdk": "^1.12.1",
+    "chalk": "^5.6.2",
+    "zod": "^3.24.0"
   }
 }

package/src/contract.js

@@ -1,9 +1,10 @@
 export const contractVersion = 1;
 
 export const capabilities = {
-  readOnly: true,
+  readOnly: false,
   localSnapshots: true,
   remoteReads: true,
+  remoteWrites: true,
   remoteAuthShell: true,
   remoteBootstrap: true
 };
@@ -82,11 +83,92 @@ export const commandSchema = [
     id: 'records',
     description: 'Personal records',
     options: []
+  },
+  {
+    command: 'goals list',
+    id: 'goals-list',
+    description: 'List strength plans and lift goals',
+    options: []
+  },
+  {
+    command: 'goals show',
+    id: 'goals-show',
+    description: 'Show strength plan goal details',
+    usage: 'goals show --id <plan-id>',
+    options: [
+      { name: 'id', type: 'string', required: true, description: 'Plan ID' }
+    ]
   }
 ];
 
+export const writeCommandSchema = [
+  {
+    command: 'programs propose',
+    id: 'programs-propose',
+    description: 'Submit a program proposal',
+    usage: 'programs propose --file <file>',
+    options: [
+      { name: 'file', type: 'string', required: true, description: 'Path to proposal JSON file' }
+    ]
+  },
+  {
+    command: 'programs proposals',
+    id: 'programs-proposals',
+    description: 'List program proposals',
+    options: [
+      { name: 'status', type: 'string', required: false, description: 'Filter by status (pending, accepted, dismissed)' }
+    ]
+  },
+  {
+    command: 'programs proposal dismiss',
+    id: 'proposal-dismiss',
+    description: 'Dismiss a program proposal',
+    usage: 'programs proposal dismiss --id <id>',
+    options: [
+      { name: 'id', type: 'string', required: true, description: 'Proposal ID' }
+    ]
+  }
+];
+
+export const writeCommands = new Set(writeCommandSchema.map((c) => c.id));
+
+export const proposalSchema = {
+  description: 'JSON structure for programs propose --file. Weights are omitted — iOS calculates from history.',
+  required: ['name', 'equipmentTier', 'days'],
+  properties: {
+    name: { type: 'string', description: 'Program name' },
+    equipmentTier: { type: 'string', enum: ['fullGym', 'benchDumbbells', 'dumbbellsOnly', 'bodyweightOnly'] },
+    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'],
+        properties: {
+          title: { type: 'string', description: 'Day name, e.g. "Upper A"' },
+          exercises: {
+            type: 'array',
+            minItems: 1,
+            items: {
+              required: ['name', 'sets', 'reps'],
+              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 }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
 export const officialCommands = [
   ...commandSchema.map((c) => c.usage ?? c.command),
+  ...writeCommandSchema.map((c) => c.usage ?? c.command),
   'status',
   'contract',
   'login',

package/src/format.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { commandSchema } from './contract.js';
+import { commandSchema, writeCommandSchema } from './contract.js';
 
 const shortMonths = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 const shortDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
@@ -366,6 +366,48 @@ function formatWhyDidThisChange(payload) {
   return lines.join('\n');
 }
 
+function formatProposalCreated(payload) {
+  if (!payload) return 'No proposal data.';
+  const lines = [
+    header('PROPOSAL CREATED'),
+    '',
+    keyValue('ID', payload.id),
+    keyValue('Status', payload.status),
+    keyValue('Program', payload.proposal?.name ?? 'Untitled'),
+    keyValue('Days', String(payload.proposal?.days?.length ?? 0))
+  ];
+  return lines.join('\n');
+}
+
+function formatProposalsList(payload) {
+  if (!Array.isArray(payload) || payload.length === 0) {
+    return 'No proposals found.';
+  }
+
+  const statusBadge = (status) => {
+    if (status === 'pending') return chalk.yellow(status);
+    if (status === 'accepted') return chalk.green(status);
+    if (status === 'dismissed') return chalk.dim(status);
+    return status;
+  };
+
+  const lines = [header('PROGRAM PROPOSALS'), ''];
+
+  for (const p of payload) {
+    const name = p.proposal?.name ?? 'Untitled';
+    const days = p.proposal?.days?.length ?? 0;
+    const date = formatShortDate(p.createdAt);
+    lines.push(` ${statusBadge(p.status)}  ${chalk.bold(name)}${dimDot()}${chalk.dim(`${days} days`)}${dimDot()}${chalk.dim(date)}${dimDot()}${chalk.dim(p.id)}`);
+  }
+
+  return lines.join('\n');
+}
+
+function formatProposalDismissed(payload) {
+  if (!payload) return 'Proposal not found.';
+  return ` Proposal ${chalk.bold(payload.id)} dismissed.`;
+}
+
 // --- Main export ---
 
 export function formatHelp() {
@@ -380,6 +422,9 @@ export function formatHelp() {
     header('COMMANDS'),
     ...commandSchema.map((c) => cmd(c.usage ?? c.command, c.description)),
     '',
+    header('WRITE COMMANDS'),
+    ...writeCommandSchema.map((c) => cmd(c.usage ?? c.command, c.description)),
+    '',
     header('AUTH'),
     cmd('login', 'Sign in (opens browser)'),
     cmd('login --base-url <url>', 'Sign in to a specific server'),
@@ -413,7 +458,10 @@ export function formatPretty(command, payload) {
     'program-list': formatProgramList,
     'program-detail': formatProgramDetail,
     'planned-vs-actual': formatPlannedVsActual,
-    'why-did-this-change': formatWhyDidThisChange
+    'why-did-this-change': formatWhyDidThisChange,
+    'programs-propose': formatProposalCreated,
+    'programs-proposals': formatProposalsList,
+    'proposal-dismiss': formatProposalDismissed
   }[command];
 
   return formatter ? formatter(payload) : null;

package/src/lib.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
-import { capabilities, commandSchema, contractVersion, officialCommands, readCommands } from './contract.js';
+import { capabilities, commandSchema, contractVersion, officialCommands, proposalSchema, readCommands, writeCommands, writeCommandSchema } from './contract.js';
 import {
   bootstrapSessionFromRemoteBaseUrl,
   bootstrapSessionFromRemoteBaseUrlWithDeviceFlow,
@@ -54,12 +54,16 @@ export async function runCli(argv, stdout, stderr) {
   const { command, options } = parseArgs(argv);
   const normalizedCommand = ({
     ...Object.fromEntries(commandSchema.map((c) => [c.command, c.id])),
+    ...Object.fromEntries(writeCommandSchema.map((c) => [c.command, c.id])),
     insights: 'session-insights',
     history: 'exercise-history',
     prs: 'records',
     program: 'program-summary',
     compare: 'planned-vs-actual',
-    explain: 'why-did-this-change'
+    explain: 'why-did-this-change',
+    propose: 'programs-propose',
+    proposals: 'programs-proposals',
+    dismiss: 'proposal-dismiss'
   })[command] ?? command;
 
   if (!command || options.help) {
@@ -109,7 +113,9 @@ export async function runCli(argv, stdout, stderr) {
       binary: 'incremnt',
       capabilities,
       officialCommands,
-      schema: commandSchema
+      schema: commandSchema,
+      writeSchema: writeCommandSchema,
+      proposalSchema
     }, null, 2)}\n`);
     return 0;
   }
@@ -263,6 +269,28 @@ export async function runCli(argv, stdout, stderr) {
   const wantJson = options.json || !(stdout.isTTY ?? false);
   const explicitJson = Boolean(options.json);
 
+  if (writeCommands.has(normalizedCommand)) {
+    try {
+      const payload = await transport.executeWriteCommand(normalizedCommand, options);
+      if (wantJson) {
+        stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+      } else {
+        const pretty = formatPretty(normalizedCommand, payload);
+        stdout.write(`${pretty ?? JSON.stringify(payload, null, 2)}\n`);
+      }
+
+      return 0;
+    } catch (error) {
+      if (explicitJson) {
+        stdout.write(`${JSON.stringify({ error: error.message, code: error.code ?? null }, null, 2)}\n`);
+      } else {
+        stderr.write(`${error.message}\n`);
+      }
+
+      return 1;
+    }
+  }
+
   if (!readCommands.has(normalizedCommand)) {
     const message = `Unknown command: ${command}`;
     if (explicitJson) {

package/src/mcp.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { z } from 'zod';
+import { commandSchema } from './contract.js';
+import { readSessionState } from './state.js';
+import { createTransport } from './transport.js';
+
+const server = new McpServer({
+  name: 'incremnt',
+  version: '0.1.0'
+});
+
+for (const cmd of commandSchema) {
+  const shape = {};
+
+  for (const opt of cmd.options) {
+    let field = opt.type === 'number' ? z.number() : z.string();
+    if (!opt.required) field = field.optional();
+    field = field.describe(opt.description);
+    shape[opt.name] = field;
+  }
+
+  server.tool(cmd.id, cmd.description, shape, async (args) => {
+    try {
+      const sessionState = await readSessionState();
+      const transport = await createTransport({}, sessionState);
+
+      if (transport.expired) {
+        return {
+          content: [{ type: 'text', text: 'Session expired. Run `incremnt login` to re-authenticate.' }],
+          isError: true
+        };
+      }
+
+      const result = await transport.executeReadCommand(cmd.id, args);
+      return {
+        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }]
+      };
+    } catch (error) {
+      const message = error?.message ?? String(error);
+
+      if (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
+      };
+    }
+  });
+}
+
+const transport = new StdioServerTransport();
+await server.connect(transport);

package/src/openrouter.js

@@ -0,0 +1,193 @@
+const DEFAULT_MODEL = 'meta-llama/llama-3.1-8b-instruct:free';
+const DEFAULT_TIMEOUT_MS = 15_000;
+const DEFAULT_MAX_TOKENS = 300;
+
+const SYSTEM_PROMPT = `You are a strength coach writing a brief note after reviewing a trainee's week of training. Write 2-3 short paragraphs separated by blank lines.
+
+Rules:
+- Reference specific exercises, weights, and reps from the data. Use numbers, not vague praise.
+- If there are PRs, mention them matter-of-factly. Do not celebrate or inflate them.
+- Note what went well and what lagged, with specifics.
+- End with one concrete suggestion for next week. Be specific about which exercise and what to change.
+- Write like a real person texting a training partner — short sentences, no filler, no cheerleading.
+- Never use words like: impressive, crushed, solid, demonstrating, significant, incredible, fantastic, highlighting.
+- Never use -ing clauses that add fake depth ("indicating progressive overload", "demonstrating strength gains").
+- No bullet points or lists.`;
+
+export async function generateCoachingSummary(cycleContext, { apiKey, model, timeoutMs } = {}) {
+  const resolvedModel = model || DEFAULT_MODEL;
+  const resolvedTimeout = timeoutMs || DEFAULT_TIMEOUT_MS;
+
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), resolvedTimeout);
+
+  try {
+    const userContent = formatCycleContext(cycleContext);
+
+    const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${apiKey}`,
+        'Content-Type': 'application/json',
+        'HTTP-Referer': 'https://incremnt.app',
+        'X-Title': 'incremnt'
+      },
+      body: JSON.stringify({
+        model: resolvedModel,
+        messages: [
+          { role: 'system', content: SYSTEM_PROMPT },
+          { role: 'user', content: userContent }
+        ],
+        max_tokens: DEFAULT_MAX_TOKENS,
+        temperature: 0.7
+      }),
+      signal: controller.signal
+    });
+
+    if (!response.ok) {
+      const text = await response.text().catch(() => '');
+      throw new Error(`OpenRouter API error ${response.status}: ${text}`);
+    }
+
+    const data = await response.json();
+    const content = data.choices?.[0]?.message?.content;
+    if (!content) {
+      throw new Error('No content in OpenRouter response');
+    }
+
+    return content.trim();
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+function formatCycleContext(ctx) {
+  const lines = [
+    `Program: ${ctx.programName}, Week ${ctx.cycleNumber}, ${ctx.totalSessions} session(s).`
+  ];
+
+  for (const session of ctx.sessions) {
+    const parts = [session.dayName || 'Session'];
+    if (session.totalVolume) parts.push(`${session.totalVolume} kg volume`);
+    if (session.effortScore) parts.push(`effort ${session.effortScore}/10`);
+    lines.push(parts.join(', '));
+
+    for (const ex of session.exercises) {
+      const setPart = ex.plannedSets != null
+        ? `${ex.completedSets}/${ex.plannedSets} sets`
+        : `${ex.completedSets} sets`;
+      const topPart = ex.topSet
+        ? ` (top: ${ex.topSet.weight}×${ex.topSet.reps})`
+        : '';
+      lines.push(`  ${ex.exerciseName}: ${setPart}${topPart}`);
+    }
+  }
+
+  if (ctx.prsThisCycle.length > 0) {
+    lines.push('PRs this week:');
+    for (const pr of ctx.prsThisCycle) {
+      lines.push(`  ${pr.exerciseName}: ${pr.weight}×${pr.reps} (e1RM ${pr.estimatedOneRM})`);
+    }
+  }
+
+  if (ctx.goalProgress) {
+    lines.push('Goal progress:');
+    for (const g of ctx.goalProgress) {
+      lines.push(`  ${g.exerciseName}: ${g.progressPercent ?? '?'}% toward ${g.targetE1RM} e1RM`);
+    }
+  }
+
+  return lines.join('\n');
+}
+
+export const WORKOUT_COACH_PROMPT = `You are a strength coach writing a brief note after reviewing one training session. Write 2-3 short paragraphs separated by blank lines.
+
+Rules:
+- Reference specific exercises, weights, and reps from the data. Use numbers, not vague praise.
+- If there are PRs, mention them matter-of-factly. Do not celebrate or inflate them.
+- Compare volume or effort to recent sessions if the data is there. Just state what changed.
+- End with one concrete suggestion for next session. Be specific about which exercise and what to try.
+- Write like a real person texting a training partner — short sentences, no filler, no cheerleading.
+- Never use words like: impressive, crushed, solid, demonstrating, significant, incredible, fantastic, highlighting.
+- Never use -ing clauses that add fake depth ("indicating progressive overload", "demonstrating strength gains").
+- No bullet points or lists.`;
+
+export async function generateWorkoutCoachingSummary(workoutContext, { apiKey, model, timeoutMs } = {}) {
+  const resolvedModel = model || DEFAULT_MODEL;
+  const resolvedTimeout = timeoutMs || DEFAULT_TIMEOUT_MS;
+
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), resolvedTimeout);
+
+  try {
+    const userContent = formatWorkoutContext(workoutContext);
+
+    const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${apiKey}`,
+        'Content-Type': 'application/json',
+        'HTTP-Referer': 'https://incremnt.app',
+        'X-Title': 'incremnt'
+      },
+      body: JSON.stringify({
+        model: resolvedModel,
+        messages: [
+          { role: 'system', content: WORKOUT_COACH_PROMPT },
+          { role: 'user', content: userContent }
+        ],
+        max_tokens: DEFAULT_MAX_TOKENS,
+        temperature: 0.7
+      }),
+      signal: controller.signal
+    });
+
+    if (!response.ok) {
+      const text = await response.text().catch(() => '');
+      throw new Error(`OpenRouter API error ${response.status}: ${text}`);
+    }
+
+    const data = await response.json();
+    const content = data.choices?.[0]?.message?.content;
+    if (!content) {
+      throw new Error('No content in OpenRouter response');
+    }
+
+    return content.trim();
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export function formatWorkoutContext(ctx) {
+  const lines = [
+    `Session: ${ctx.dayName}, ${ctx.sessionDate}, ${ctx.totalVolume} kg total volume.`
+  ];
+
+  if (ctx.effortScore) {
+    lines.push(`Effort rating: ${ctx.effortScore}/10.`);
+  }
+
+  lines.push('Exercises:');
+  for (const ex of ctx.exercises) {
+    const topPart = ex.topSet ? ` (top: ${ex.topSet.weight}×${ex.topSet.reps})` : '';
+    lines.push(`  ${ex.exerciseName}: ${ex.completedSets} sets${topPart}`);
+  }
+
+  if (ctx.prs.length > 0) {
+    lines.push('PRs this session:');
+    for (const pr of ctx.prs) {
+      lines.push(`  ${pr.exerciseName}: ${pr.weight}×${pr.reps} (e1RM ${pr.estimatedOneRM})`);
+    }
+  }
+
+  if (ctx.recentComparisons.length > 0) {
+    lines.push('Recent same-day sessions for comparison:');
+    for (const comp of ctx.recentComparisons) {
+      const effort = comp.effortScore ? `, effort ${comp.effortScore}/10` : '';
+      lines.push(`  ${comp.date}: ${comp.totalVolume} kg volume${effort}`);
+    }
+  }
+
+  return lines.join('\n');
+}