trainerroad-cli 0.3.0 → 0.4.0

package/src/commands/plan.mjs

@@ -2,8 +2,21 @@ import {
   compactCurrentPlan,
   compactPlanPhase,
   compactPlanSummary,
+  deriveCurrentPlanFromPlans,
   toIsoDate,
 } from "../lib/planning-normalizers.mjs";
+import { isHttpStatus } from "../trainerroad-client.mjs";
+import { dateOnlyNowInTimeZone } from "../lib/timezone.mjs";
+
+// current-custom-plan 404s for plan-builder plans; the web app no longer calls it either.
+async function fetchCurrentCustomPlanOrNull(client, memberId, username) {
+  try {
+    return await client.getCurrentCustomPlan(memberId, username);
+  } catch (error) {
+    if (isHttpStatus(error, 404)) return null;
+    throw error;
+  }
+}
 
 export async function commandPlan(flags, deps) {
   const {
@@ -25,11 +38,16 @@ export async function commandPlan(flags, deps) {
     throw new Error(`Invalid --view "${view}". Expected one of: current, phases, plans.`);
   }
 
-  const [currentPlanRaw, allPlansRaw, phasesRaw] = await Promise.all([
-    context.client.getCurrentCustomPlan(context.memberInfo.username),
-    context.client.getAllUserPlans(context.memberInfo.username),
-    context.client.getPlanPhases(context.memberInfo.username),
+  const { memberId, username } = context.memberInfo;
+  const [explicitCurrentPlanRaw, allPlansRaw, phasesRaw] = await Promise.all([
+    fetchCurrentCustomPlanOrNull(context.client, memberId, username),
+    context.client.getAllUserPlans(memberId, username),
+    context.client.getPlanPhases(memberId, username),
   ]);
+  const todayDateOnly = deps.todayDateOnly ?? dateOnlyNowInTimeZone(flags.tz ?? null);
+  const currentPlanRaw =
+    explicitCurrentPlanRaw ??
+    deriveCurrentPlanFromPlans(allPlansRaw, phasesRaw, todayDateOnly, { memberId });
   const currentPlan = compactCurrentPlan(currentPlanRaw);
   const plans = (Array.isArray(allPlansRaw) ? allPlansRaw : []).map((item) => compactPlanSummary(item));
   const phases = (Array.isArray(phasesRaw) ? phasesRaw : []).map((item) => compactPlanPhase(item));
@@ -50,7 +68,7 @@ export async function commandPlan(flags, deps) {
       phases: phases.length,
       currentPlan: currentPlan ? 1 : 0,
     },
-    currentPlan: flags.full || view === "current" ? currentPlan : compactCurrentPlan(currentPlanRaw),
+    currentPlan,
     plans: flags.full || view === "plans" ? plans : undefined,
     phases: flags.full || view === "phases" ? phases : undefined,
     count: filteredRecords.length,

package/src/commands/power.mjs

@@ -68,7 +68,8 @@ export async function commandPowerRecords(flags, deps) {
   const allRecords = Array.isArray(raw?.results?.[0]?.personalRecords)
     ? raw.results[0].personalRecords
     : [];
-  const rankedByWatts = [...allRecords].sort((a, b) => (b?.Watts ?? 0) - (a?.Watts ?? 0));
+  const wattsOf = (item) => item?.watts ?? item?.Watts ?? 0;
+  const rankedByWatts = [...allRecords].sort((a, b) => wattsOf(b) - wattsOf(a));
   const selectedRaw = full ? allRecords : rankedByWatts.slice(0, limit);
   const records = full ? selectedRaw : selectedRaw.map((item) => compactPersonalRecord(item));
 

package/src/commands/workout-image.mjs

@@ -0,0 +1,99 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+const FORMATS = new Set(["png", "svg"]);
+
+async function requirePrivateMember(flags, deps) {
+  const { withClient } = deps;
+  const client = await withClient(flags);
+  try {
+    const memberInfo = await client.getMemberInfo();
+    return { client, memberInfo };
+  } catch {
+    throw new Error(
+      "This command requires private authenticated mode. Login first with trainerroad-cli login.",
+    );
+  }
+}
+
+async function rasterize(svg, { width, background }) {
+  let Resvg;
+  try {
+    ({ Resvg } = await import("@resvg/resvg-js"));
+  } catch {
+    throw new Error(
+      "PNG output needs the optional @resvg/resvg-js package. Install it (npm install @resvg/resvg-js) or use --format svg.",
+    );
+  }
+  const renderer = new Resvg(svg, {
+    fitTo: { mode: "width", value: width },
+    background,
+  });
+  const image = renderer.render();
+  return { bytes: image.asPng(), width: image.width, height: image.height };
+}
+
+export async function commandWorkoutImage(flags, deps) {
+  const { isJsonMode, requireFlag, requirePositiveInteger, writeOutput } = deps;
+  const workoutId = Number(requireFlag("workout-image", flags, "id"));
+  if (!Number.isFinite(workoutId)) {
+    throw new Error(`Invalid --id "${flags.id}". Expected a numeric workout ID.`);
+  }
+
+  const explicitFormat = flags.format ? String(flags.format).toLowerCase() : null;
+  if (explicitFormat && !FORMATS.has(explicitFormat)) {
+    throw new Error(`Invalid --format "${flags.format}". Expected png or svg.`);
+  }
+  const requestedFile = flags.file ? String(flags.file) : null;
+  const extension = requestedFile ? path.extname(requestedFile).slice(1).toLowerCase() : null;
+  const format = explicitFormat ?? (FORMATS.has(extension) ? extension : "png");
+  const file = requestedFile ?? `workout-${workoutId}.${format}`;
+  const width = requirePositiveInteger(flags.width, 1200);
+  const background = flags.background ? String(flags.background) : "#1c1c1c";
+
+  const { client, memberInfo } = await requirePrivateMember(flags, deps);
+  const summaryPayload = await client.getWorkoutSummary(workoutId, memberInfo.username);
+  const summary = summaryPayload?.summary ?? null;
+  const chartUrl = summary?.picUrl ?? null;
+  if (!chartUrl) {
+    throw new Error(`Workout ${workoutId} has no chart image (summary.picUrl was empty).`);
+  }
+
+  const svg = await client.fetchText(chartUrl);
+  let bytes;
+  let size = null;
+  if (format === "svg") {
+    bytes = Buffer.from(svg, "utf8");
+  } else {
+    const rendered = await rasterize(svg, { width, background });
+    bytes = rendered.bytes;
+    size = { width: rendered.width, height: rendered.height };
+  }
+  await fs.mkdir(path.dirname(path.resolve(file)), { recursive: true });
+  await fs.writeFile(file, bytes);
+
+  const payload = {
+    generatedAt: new Date().toISOString(),
+    command: "workout-image",
+    member: { memberId: memberInfo.memberId, username: memberInfo.username },
+    query: { workoutId, format, width: format === "png" ? width : undefined, background: format === "png" ? background : undefined },
+    workout: {
+      workoutId,
+      workoutName: summary?.workoutName ?? summary?.name ?? null,
+      durationMinutes: summary?.duration ?? null,
+      tss: summary?.tss ?? null,
+      intensityFactor: summary?.intensityFactor ?? null,
+    },
+    chartUrl,
+    file: path.resolve(file),
+    bytes: bytes.length,
+    size,
+    message: `Wrote ${format.toUpperCase()} chart for ${summary?.workoutName ?? `workout ${workoutId}`} to ${path.resolve(file)}.`,
+  };
+
+  if (!isJsonMode(flags)) {
+    await writeOutput(payload, flags, (value) => value.message);
+    return;
+  }
+  await writeOutput(payload, { ...flags, json: !flags.jsonl });
+}

package/src/commands/workout-library.mjs

@@ -115,6 +115,7 @@ export function summarizeWorkout(workout) {
     firstPublishDate: workout.firstPublishDate ?? null,
     indoorAlternativeId: workout.indoorAlternativeId ?? null,
     energyKj: workout.kj ?? null,
+    chartUrl: workout.picUrl ?? null,
     goal: stripHtml(workout.goalDescription),
     description: stripHtml(workout.workoutDescription),
   };

package/src/commands/workout-mutations.mjs

@@ -1,3 +1,5 @@
+import { isHttpStatus } from "../trainerroad-client.mjs";
+
 const ALTERNATE_CATEGORIES = new Set(["similar", "easier", "harder", "longer", "shorter"]);
 const SWITCH_MODES = new Set(["inside", "outside"]);
 
@@ -308,3 +310,61 @@ export async function commandSwitchWorkout(flags, deps) {
 
   await writeOutput(payload, { ...flags, json: !flags.jsonl });
 }
+
+const ADAPTIVE_NOTE =
+  "Removing a planned workout lets TrainerRoad's Adaptive Training rebuild the upcoming plan around the gap. Re-read `future` afterwards.";
+
+export async function commandRemoveWorkout(flags, deps) {
+  const { isJsonMode, requireFlag, toBoolean, writeOutput } = deps;
+  const dryRun = toBoolean(flags["dry-run"], false);
+  const plannedActivityId = String(requireFlag("remove-workout", flags, "id"));
+  const { client, memberInfo } = await requirePrivateMember(flags, deps);
+
+  let before = null;
+  try {
+    before = summarizePlannedActivity(await client.getPlannedActivity(plannedActivityId, memberInfo.username));
+  } catch (error) {
+    if (!isHttpStatus(error, 404)) throw error;
+  }
+  const noop = before === null;
+
+  const base = {
+    generatedAt: new Date().toISOString(),
+    command: "remove-workout",
+    member: { memberId: memberInfo.memberId, username: memberInfo.username },
+    query: { plannedActivityId },
+    before,
+    adaptiveTraining: ADAPTIVE_NOTE,
+  };
+
+  if (dryRun || noop) {
+    const payload = {
+      ...base,
+      dryRun,
+      noop,
+      message: noop
+        ? `No planned activity with id ${plannedActivityId} exists on the calendar.`
+        : `Would remove ${before.workoutName ?? "workout"} from ${before.date}.`,
+    };
+    if (!isJsonMode(flags)) {
+      await writeOutput(payload, flags, (value) => (value.noop ? value.message : `${value.message}\nNo changes made.`));
+      return;
+    }
+    await writeOutput(payload, { ...flags, json: !flags.jsonl });
+    return;
+  }
+
+  await client.deletePlannedActivity(plannedActivityId, memberInfo.username);
+  const payload = {
+    ...base,
+    dryRun: false,
+    noop: false,
+    message: `Removed ${before.workoutName ?? "workout"} from ${before.date} (plannedActivityId=${plannedActivityId}).`,
+  };
+
+  if (!isJsonMode(flags)) {
+    await writeOutput(payload, flags, (value) => `${value.message}\n${value.adaptiveTraining}`);
+    return;
+  }
+  await writeOutput(payload, { ...flags, json: !flags.jsonl });
+}

package/src/commands/workout-tools.mjs

@@ -31,6 +31,7 @@ function summarizeWorkout(workout) {
     firstPublishDate: workout.firstPublishDate ?? null,
     indoorAlternativeId: workout.indoorAlternativeId ?? null,
     energyKj: workout.kj ?? null,
+    chartUrl: workout.picUrl ?? null,
     goal: stripHtml(workout.goalDescription),
     description: stripHtml(workout.workoutDescription),
   };

package/src/lib/command-manifest.mjs

@@ -264,6 +264,61 @@ export const COMMANDS = {
       "trainerroad-cli switch-workout --id 123456 --mode outside --json",
     ],
   },
+  "add-event": {
+    summary:
+      "Add a race or event to the calendar with discipline, priority, duration, and a TSS or intensity estimate. Remove it later with remove-workout (private mode).",
+    usage: [
+      "trainerroad-cli add-event --name <text> --date YYYY-MM-DD --discipline <name|id> --duration <minutes> (--tss <number> | --intensity <1-10>) [--priority A|B|C] [--notes <text>] [--dry-run] [--json|--jsonl]",
+    ],
+    examples: [
+      "trainerroad-cli add-event --name \"Black Fork\" --date 2027-05-01 --discipline gravel --priority A --duration 300 --tss 340 --dry-run",
+      "trainerroad-cli add-event --name \"Tuesday crit\" --date 2026-10-06 --discipline criterium --priority C --duration 60 --intensity 9 --json",
+    ],
+  },
+  "remove-workout": {
+    summary:
+      "Remove a planned workout or event from the calendar by planned-activity id. TrainerRoad may rebuild the plan around the gap (private mode).",
+    usage: ["trainerroad-cli remove-workout --id <planned-activity-id> [--dry-run] [--json|--jsonl]"],
+    examples: [
+      "trainerroad-cli remove-workout --id 05a68215-0fd5-431e-ba3f-b3bf01210c29 --dry-run",
+      "trainerroad-cli remove-workout --id 05a68215-0fd5-431e-ba3f-b3bf01210c29 --json",
+    ],
+  },
+  "workout-image": {
+    summary: "Save a workout's power-profile chart as PNG (default) or SVG (private mode).",
+    usage: [
+      "trainerroad-cli workout-image --id <workout-id> [--file <path>] [--format png|svg] [--width <px>] [--background <css-color>] [--json]",
+    ],
+    examples: [
+      "trainerroad-cli workout-image --id 1592808 --file fishers.png",
+      "trainerroad-cli workout-image --id 1592808 --format svg --file fishers.svg --json",
+    ],
+  },
+  "annotation-details": {
+    summary: "Fetch one calendar annotation with its title and notes (private mode).",
+    usage: ["trainerroad-cli annotation-details --id <annotation-id> [--full] [--json|--jsonl]"],
+    examples: ["trainerroad-cli annotation-details --id 1818fb12-7294-4a98-b494-b4b90160edc1 --json"],
+  },
+  "add-annotation": {
+    summary:
+      "Add a calendar annotation: time off, illness, injury, or a note. Multi-day via --days or --end-date. TrainerRoad may adapt nearby workouts (private mode).",
+    usage: [
+      "trainerroad-cli add-annotation --type time-off|illness|injury|note --date YYYY-MM-DD [--days <count> | --end-date YYYY-MM-DD] [--title <text>] [--notes <text>] [--dry-run] [--json|--jsonl]",
+    ],
+    examples: [
+      "trainerroad-cli add-annotation --type time-off --date 2026-09-21 --days 3 --title \"Travel\" --dry-run",
+      "trainerroad-cli add-annotation --type illness --date 2026-09-21 --end-date 2026-09-23 --notes \"Head cold\" --json",
+      "trainerroad-cli add-annotation --type note --date 2026-09-21 --title \"New saddle\" --json",
+    ],
+  },
+  "remove-annotation": {
+    summary: "Remove a calendar annotation by id. No-op if it is already gone (private mode).",
+    usage: ["trainerroad-cli remove-annotation --id <annotation-id> [--dry-run] [--json|--jsonl]"],
+    examples: [
+      "trainerroad-cli remove-annotation --id 1818fb12-7294-4a98-b494-b4b90160edc1 --dry-run",
+      "trainerroad-cli remove-annotation --id 1818fb12-7294-4a98-b494-b4b90160edc1 --json",
+    ],
+  },
   logout: {
     summary: "Clear local persisted session.",
     usage: ["trainerroad-cli logout"],
@@ -326,6 +381,12 @@ export const COMMAND_REQUIRED_FLAGS = {
   "move-workout": ["id", "to"],
   "replace-workout": ["id", "alternate-id"],
   "switch-workout": ["id", "mode"],
+  "add-event": ["name", "date", "discipline", "duration"],
+  "remove-workout": ["id"],
+  "workout-image": ["id"],
+  "annotation-details": ["id"],
+  "add-annotation": ["type", "date"],
+  "remove-annotation": ["id"],
 };
 
 export const FLAG_DETAILS = {
@@ -438,7 +499,23 @@ export const FLAG_DETAILS = {
     placeholder: "<count>",
     description: "Upstream workout library page size.",
   },
-  id: { placeholder: "<id>", description: "Workout, planned activity, or record identifier." },
+  id: { placeholder: "<id>", description: "Workout, planned activity, annotation, or record identifier." },
+  name: { placeholder: "<text>", description: "Event name shown on the calendar." },
+  discipline: {
+    placeholder: "<name|id>",
+    description:
+      "Event discipline: gravel, criterium, time-trial, gran-fondo, climbing-road-race, rolling-road-race, cyclocross, xc-olympic, xc-marathon, short-track, gravity, enduro, or a triathlon type; numeric ids accepted.",
+  },
+  priority: { placeholder: "A|B|C", description: "Race priority. A drives the plan, C is a training race (default B)." },
+  tss: { placeholder: "<number>", description: "Expected TSS for the event. Use this or --intensity." },
+  intensity: { placeholder: "<1-10>", description: "Expected intensity on TrainerRoad's 1-10 scale. Use this or --tss." },
+  file: { placeholder: "<path>", description: "Destination file for the image (default workout-<id>.png)." },
+  format: { placeholder: "png|svg", description: "Image format. Inferred from --file extension when omitted." },
+  width: { placeholder: "<px>", description: "PNG width in pixels (default 1200)." },
+  background: { placeholder: "<css-color>", description: "PNG background colour (default #1c1c1c)." },
+  title: { placeholder: "<text>", description: "Annotation title shown on the calendar. Defaults to the type name." },
+  notes: { placeholder: "<text>", description: "Free-text notes stored with the annotation." },
+  "color-id": { placeholder: "<id>", description: "TrainerRoad annotation colour id (default 2)." },
   "include-chart": {
     placeholder: "true|false",
     description: "Include workout chart/sample data in workout-details.",
@@ -484,6 +561,38 @@ function mergeFlagGroups(...groups) {
   );
 }
 
+// Per-command overrides for flags whose meaning differs from the shared FLAG_DETAILS entry.
+export const COMMAND_FLAG_DETAILS = {
+  "add-annotation": {
+    type: {
+      placeholder: "time-off|illness|injury|note",
+      description: "Annotation type. Also accepts a numeric TrainerRoad typeId.",
+    },
+    date: { placeholder: "YYYY-MM-DD", description: "First day of the annotation." },
+    days: { placeholder: "<count>", description: "Number of days the annotation covers (default 1)." },
+    "end-date": { placeholder: "YYYY-MM-DD", description: "Last day of the annotation, inclusive. Overrides --days." },
+  },
+  "annotation-details": {
+    id: { placeholder: "<annotation-id>", description: "Annotation id from `annotations`." },
+    full: { description: "Include the raw upstream annotation payload." },
+  },
+  "workout-image": {
+    id: { placeholder: "<workout-id>", description: "Library workout id (from workout-library, workout-details, or future --details)." },
+  },
+  "remove-workout": {
+    id: { placeholder: "<planned-activity-id>", description: "Planned activity id from `future --details` or `events`." },
+  },
+  "add-event": {
+    date: { placeholder: "YYYY-MM-DD", description: "Event date." },
+    duration: { placeholder: "<minutes>", description: "Expected event duration in minutes." },
+    notes: { placeholder: "<text>", description: "Free-text description stored with the event." },
+    full: { description: "Include TrainerRoad's raw create response." },
+  },
+  "remove-annotation": {
+    id: { placeholder: "<annotation-id>", description: "Annotation id from `annotations`." },
+  },
+};
+
 const SHARED_FLAGS = {
   help: ["help"],
   output: ["output"],
@@ -764,5 +873,57 @@ export const COMMAND_FLAG_ALLOWLIST = {
     SHARED_FLAGS.writeSafety,
     ["id", "mode"],
   ),
+  "add-event": mergeFlagGroups(
+    SHARED_FLAGS.help,
+    SHARED_FLAGS.output,
+    SHARED_FLAGS.jsonAndJsonl,
+    SHARED_FLAGS.session,
+    SHARED_FLAGS.credentials,
+    SHARED_FLAGS.writeSafety,
+    ["name", "date", "discipline", "priority", "duration", "tss", "intensity", "notes", "full"],
+  ),
+  "remove-workout": mergeFlagGroups(
+    SHARED_FLAGS.help,
+    SHARED_FLAGS.output,
+    SHARED_FLAGS.jsonAndJsonl,
+    SHARED_FLAGS.session,
+    SHARED_FLAGS.credentials,
+    SHARED_FLAGS.writeSafety,
+    ["id"],
+  ),
+  "workout-image": mergeFlagGroups(
+    SHARED_FLAGS.help,
+    SHARED_FLAGS.output,
+    SHARED_FLAGS.json,
+    SHARED_FLAGS.session,
+    SHARED_FLAGS.credentials,
+    ["id", "file", "format", "width", "background"],
+  ),
+  "annotation-details": mergeFlagGroups(
+    SHARED_FLAGS.help,
+    SHARED_FLAGS.output,
+    SHARED_FLAGS.jsonAndJsonl,
+    SHARED_FLAGS.session,
+    SHARED_FLAGS.credentials,
+    ["id", "full"],
+  ),
+  "add-annotation": mergeFlagGroups(
+    SHARED_FLAGS.help,
+    SHARED_FLAGS.output,
+    SHARED_FLAGS.jsonAndJsonl,
+    SHARED_FLAGS.session,
+    SHARED_FLAGS.credentials,
+    SHARED_FLAGS.writeSafety,
+    ["type", "date", "days", "end-date", "title", "notes", "color-id"],
+  ),
+  "remove-annotation": mergeFlagGroups(
+    SHARED_FLAGS.help,
+    SHARED_FLAGS.output,
+    SHARED_FLAGS.jsonAndJsonl,
+    SHARED_FLAGS.session,
+    SHARED_FLAGS.credentials,
+    SHARED_FLAGS.writeSafety,
+    ["id"],
+  ),
   logout: mergeFlagGroups(SHARED_FLAGS.help, SHARED_FLAGS.output, SHARED_FLAGS.session),
 };

package/src/lib/planning-normalizers.mjs

@@ -9,14 +9,61 @@ const PROGRESSION_ZONE_META = {
   79: { zoneKey: "anaerobic", zoneLabel: "Anaerobic", sortOrder: 6 },
 };
 
-const ANNOTATION_TYPE_LABELS = {
+// From the web app's enum, checked against real annotations on 2026-09-02 (typeId 2 "Wisdom Teeth",
+// typeId 4 "Hiking Out West"). Earlier releases had 2 and 4 swapped.
+export const ANNOTATION_TYPE_LABELS = {
   1: "note",
-  2: "time-off",
+  2: "illness",
   3: "injury",
-  4: "illness",
-  9: "plan-marker",
+  4: "time-off",
+  5: "stage-race",
+  6: "custom-plan-start",
+  7: "custom-plan-week",
+  8: "custom-plan-block",
+  9: "plan-start",
+  10: "plan-week",
 };
 
+// Names an agent can pass to add-annotation --type. Only the four user-editable types.
+export const ANNOTATION_TYPE_IDS = {
+  note: 1,
+  illness: 2,
+  sick: 2,
+  injury: 3,
+  "time-off": 4,
+};
+
+function endDateOnlyFrom(startDateOnly, durationSeconds) {
+  if (!startDateOnly || !Number.isFinite(Number(durationSeconds))) return startDateOnly ?? null;
+  const days = Math.max(1, Math.round(Number(durationSeconds) / 86_400));
+  const [year, month, day] = startDateOnly.split("-").map(Number);
+  return new Date(Date.UTC(year, month - 1, day + days - 1)).toISOString().slice(0, 10);
+}
+
+// Shape of GET /app/api/react-calendar/annotation/{id}: the timeline row plus title, text, colour.
+export function compactAnnotationDetail(record) {
+  const dateOnly = toIsoDateFromCalendarDate(record?.date);
+  const durationSeconds = record?.duration ?? null;
+  const typeLabel = ANNOTATION_TYPE_LABELS[record?.typeId] ?? `type-${record?.typeId ?? "unknown"}`;
+  return {
+    id: record?.id ?? null,
+    type: typeLabel,
+    typeId: record?.typeId ?? null,
+    typeLabel,
+    title: record?.title ?? null,
+    text: record?.text ?? null,
+    date: record?.date ?? null,
+    dateOnly,
+    endDateOnly: endDateOnlyFrom(dateOnly, durationSeconds),
+    durationSeconds,
+    durationDays: Number.isFinite(Number(durationSeconds)) ? Math.round(Number(durationSeconds) / 86_400) : null,
+    timeOfDay: record?.timeOfDay ?? null,
+    colorId: record?.colorId ?? null,
+    colorHex: record?.colorHex ?? null,
+    plannedActivityGroupId: record?.plannedActivityGroupId ?? null,
+  };
+}
+
 function toIsoDateFromPlanned(item) {
   return `${String(item.date.year).padStart(4, "0")}-${String(item.date.month).padStart(2, "0")}-${String(item.date.day).padStart(2, "0")}`;
 }
@@ -135,12 +182,71 @@ export function compactCurrentPlan(plan) {
     dateOnly: plan.start ? toIsoDate(plan.start) : null,
     canEdit: plan.canEdit ?? null,
     currentPhase: plan.currentPhase ?? null,
+    currentPhaseId: plan.currentPhaseId ?? null,
+    currentPhaseName: plan.currentPhaseName ?? null,
     currentPhaseStart: plan.currentPhaseStart ?? null,
     currentPhaseEnd: plan.currentPhaseEnd ?? null,
     plannedActivityGroupType: plan.plannedActivityGroupType ?? null,
     autoUpdateApplied: plan.autoUpdateApplied ?? null,
     phaseCount: Array.isArray(plan.phases) ? plan.phases.length : 0,
     phases: Array.isArray(plan.phases) ? plan.phases.map((phase) => compactPlanPhase(phase)) : [],
+    source: plan.source ?? "current-custom-plan",
+  };
+}
+
+function dateWindowContains(start, end, dateOnly) {
+  if (!dateOnly) return false;
+  const startDateOnly = start ? toIsoDate(start) : null;
+  const endDateOnly = end ? toIsoDate(end) : null;
+  if (!startDateOnly || !endDateOnly) return false;
+  return startDateOnly <= dateOnly && dateOnly <= endDateOnly;
+}
+
+// Phases carry the plan's id. When they don't, fall back to phases that sit inside the plan window.
+function phaseBelongsToPlan(phase, plan) {
+  if (phase?.customPlanId != null && plan?.id != null) {
+    return String(phase.customPlanId) === String(plan.id);
+  }
+  const phaseStart = phase?.start ? toIsoDate(phase.start) : null;
+  const phaseEnd = phase?.end ? toIsoDate(phase.end) : null;
+  return dateWindowContains(plan?.start, plan?.end, phaseStart) && dateWindowContains(plan?.start, plan?.end, phaseEnd);
+}
+
+// Replacement for the retired current-custom-plan endpoint: the plan whose window contains today,
+// with its phases attached. Returns a raw-shaped plan for compactCurrentPlan, or null.
+export function deriveCurrentPlanFromPlans(plans, phases, todayDateOnly, { memberId = null } = {}) {
+  const planList = Array.isArray(plans) ? plans : [];
+  const phaseList = Array.isArray(phases) ? phases : [];
+  const activePlans = planList
+    .filter((plan) => dateWindowContains(plan?.start, plan?.end, todayDateOnly))
+    .sort((a, b) => toIsoDate(b.start).localeCompare(toIsoDate(a.start)));
+  const plan = activePlans[0];
+  if (!plan) return null;
+
+  const planPhases = phaseList
+    .filter((phase) => phaseBelongsToPlan(phase, plan))
+    .sort((a, b) => (a?.start && b?.start ? toIsoDate(a.start).localeCompare(toIsoDate(b.start)) : 0));
+  const currentPhase =
+    planPhases.find((phase) => dateWindowContains(phase?.start, phase?.end, todayDateOnly)) ?? null;
+
+  return {
+    id: plan.id ?? null,
+    name: plan.name ?? null,
+    memberId: plan.memberId ?? memberId,
+    discipline: plan.discipline ?? null,
+    volume: plan.volume ?? null,
+    start: plan.start ?? null,
+    end: plan.end ?? null,
+    canEdit: plan.canEdit ?? null,
+    currentPhase: currentPhase?.type ?? plan.phase ?? null,
+    currentPhaseId: currentPhase?.id ?? null,
+    currentPhaseName: currentPhase?.planName ?? null,
+    currentPhaseStart: currentPhase?.start ?? null,
+    currentPhaseEnd: currentPhase?.end ?? null,
+    plannedActivityGroupType: plan.plannedActivityGroupType ?? null,
+    autoUpdateApplied: plan.autoUpdateApplied ?? null,
+    phases: planPhases,
+    source: "all-user-plans",
   };
 }