@trainheroic-unofficial/athlete-mcp 3.7.1 → 4.0.0

package/dist/server.mjs

@@ -1,4 +1,4 @@
-import { McpServer, acceptedContent, inputRequired, inputResponse } from "@modelcontextprotocol/server";
+import { CLIENT_CAPABILITIES_META_KEY, McpServer, acceptedContent, inputRequired, inputResponse } from "@modelcontextprotocol/server";
 import { serveStdio } from "@modelcontextprotocol/server/stdio";
 import process from "node:process";
 import { z } from "zod";
@@ -733,14 +733,26 @@ const exerciseSpecSchema = z.object({
 		z.number(),
 		z.string(),
 		z.array(z.union([z.number(), z.string()]))
-	]).optional(),
+	]).optional().describe("Primary slot values; may be reps, distance, or time. State primaryUnit."),
 	sets: z.number().optional(),
-	weight: z.union([z.number(), z.array(z.number())]).optional(),
+	weight: z.union([z.number(), z.array(z.number())]).optional().describe("Secondary slot values; may be weight or time. State secondaryUnit."),
+	primaryUnit: z.string().trim().min(1).optional().describe("Intended primary unit from exercise_resolve, such as reps, m, mi, or sec."),
+	secondaryUnit: z.string().trim().min(1).optional().describe("Intended secondary unit from exercise_resolve, such as lb or sec."),
 	rpe: z.union([z.number(), z.string()]).optional(),
 	instr: z.string().optional(),
 	param_1_type: z.number().optional(),
 	param_2_type: z.number().optional()
 }).superRefine((exercise, ctx) => {
+	if (exercise.reps !== void 0 && exercise.primaryUnit === void 0) ctx.addIssue({
+		code: "custom",
+		message: "primaryUnit is required when reps contains primary slot values.",
+		path: ["primaryUnit"]
+	});
+	if (exercise.weight !== void 0 && exercise.secondaryUnit === void 0) ctx.addIssue({
+		code: "custom",
+		message: "secondaryUnit is required when weight contains secondary slot values.",
+		path: ["secondaryUnit"]
+	});
 	if (Array.isArray(exercise.reps) && Array.isArray(exercise.weight) && exercise.reps.length !== exercise.weight.length) ctx.addIssue({
 		code: "custom",
 		message: `Per-set reps and weight arrays must have the same length; received ${exercise.reps.length} reps and ${exercise.weight.length} weights.`,
@@ -976,6 +988,15 @@ function errorResult(message) {
 const NOT_CONFIRMED = "Not confirmed — the user declined. Nothing was changed.";
 /** Appended to the prompt so the fallback survives whichever way a client surfaces the request. */
 const FALLBACK_HINT = " (If you cannot show this prompt, re-run the tool with confirm:true once the user has agreed.)";
+const CONFIRMATION_REQUIRED = "Ask the user to approve this action, then retry the tool with confirm:true only after they agree. Nothing was changed.";
+/** `undefined` means a legacy request, whose capability check belongs to the SDK's shim. */
+function modernClientSupportsFormElicitation(ctx) {
+	const envelope = ctx.mcpReq.envelope;
+	if (envelope === void 0) return void 0;
+	const elicitation = envelope[CLIENT_CAPABILITIES_META_KEY]?.elicitation;
+	if (elicitation === void 0) return false;
+	return elicitation.form !== void 0 || elicitation.url === void 0;
+}
 /**
 * Confirm a destructive/athlete-facing action.
 *
@@ -991,14 +1012,15 @@ const FALLBACK_HINT = " (If you cannot show this prompt, re-run the tool with co
 * confirmation message ever needs data fetched first, that fetch must be idempotent.
 *
 * Written once in the 2026 `inputRequired` style: modern clients retry with `inputResponses`.
-* A client that cannot elicit at all never reaches the denial below — the SDK rejects the
-* request before the retry — so it must pass `confirm: true`, which is why the hint rides inside
-* the prompt text itself.
+* MCP correctly rejects unsupported embedded requests with `-32021`. This application has an
+* alternate `confirm: true` flow, so a modern client that does not declare form elicitation gets
+* a model-readable tool error that tells it how to recover while the gate remains closed.
 */
 function confirmGate(ctx, message, confirmArg) {
 	if (confirmArg === true) return void 0;
 	if (acceptedContent(ctx.mcpReq.inputResponses, "confirm")?.confirm === true) return void 0;
 	if (inputResponse(ctx.mcpReq.inputResponses, "confirm").kind !== "missing") return errorResult(NOT_CONFIRMED);
+	if (modernClientSupportsFormElicitation(ctx) === false) return errorResult(`${message} ${CONFIRMATION_REQUIRED}`);
 	const prompt = message + FALLBACK_HINT;
 	return inputRequired({ inputRequests: { confirm: inputRequired.elicit({
 		message: prompt,
@@ -3203,7 +3225,7 @@ function registerAthleteTrainingTools(server, ctx) {
 }
 //#endregion
 //#region package.json
-var version = "3.7.1";
+var version = "4.0.0";
 //#endregion
 //#region src/server.ts
 function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trainheroic-unofficial/athlete-mcp",
-  "version": "3.7.1",
+  "version": "4.0.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,8 +21,8 @@
   "dependencies": {
     "@modelcontextprotocol/server": "2.0.0",
     "zod": "^4.6.3",
-    "@trainheroic-unofficial/core": "3.7.1",
-    "@trainheroic-unofficial/js": "3.7.1"
+    "@trainheroic-unofficial/core": "4.0.0",
+    "@trainheroic-unofficial/js": "4.0.0"
   },
   "devDependencies": {
     "@types/node": "^26.5.1",