trainerroad-cli 0.2.0 → 0.4.0

package/src/commands/discovery.mjs

@@ -12,6 +12,7 @@ export function buildDiscoveryPayload(level = 1, commandFilter = null) {
       name,
       summary: def.summary,
       usage: level >= 2 ? def.usage : undefined,
+      examples: level >= 2 ? def.examples : undefined,
       supportsAgentFilters: FILTERABLE_COMMANDS.has(name),
       agentFilters: level >= 3 && FILTERABLE_COMMANDS.has(name) ? AGENT_FILTER_OPTIONS : undefined,
       agentOutputOptions:
@@ -27,11 +28,11 @@ export function buildDiscoveryPayload(level = 1, commandFilter = null) {
       level3: "Apply --from/--to/--type/--contains/--min-tss/--max-tss/--sort/--result-limit/--fields.",
     },
     firstSteps: [
-      "node src/cli.mjs capabilities --json",
-      "node src/cli.mjs whoami --json",
-      "node src/cli.mjs future --days 30 --json",
-      "node src/cli.mjs today --tz America/New_York --json",
-      "node src/cli.mjs help future --json",
+      "trainerroad-cli capabilities --json",
+      "trainerroad-cli whoami --json",
+      "trainerroad-cli future --days 30 --json",
+      "trainerroad-cli today --tz America/New_York --json",
+      "trainerroad-cli help future --json",
     ],
     commandCount: commandEntries.length,
     commands: commandEntries,
@@ -42,17 +43,17 @@ export function buildDiscoveryPayload(level = 1, commandFilter = null) {
       {
         pattern: "Summarize future workouts in a date window",
         command:
-          "node src/cli.mjs future --from 2026-03-01 --to 2026-03-31 --fields id,title,tss,date --sort date --json",
+          "trainerroad-cli future --from 2026-03-01 --to 2026-03-31 --fields id,title,tss,date --sort date --json",
       },
       {
         pattern: "Find hard completed rides",
         command:
-          "node src/cli.mjs past --days 90 --details --min-tss 80 --sort tss-desc --result-limit 20 --jsonl",
+          "trainerroad-cli past --days 90 --details --min-tss 80 --sort tss-desc --result-limit 20 --jsonl",
       },
       {
         pattern: "Extract only fields for downstream tools",
         command:
-          "node src/cli.mjs today --details --fields recordType,name,started,tss --json",
+          "trainerroad-cli today --details --fields recordType,name,started,tss --json",
       },
     ];
   }

package/src/commands/event-mutations.mjs

