@gehlich/calicomp-mcp 1.0.1 → 1.1.1

package/README.md

@@ -94,6 +94,29 @@ exclusive JSON-RPC channel.
 }
 ```
 
+## Exercise Catalog: Curated Entries and Custom Exercises (since 1.1.0)
+
+`get_exercise_catalog` — and every training-state calculation that resolves an exercise id —
+returns two kinds of entries, distinguished by the `origin` field:
+
+- **`"CATALOG"`** — the curated, admin-maintained catalog (`GET /api/exercises`). These carry
+  muscle-group, equipment and capability-axis ratings.
+- **`"CUSTOM"`** — a user's own exercise, created because they cannot write to the curated
+  catalog at all. For the closed test circle this is the normal case, not an exception: a custom
+  exercise is real training data, but it carries **no** muscle, equipment or capability rating —
+  there is nothing to invent, so those fields are always empty. Treat an empty rating as "not
+  rated", never as a measured zero.
+
+**This does not replace curating the catalog.** If you have admin access and can run the
+catalog round trip (`tools/exercise.mjs` in the super-repo), your own exercises still belong in
+the curated catalog — cleanly, with real ratings. The `CUSTOM` read path exists for everyone who
+cannot do that, so their training data is not silently invisible to the coach. Two user groups,
+two answers; this section covers the one that has no other option.
+
+`propose_new_exercise`'s duplicate check only ever matches against `"CATALOG"` entries — a
+proposal for a new catalog exercise can never be blocked by someone else's same-named custom
+exercise.
+
 ## Building
 
 ```bash

package/dist/index.js

@@ -828,18 +828,15 @@ function normalizeWireTemplateExercise(te) {
 function decryptMerge(raw, keyB642) {
   return {
     syncedAt: raw.syncedAt,
-    exercises: raw.exercises,
-    exerciseTranslations: raw.exerciseTranslations,
-    templates: raw.templates,
-    blocks: raw.blocks.map(normalizeWireBlock),
-    templateExercises: raw.templateExercises.map(normalizeWireTemplateExercise),
-    sessions: raw.sessions.map((s) => decryptSession(s, keyB642)),
-    setLogs: raw.setLogs.map((sl) => decryptSetLog(sl, keyB642)),
-    hrSamples: raw.hrSamples.map((hr) => decryptHrSample(hr, keyB642)),
-    // `?? []` is what makes the optional wire key (SyncPullResponse.plannedWorkouts)
-    // safe for a user with no planned workouts — see that field's own doc in types.ts.
+    exercises: raw.exercises ?? [],
+    exerciseTranslations: raw.exerciseTranslations ?? [],
+    templates: raw.templates ?? [],
+    blocks: (raw.blocks ?? []).map(normalizeWireBlock),
+    templateExercises: (raw.templateExercises ?? []).map(normalizeWireTemplateExercise),
+    sessions: (raw.sessions ?? []).map((s) => decryptSession(s, keyB642)),
+    setLogs: (raw.setLogs ?? []).map((sl) => decryptSetLog(sl, keyB642)),
+    hrSamples: (raw.hrSamples ?? []).map((hr) => decryptHrSample(hr, keyB642)),
     plannedWorkouts: (raw.plannedWorkouts ?? []).map((pw) => decryptPlannedWorkout(pw, keyB642)),
-    // `?? []` — same reasoning as plannedWorkouts above, for a user with no synced settings.
     settings: (raw.settings ?? []).map((s) => decryptSetting(s, keyB642))
   };
 }
@@ -848,9 +845,34 @@ function normalizeCatalog(wireCatalog) {
     ...ex,
     capabilities: ex.capabilities ?? [],
     equipment: ex.equipment ?? [],
-    isSkill: ex.isSkill ?? false
+    isSkill: ex.isSkill ?? false,
+    origin: "CATALOG"
   }));
 }