@@ -0,0 +1,174 @@
+import { compactEventRecord } from "../lib/planning-normalizers.mjs";
+
+// Discipline ids from the web app's event picker (2026-09-02).
+export const EVENT_DISCIPLINES = {
+  "climbing-road-race": 0,
+  "rolling-road-race": 1,
+  "time-trial": 2,
+  criterium: 3,
+  "gran-fondo": 4,
+  cyclocross: 5,
+  "sprint-triathlon": 6,
+  "olympic-triathlon": 7,
+  "half-triathlon": 8,
+  "full-triathlon": 9,
+  "off-road-triathlon": 10,
+  "xc-olympic": 11,
+  "xc-marathon": 12,
+  "short-track": 13,
+  gravity: 14,
+  enduro: 15,
+  gravel: 16,
+};
+
+const RACE_PRIORITIES = { a: 3, b: 2, c: 1 };
+const STRESS_ESTIMATE_TSS = 1;
+const STRESS_ESTIMATE_INTENSITY = 2;
+
+const ADAPTIVE_NOTE =
+  "TrainerRoad builds and adapts the plan around A and B events, so adding one can reshape upcoming workouts. Re-read `future` afterwards.";
+
+function disciplineLabel(id) {
+  return Object.entries(EVENT_DISCIPLINES).find(([, value]) => value === id)?.[0] ?? `discipline-${id}`;
+}
+
+function resolveDiscipline(value) {
+  if (value === undefined || value === null || value === "") return null;
+  const raw = String(value).trim().toLowerCase();
+  if (/^\d+$/.test(raw)) {
+    const id = Number(raw);
+    return { id, label: disciplineLabel(id) };
+  }
+  const key = raw.replace(/[\s_]+/g, "-");
+  if (EVENT_DISCIPLINES[key] === undefined) return null;
+  return { id: EVENT_DISCIPLINES[key], label: key };
+}
+
+function resolvePriority(value) {
+  const raw = String(value ?? "b").trim().toLowerCase();
+  if (/^[123]$/.test(raw)) return Number(raw);
+  return RACE_PRIORITIES[raw] ?? null;
+}
+
+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 eventIdsOnCalendar(client, memberInfo) {
+  const timeline = await client.getTimeline(memberInfo.memberId, memberInfo.username);
+  const rows = Array.isArray(timeline?.events) ? timeline.events : [];
+  return new Map(rows.filter((row) => row?.id).map((row) => [String(row.id), row]));
+}
+
+export async function commandAddEvent(flags, deps) {
+  const { isJsonMode, requireFlag, toBoolean, normalizeDateOnlyInput, requirePositiveInteger, requireNumber, writeOutput } = deps;
+  const dryRun = toBoolean(flags["dry-run"], false);
+  const name = String(requireFlag("add-event", flags, "name"));
+  const date = normalizeDateOnlyInput(requireFlag("add-event", flags, "date"), null);
+  if (!date) throw new Error(`Invalid --date "${flags.date}". Expected YYYY-MM-DD.`);
+  const discipline = resolveDiscipline(requireFlag("add-event", flags, "discipline"));
+  if (!discipline) {
+    throw new Error(
+      `Invalid --discipline "${flags.discipline}". Expected one of: ${Object.keys(EVENT_DISCIPLINES).join(", ")}, or a numeric id.`,
+    );
+  }
+  const priority = resolvePriority(flags.priority);
+  if (priority === null) throw new Error(`Invalid --priority "${flags.priority}". Expected A, B, or C.`);
+  const durationMinutes = requirePositiveInteger(flags.duration, null);
+  if (!durationMinutes) throw new Error("--duration <minutes> is required for add-event.");
+
+  const tss = flags.tss !== undefined && flags.tss !== null && flags.tss !== "" ? requireNumber(flags.tss, null) : null;
+  const intensity =
+    flags.intensity !== undefined && flags.intensity !== null && flags.intensity !== ""
+      ? requireNumber(flags.intensity, null)
+      : null;
+  if (tss === null && intensity === null) {
+    throw new Error("add-event needs either --tss <number> or --intensity <1-10> so TrainerRoad can estimate the event's stress.");
+  }
+  const notes = flags.notes !== undefined && flags.notes !== null ? String(flags.notes) : "";
+
+  const request = {
+    customPlanId: null,
+    name,
+    date,
+    time: null,
+    discipline: discipline.id,
+    duration: durationMinutes * 60,
+    notes,
+    racePriority: priority,
+    stressEstimateType: tss !== null ? STRESS_ESTIMATE_TSS : STRESS_ESTIMATE_INTENSITY,
+    stressEstimateValue: tss !== null ? null : intensity,
+    tss: tss !== null ? tss : null,
+    manuallyCompleted: false,
+  };
+  const priorityLabel = Object.entries(RACE_PRIORITIES).find(([, value]) => value === priority)[0].toUpperCase();
+  const preview = {
+    name,
+    date,
+    discipline: discipline.label,
+    disciplineId: discipline.id,
+    priority: priorityLabel,
+    racePriority: priority,
+    durationMinutes,
+    tss,
+    intensity,
+    notes,
+  };
+
+  const { client, memberInfo } = await requirePrivateMember(flags, deps);
+  const base = {
+    generatedAt: new Date().toISOString(),
+    command: "add-event",
+    member: { memberId: memberInfo.memberId, username: memberInfo.username },
+    query: preview,
+    adaptiveTraining: ADAPTIVE_NOTE,
+  };
+
+  if (dryRun) {
+    const payload = {
+      ...base,
+      dryRun: true,
+      event: null,
+      request,
+      message: `Would add ${priorityLabel} event "${name}" (${discipline.label}) on ${date}.`,
+    };
+    if (!isJsonMode(flags)) {
+      await writeOutput(payload, flags, (value) => `${value.message}\nNo changes made.`);
+      return;
+    }
+    await writeOutput(payload, { ...flags, json: !flags.jsonl });
+    return;
+  }
+
+  const before = await eventIdsOnCalendar(client, memberInfo);
+  const response = await client.createEvent(request, memberInfo.username);
+  const after = await eventIdsOnCalendar(client, memberInfo);
+  const createdRow = [...after.entries()].find(([id]) => !before.has(id))?.[1] ?? null;
+  const event = createdRow ? compactEventRecord(createdRow) : null;
+
+  const payload = {
+    ...base,
+    dryRun: false,
+    event,
+    request,
+    response: flags.full ? response : undefined,
+    message: event
+      ? `Added ${priorityLabel} event "${event.name}" on ${event.dateOnly} (plannedActivityId=${event.id}). Remove it with remove-workout --id ${event.id}.`
+      : "TrainerRoad accepted the event but it could not be located on the calendar afterwards. Run `events` to inspect.",
+  };
+
+  if (!isJsonMode(flags)) {
+    await writeOutput(payload, flags, (value) => `${value.message}\n${value.adaptiveTraining}`);
+    return;
+  }
+  await writeOutput(payload, { ...flags, json: !flags.jsonl });
+}

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,14 +1,8 @@
+import { isHttpStatus } from "../trainerroad-client.mjs";
+
 const ALTERNATE_CATEGORIES = new Set(["similar", "easier", "harder", "longer", "shorter"]);
 const SWITCH_MODES = new Set(["inside", "outside"]);
 
-function requireFlag(flags, name) {
-  const value = flags[name];
-  if (value === undefined || value === null || value === "") {
-    throw new Error(`Missing required flag --${name}.`);
-  }
-  return value;
-}
-
 function toIsoDateFromApiDate(date) {
   if (!date || typeof date !== "object") return null;
   const year = String(date.year ?? "").padStart(4, "0");
@@ -69,18 +63,10 @@ async function requirePrivateMember(flags, deps) {
   return { client, memberInfo };
 }
 
-async function fetchBeforeAfter(flags, deps, mutate) {
-  const { client, memberInfo } = await requirePrivateMember(flags, deps);
-  const plannedActivityId = String(requireFlag(flags, "id"));
-  const before = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
-  const mutation = await mutate({ client, memberInfo, plannedActivityId, before });
-  const after = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
-  return { client, memberInfo, plannedActivityId, before, after, mutation };
-}
-
 export async function commandWorkoutAlternates(flags, deps) {
-  const { isJsonMode, writeOutput } = deps;
+  const { isJsonMode, requireFlag, writeOutput } = deps;
   const category = String(flags.category ?? "similar").toLowerCase();
+  const plannedActivityId = String(requireFlag("workout-alternates", flags, "id"));
   if (!ALTERNATE_CATEGORIES.has(category)) {
     throw new Error(
       `Invalid --category "${category}". Expected one of: ${Array.from(ALTERNATE_CATEGORIES).join(", ")}.`,
@@ -88,7 +74,6 @@ export async function commandWorkoutAlternates(flags, deps) {
   }
 
   const { client, memberInfo } = await requirePrivateMember(flags, deps);
-  const plannedActivityId = String(requireFlag(flags, "id"));
   const plannedActivity = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
   const alternates = await client.getPlannedActivityAlternates(
     plannedActivityId,
@@ -128,14 +113,47 @@ export async function commandWorkoutAlternates(flags, deps) {
 }
 
 export async function commandMoveWorkout(flags, deps) {
-  const { isJsonMode, writeOutput } = deps;
-  const newDate = String(requireFlag(flags, "to"));
-  const { memberInfo, plannedActivityId, before, after, mutation } = await fetchBeforeAfter(
-    flags,
-    deps,
-    async ({ client, memberInfo, plannedActivityId }) =>
-      client.movePlannedActivity(plannedActivityId, newDate, memberInfo.username),
-  );
+  const { isJsonMode, requireFlag, toBoolean, writeOutput } = deps;
+  const dryRun = toBoolean(flags["dry-run"], false);
+  const plannedActivityId = String(requireFlag("move-workout", flags, "id"));
+  const newDate = String(requireFlag("move-workout", flags, "to"));
+  const { client, memberInfo } = await requirePrivateMember(flags, deps);
+  const before = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
+  const beforeSummary = summarizePlannedActivity(before);
+  const noop = beforeSummary?.date === newDate;
+
+  if (dryRun || noop) {
+    const payload = {
+      generatedAt: new Date().toISOString(),
+      command: "move-workout",
+      member: { memberId: memberInfo.memberId, username: memberInfo.username },
+      query: { plannedActivityId, to: newDate },
+      dryRun,
+      noop,
+      before: beforeSummary,
+      after: noop ? beforeSummary : { ...beforeSummary, date: newDate },
+      mutation: null,
+      message: noop
+        ? `Workout is already scheduled on ${newDate}.`
+        : `Would move ${beforeSummary?.workoutName ?? "workout"} to ${newDate}.`,
+    };
+
+    if (!isJsonMode(flags)) {
+      await writeOutput(payload, flags, (value) => {
+        if (value.noop) {
+          return `No changes: plannedActivityId=${value.query.plannedActivityId} is already on ${value.query.to}`;
+        }
+        return `Would move ${value.before?.workoutName ?? "workout"} | plannedActivityId=${value.query.plannedActivityId} | ${value.before?.date ?? "?"} -> ${value.query.to}\nNo changes made.`;
+      });
+      return;
+    }
+
+    await writeOutput(payload, { ...flags, json: !flags.jsonl });
+    return;
+  }
+
+  const mutation = await client.movePlannedActivity(plannedActivityId, newDate, memberInfo.username);
+  const after = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
 
   const payload = {
     generatedAt: new Date().toISOString(),
@@ -158,22 +176,54 @@ export async function commandMoveWorkout(flags, deps) {
 }
 
 export async function commandReplaceWorkout(flags, deps) {
-  const { isJsonMode, toBoolean, writeOutput } = deps;
-  const alternateWorkoutId = Number(requireFlag(flags, "alternate-id"));
+  const { isJsonMode, requireFlag, toBoolean, writeOutput } = deps;
+  const dryRun = toBoolean(flags["dry-run"], false);
+  const plannedActivityId = String(requireFlag("replace-workout", flags, "id"));
+  const alternateWorkoutId = Number(requireFlag("replace-workout", flags, "alternate-id"));
   if (!Number.isFinite(alternateWorkoutId)) {
     throw new Error(`Invalid --alternate-id "${flags["alternate-id"]}". Expected a numeric workout ID.`);
   }
   const updateDuration = toBoolean(flags["update-duration"], false);
+  const { client, memberInfo } = await requirePrivateMember(flags, deps);
+  const before = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
+  const beforeSummary = summarizePlannedActivity(before);
+  const noop = Number(beforeSummary?.workoutId) === alternateWorkoutId;
 
-  const { memberInfo, plannedActivityId, before, after, mutation } = await fetchBeforeAfter(
-    flags,
-    deps,
-    async ({ client, memberInfo, plannedActivityId }) =>
-      client.replacePlannedActivityWithAlternate(plannedActivityId, alternateWorkoutId, {
-        updateDuration,
-        usernameForReferer: memberInfo.username,
-      }),
-  );
+  if (dryRun || noop) {
+    const payload = {
+      generatedAt: new Date().toISOString(),
+      command: "replace-workout",
+      member: { memberId: memberInfo.memberId, username: memberInfo.username },
+      query: { plannedActivityId, alternateWorkoutId, updateDuration },
+      dryRun,
+      noop,
+      before: beforeSummary,
+      after: noop ? beforeSummary : null,
+      mutation: null,
+      message: noop
+        ? `Workout already uses alternate workout ${alternateWorkoutId}.`
+        : `Would replace workout ${beforeSummary?.workoutId ?? "?"} with ${alternateWorkoutId}.`,
+    };
+
+    if (!isJsonMode(flags)) {
+      await writeOutput(payload, flags, (value) => {
+        if (value.noop) {
+          return `No changes: plannedActivityId=${value.query.plannedActivityId} already uses workoutId=${value.query.alternateWorkoutId}`;
+        }
+        return `Would replace workout | plannedActivityId=${value.query.plannedActivityId} | workoutId=${value.before?.workoutId ?? "?"} -> alternateWorkoutId=${value.query.alternateWorkoutId}\nNo changes made.`;
+      });
+      return;
+    }
+
+    await writeOutput(payload, { ...flags, json: !flags.jsonl });
+    return;
+  }
+
+  const mutation = await client.replacePlannedActivityWithAlternate(plannedActivityId, alternateWorkoutId, {
+    updateDuration,
+    usernameForReferer: memberInfo.username,
+  });
+  const after = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
 
   const payload = {
     generatedAt: new Date().toISOString(),
@@ -196,18 +246,50 @@ export async function commandReplaceWorkout(flags, deps) {
 }
 
 export async function commandSwitchWorkout(flags, deps) {
-  const { isJsonMode, writeOutput } = deps;
-  const mode = String(requireFlag(flags, "mode")).toLowerCase();
+  const { isJsonMode, requireFlag, toBoolean, writeOutput } = deps;
+  const dryRun = toBoolean(flags["dry-run"], false);
+  const plannedActivityId = String(requireFlag("switch-workout", flags, "id"));
+  const mode = String(requireFlag("switch-workout", flags, "mode")).toLowerCase();
   if (!SWITCH_MODES.has(mode)) {
     throw new Error(`Invalid --mode "${mode}". Expected one of: ${Array.from(SWITCH_MODES).join(", ")}.`);
   }
+  const { client, memberInfo } = await requirePrivateMember(flags, deps);
+  const before = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
+  const beforeSummary = summarizePlannedActivity(before);
+  const noop = beforeSummary?.isOutside === (mode === "outside");
 
-  const { memberInfo, plannedActivityId, before, after, mutation } = await fetchBeforeAfter(
-    flags,
-    deps,
-    async ({ client, memberInfo, plannedActivityId }) =>
-      client.switchPlannedActivityMode(plannedActivityId, mode, memberInfo.username),
-  );
+  if (dryRun || noop) {
+    const payload = {
+      generatedAt: new Date().toISOString(),
+      command: "switch-workout",
+      member: { memberId: memberInfo.memberId, username: memberInfo.username },
+      query: { plannedActivityId, mode },
+      dryRun,
+      noop,
+      before: beforeSummary,
+      after: noop ? beforeSummary : { ...beforeSummary, isOutside: mode === "outside" },
+      mutation: null,
+      message: noop
+        ? `Workout is already in ${mode} mode.`
+        : `Would switch workout to ${mode} mode.`,
+    };
+
+    if (!isJsonMode(flags)) {
+      await writeOutput(payload, flags, (value) => {
+        if (value.noop) {
+          return `No changes: plannedActivityId=${value.query.plannedActivityId} is already ${value.query.mode}`;
+        }
+        return `Would switch workout | plannedActivityId=${value.query.plannedActivityId} | outside=${value.before?.isOutside} -> ${value.query.mode === "outside"}\nNo changes made.`;
+      });
+      return;
+    }
+
+    await writeOutput(payload, { ...flags, json: !flags.jsonl });
+    return;
+  }
+
+  const mutation = await client.switchPlannedActivityMode(plannedActivityId, mode, memberInfo.username);
+  const after = await client.getPlannedActivity(plannedActivityId, memberInfo.username);
 
   const payload = {
     generatedAt: new Date().toISOString(),
@@ -228,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 });
+}