+function projectUserExerciseToCatalog(ex, allTranslations) {
+  const translations = allTranslations.filter((t) => t.exerciseId === ex.id).map((t) => ({
+    languageCode: t.languageCode,
+    name: t.name,
+    description: t.description
+  }));
+  return {
+    id: ex.id,
+    key: `user_exercise:${ex.id}`,
+    nameEn: ex.name,
+    mode: ex.mode,
+    usesWeight: ex.usesWeight,
+    description: ex.description,
+    lastModifiedAt: ex.updatedAt,
+    translations,
+    // Never invented — an unrated exercise contributes nothing to a weighted evaluation, and a
+    // fabricated non-empty value here would look like a real measurement (T-141-80).
+    muscleGroups: [],
+    equipment: [],
+    isSkill: false,
+    capabilities: [],
+    origin: "CUSTOM"
+  };
+}
 async function doFetch(pat2, keyB642, serverUrl2) {
   const [rawSnapshot, profile, rawCatalog] = await Promise.all([
     fetchSnapshot(pat2, serverUrl2),
@@ -858,7 +880,10 @@ async function doFetch(pat2, keyB642, serverUrl2) {
     fetchCatalog(serverUrl2)
   ]);
   const snapshot = decryptMerge(rawSnapshot, keyB642);
-  const catalog = normalizeCatalog(rawCatalog);
+  const curatedCatalog = normalizeCatalog(rawCatalog);
+  const curatedIds = new Set(curatedCatalog.map((ex) => ex.id));
+  const projectedUserExercises = snapshot.exercises.filter((ex) => !ex.deletedAt && !curatedIds.has(ex.id)).map((ex) => projectUserExerciseToCatalog(ex, snapshot.exerciseTranslations));
+  const catalog = [...curatedCatalog, ...projectedUserExercises];
   return { snapshot, catalog, profile, fetchedAt: Date.now() };
 }
 async function getSnapshot(pat2, keyB642, serverUrl2) {
@@ -1437,7 +1462,7 @@ function registerToolGetExerciseCatalog(server2, cfg) {
     "get_exercise_catalog",
     {
       title: "Get Exercise Catalog",
-      description: 'Return the full exercise catalog with muscle groups, equipment, and optional localized names. Provide `lang` (e.g. "de", "fr") to add a `localizedName` field (falls back to `nameEn` when no translation exists). Use `muscleGroups[].key` with `get_stats { by: "muscle" }` to query aggregates by muscle group.',
+      description: 'Return the full exercise catalog with muscle groups, equipment, and optional localized names. Provide `lang` (e.g. "de", "fr") to add a `localizedName` field (falls back to `nameEn` when no translation exists). Use `muscleGroups[].key` with `get_stats { by: "muscle" }` to query aggregates by muscle group. The result includes both curated catalog entries AND the user\'s own custom exercises \u2014 check `origin` ("CATALOG" vs "CUSTOM") to tell them apart. A "CUSTOM" entry carries no muscle-group, equipment or capability-axis rating, so it never contributes to a weighted evaluation (muscle balance, capability balance) \u2014 treat that absence as "not rated", never as a real zero.',
       inputSchema: GetExerciseCatalogSchema,
       annotations: { readOnlyHint: true }
     },
@@ -2534,7 +2559,7 @@ function findCatalogMatch(proposedName, catalog) {
   const key = normalizeExerciseName(proposedName);
   if (!key) return void 0;
   return catalog.find(
-    (ex) => normalizeExerciseName(ex.nameEn) === key || ex.translations.some((t) => normalizeExerciseName(t.name) === key)
+    (ex) => ex.origin === "CATALOG" && (normalizeExerciseName(ex.nameEn) === key || ex.translations.some((t) => normalizeExerciseName(t.name) === key))
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehlich/calicomp-mcp",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "Local stdio MCP for CalisthenicsCompanion",
   "type": "module",
   "license": "MIT",