@workingdevshero/olympia-ait-adapter 0.1.5 → 1.1.0

package/README.md

@@ -4,11 +4,11 @@
 
 # olympia-ait-adapter
 
-MCP adapter that converts Olympia Fitness & Performance program XLSX workbooks
-to and from a strict JSON schema. Built for the
-[Automate It](https://automate.it.com) framework so AI agents can author new
-strength-and-conditioning programs from prior client data without ever
-touching XLSX directly.
+MCP adapter that converts Olympia Fitness & Performance XLSX workbooks —
+training programs and their companion warm-up documents — to and from strict
+JSON schemas. Built for the [Automate It](https://automate.it.com) framework
+so AI agents can author new strength-and-conditioning paperwork from prior
+client data without ever touching XLSX directly.
 
 ## Why this exists
 
@@ -17,37 +17,48 @@ file, one sheet per training day, with merged cells, custom borders, an
 embedded logo, and a domain-specific notation (`12E`, `:20E`, `12EL`,
 `x3 Rest :60`, etc.). Asking an LLM to edit XLSX directly is fragile: it
 corrupts merges, loses the logo, and can't reason about the implicit
-6-week / 1A-1B / set-by-set structure encoded in the visual layout.
+multi-week / 1A-1B / set-by-set structure encoded in the visual layout.
 
-This package gives the agent a clean structured view of an Olympia program
+Each program also ships with a **companion warm-up workbook** — same client,
+same date, paired day-for-day (the "Day 4" warm-up column is performed
+before the "Day 4" program sheet). It's a completely different layout: one
+sheet where each day is a column of titled sections of freeform exercise
+lines.
+
+This package gives the agent a clean structured view of both document types
 and guarantees well-formed output: the LLM reads JSON, reasons about it,
 writes JSON, and the adapter handles all the visual fidelity on the way
 back to XLSX.
 
 ## What it does
 
-Two MCP tools, exposed over stdio:
+Four MCP tools, exposed over stdio:
 
-| Tool                     | Direction       | Purpose                                                            |
-| ------------------------ | --------------- | ------------------------------------------------------------------ |
-| `olympia_xlsx_to_json`   | XLSX → JSON     | Parse an Olympia workbook into a typed `Program` document.         |
-| `olympia_json_to_xlsx`   | JSON → XLSX     | Render a `Program` document back to a styled .xlsx on disk.        |
+| Tool                           | Direction   | Purpose                                                          |
+| ------------------------------ | ----------- | ---------------------------------------------------------------- |
+| `olympia_program_xlsx_to_json` | XLSX → JSON | Parse an Olympia program workbook into a typed `Program`.        |
+| `olympia_program_json_to_xlsx` | JSON → XLSX | Render a `Program` back to a styled .xlsx on disk.               |
+| `olympia_warmup_xlsx_to_json`  | XLSX → JSON | Parse a companion warm-up workbook into a typed `WarmUpDocument`. |
+| `olympia_warmup_json_to_xlsx`  | JSON → XLSX | Render a `WarmUpDocument` back to a styled .xlsx on disk.        |
 
-The JSON schema is defined once in `src/schema/program.ts` using Zod and
-surfaces as:
+The JSON schemas are defined once in `src/schema/program.ts` and
+`src/schema/warmup.ts` using Zod and surface as:
 
 1. The TypeScript type used internally
 2. The runtime validator at each tool boundary
 3. The JSON Schema published as each tool's `inputSchema` so the LLM sees
    the full typed contract at discovery time
 
-## JSON shape
+All object schemas are strict: unknown fields are rejected with an error
+rather than silently stripped, so callers authoring against a stale
+contract fail loudly.
+
+## JSON shape — programs
 
 ```ts
 type Program = {
   client: string;                  // "Bobby Galli"
   programDate: string;             // "4.26"
-  weekDates?: (string | null)[];   // optional, length 6
   days: Day[];
 };
 
@@ -66,20 +77,21 @@ type Exercise = {
   name: string;                    // "2DB Alternating Bench Press"
   groupLabel?: string;             // "1A", "1B", "2A"…  matches /^\d+[A-Z]$/
   notes?: string;
-  sets: (string | null)[][];       // [setIdx][weekIdx]; inner length 6
+  sets: (string | null)[][];       // [setIdx][weekIdx]; one entry per week (4 or 6)
+  weights?: (string | null)[][];   // Weight column, same shape as sets
 };
 
 type SupplementalNote = {
   row: number;                     // offset from "Sport Specific/" label row
-  col: string;                     // "C" | "D" | … | "P"
+  col: string;                     // a week's Reps column: "D" | "F" | … (one per week)
   value: string;
 };
 ```
 
 ### Prescription cell grammar
 
-Olympia does **not** prescribe weights. Each `sets[setIdx][weekIdx]` is a
-single opaque string encoding **reps**, **time**, or **breaths**:
+Each `sets[setIdx][weekIdx]` is a single opaque string encoding **reps**,
+**time**, or **breaths**:
 
 | Format                | Meaning                              |
 | --------------------- | ------------------------------------ |
@@ -90,10 +102,36 @@ single opaque string encoding **reps**, **time**, or **breaths**:
 | free-form strings     | circuit-style instructions, OK too   |
 | `null`                | empty cell                           |
 
-The schema enforces shape (6 weeks per set, group label regex, allowed
-section kinds) but does **not** validate the grammar of each prescription
+The schema enforces shape (1-6 weeks per set and the same count for every
+set in a program, group label regex, allowed section kinds) but does **not** validate the grammar of each prescription
 string — Olympia's own files include free-form entries in some spots.
 
+The `Date:` cells in each sheet's header row are **intentionally left
+blank** — clients hand-write the week dates on the printed sheet, so the
+schema has no field for them and the writer never fills them.
+
+### Weight column
+
+Each week has a Weight cell beside its reps cell. Most are left empty for
+the client to fill in by hand, but coaches type starting loads (`25`) and
+equipment settings there too: a band colour (`Yel`), a box height
+(`12" + 2 Pads`), a rack position (`#10`). `weights` carries those cells
+as free text, in the same shape as `sets`, and is omitted when every cell
+is empty.
+
+### Week count and sheet layout
+
+Olympia programs run 4 or 6 weeks. The week count is the length of each
+set row; the writer lays the sheet out with exactly that many week pairs
+and puts the Notes column right after the last one (L for 4 weeks, P for
+6). The reader finds the table from its `Exercise | Reps | Weight …`
+header row, so it handles both lengths and the two header positions seen
+in coach-built files (row 4 or row 5).
+
+Warm-up exercises listed inside a day sheet are closed by a `Warmup N`
+label row; they decode into a `warmup` section and are written back the
+same way.
+
 ### Supplemental area
 
 The bottom of every day sheet is a trainer-managed "Sport Specific /
@@ -107,6 +145,46 @@ drills, recovery work). The adapter:
   "Supplemental" labels) at the bottom of every day, then layers any
   supplied `supplementalNotes` on top.
 
+## JSON shape — warm-ups
+
+```ts
+type WarmUpDocument = {
+  client: string;                  // "Bobby Galli" — same as companion program
+  warmUpDate: string;              // "4.26" — matches the companion programDate
+  days: WarmUpDay[];
+};
+
+type WarmUpDay = {
+  name: string;                    // "Day 4" — matches a program day sheet name
+  sections: WarmUpSection[];
+};
+
+type WarmUpSection = {
+  title: string;                   // "Foam Roll", "Prep \ Activation X2 Rounds"
+  items: WarmUpItem[];
+};
+
+type WarmUpItem = {
+  text: string;                    // "Pecs :45E" — prescription inline, never parsed
+  note?: string;                   // "(^R.F.E on SB, F-Roller for Balance^)"
+};
+```
+
+The warm-up layout is days-as-columns on a single sheet (A, C, E, … with
+empty gutter columns between), sections row-aligned across days. Section
+headers are bold; exercise lines are plain with the prescription shorthand
+embedded in the text (`:45E`, `X8br`, `X4ES` — trainer conventions, kept
+opaque); note lines render in italics under their exercise. When decoding,
+italic or fully-parenthesized lines are treated as notes attached to the
+item above — so never author an item whose entire text is parenthesized.
+
+## Skill
+
+`skills/olympia-authoring/SKILL.md` (shipped in the npm package) is an
+agent-facing technical reference covering both formats: the schemas, the
+prescription notation, the program/warm-up pairing rules, and the
+decode → author → encode workflow.
+
 ## Installation
 
 ```bash
@@ -143,29 +221,38 @@ Claude or another MCP client, add an entry like:
 }
 ```
 
-Both tools take absolute paths to .xlsx files on the local filesystem.
+All tools take absolute paths to .xlsx files on the local filesystem.
 
 ## Repo layout
 
 ```
 src/
-  schema/program.ts          # Zod schema — single source of truth
+  schema/
+    program.ts               # Zod schema for programs — single source of truth
+    warmup.ts                # Zod schema for warm-up documents
   reader/
+    cell-utils.ts            # Shared ExcelJS cell-value helpers
     parse-workbook.ts        # Workbook → Program JSON
     parse-day-sheet.ts       # One sheet, section detection, supplemental capture
+    parse-warmup-workbook.ts # Warm-up workbook → WarmUpDocument JSON
   writer/
     build-workbook.ts        # Program → ExcelJS workbook
+    build-warmup-workbook.ts # WarmUpDocument → ExcelJS workbook
     layout.ts                # Column widths, row positions, logo anchor
     styles.ts                # All borders/fonts/fills as constants
     stamp-exercise.ts        # One exercise block (variable sets, group borders)
     supplemental-template.ts # Fixed bottom template + supplementalNotes overlay
   tools/
-    xlsx-to-json.ts          # MCP handler
-    json-to-xlsx.ts          # MCP handler
-  server.ts                  # Bootstrap, registers both tools
+    program-xlsx-to-json.ts  # MCP handler
+    program-json-to-xlsx.ts  # MCP handler
+    warmup-xlsx-to-json.ts   # MCP handler
+    warmup-json-to-xlsx.ts   # MCP handler
+  server.ts                  # Bootstrap, registers all four tools
   assets/
     olympia-logo.png         # Extracted from sample workbooks; embedded in output
 
+skills/
+  olympia-authoring/SKILL.md # Agent-facing technical reference for both formats
 samples/                     # Real Olympia .xlsx files used as round-trip fixtures
 scripts/                     # Inspection helpers used during development
 tests/                       # vitest — schema, reader, round-trip, MCP smoke
@@ -181,16 +268,33 @@ npm run typecheck            # tsc --noEmit
 
 Coverage:
 
-- **`schema.test.ts`** — Zod rejects malformed input (week count, group
-  label regex, section kinds, missing fields).
-- **`reader.test.ts`** — All three sample workbooks parse into
-  schema-valid `Program` documents; spot checks on Bobby's first exercise,
-  Giulianna's variable set counts, exercise notes, supplemental notes.
+- **`schema.test.ts`** — Zod rejects malformed program input (week count,
+  group label regex, section kinds, missing fields).
+- **`reader.test.ts`** — All three program samples parse into schema-valid
+  `Program` documents; spot checks on Bobby's first exercise, Giulianna's
+  variable set counts, exercise notes, supplemental notes.
+- **`week-count.test.ts`** — A 4-week program is laid out with four week
+  pairs and round-trips; a hand-built 4-week sheet (header on row 4,
+  `Warmup N` labels, Notes in column L) decodes correctly.
+- **`weights.test.ts`** — Weight-column cells are written beside their
+  reps, round-trip, and must match the shape of `sets`.
 - **`round-trip.test.ts`** — The primary determinism guarantee: for each
-  sample, `parse → write → parse` produces JSON equal to the original.
+  program sample, `parse → write → parse` produces JSON equal to the
+  original.
+- **`warmup-doc-schema.test.ts`** — Zod accept/reject tables for the
+  warm-up document schema.
+- **`warmup-doc-reader.test.ts`** — The warm-up sample parses into a
+  schema-valid `WarmUpDocument` with verbatim spot checks (including the
+  note-attachment rule); warning paths for irregular layouts.
+- **`warmup-doc-writer.test.ts`** — Day/section/item/note styling and
+  cross-day section alignment, verified by re-reading the written file.
+- **`warmup-doc-round-trip.test.ts`** — Warm-up determinism: the sample
+  and an authored document both survive `parse → write → parse` /
+  `write → parse` unchanged.
 - **`mcp-smoke.test.ts`** — End-to-end MCP server check via the in-memory
-  transport: tool discovery, round-trip via `client.callTool`, schema
-  rejection of malformed input at the SDK boundary.
+  transport: tool discovery (all four tools), round-trips via
+  `client.callTool` for both document types, schema rejection of malformed
+  input at the SDK boundary.
 
 ## Determinism
 

package/dist/index.d.ts

@@ -1,5 +1,8 @@
-export { Program, Day, Section, SectionKind, Exercise, SetRow, Cell, SupplementalNote, XlsxToJsonInput, XlsxToJsonOutput, JsonToXlsxInput, JsonToXlsxOutput, } from "./schema/program.js";
+export { Program, Day, Section, SectionKind, Exercise, SetRow, Cell, WeightCell, SupplementalNote, ProgramXlsxToJsonInput, ProgramXlsxToJsonOutput, ProgramJsonToXlsxInput, ProgramJsonToXlsxOutput, } from "./schema/program.js";
+export { WarmUpDocument, WarmUpDay, WarmUpSection, WarmUpItem, WarmUpXlsxToJsonInput, WarmUpXlsxToJsonOutput, WarmUpJsonToXlsxInput, WarmUpJsonToXlsxOutput, } from "./schema/warmup.js";
 export { createServer } from "./server.js";
-export { parseWorkbook } from "./reader/parse-workbook.js";
-export { buildWorkbook } from "./writer/build-workbook.js";
+export { parseProgramWorkbook } from "./reader/parse-workbook.js";
+export { buildProgramWorkbook } from "./writer/build-workbook.js";
+export { parseWarmUpWorkbook } from "./reader/parse-warmup-workbook.js";
+export { buildWarmUpWorkbook } from "./writer/build-warmup-workbook.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,GAAG,EACH,OAAO,EACP,WAAW,EACX,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,GAAG,EACH,OAAO,EACP,WAAW,EACX,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,cAAc,EACd,SAAS,EACT,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC"}

package/dist/index.js

@@ -1,8 +1,11 @@
 // Programmatic entry point. The package's primary use is the MCP CLI
 // (registered under the `bin` field), but the schema and server factory
 // are also exported for callers that want to embed or compose the adapter.
-export { Program, Day, Section, SectionKind, Exercise, SetRow, Cell, SupplementalNote, XlsxToJsonInput, XlsxToJsonOutput, JsonToXlsxInput, JsonToXlsxOutput, } from "./schema/program.js";
+export { Program, Day, Section, SectionKind, Exercise, SetRow, Cell, WeightCell, SupplementalNote, ProgramXlsxToJsonInput, ProgramXlsxToJsonOutput, ProgramJsonToXlsxInput, ProgramJsonToXlsxOutput, } from "./schema/program.js";
+export { WarmUpDocument, WarmUpDay, WarmUpSection, WarmUpItem, WarmUpXlsxToJsonInput, WarmUpXlsxToJsonOutput, WarmUpJsonToXlsxInput, WarmUpJsonToXlsxOutput, } from "./schema/warmup.js";
 export { createServer } from "./server.js";
-export { parseWorkbook } from "./reader/parse-workbook.js";
-export { buildWorkbook } from "./writer/build-workbook.js";
+export { parseProgramWorkbook } from "./reader/parse-workbook.js";
+export { buildProgramWorkbook } from "./writer/build-workbook.js";
+export { parseWarmUpWorkbook } from "./reader/parse-warmup-workbook.js";
+export { buildWarmUpWorkbook } from "./writer/build-warmup-workbook.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,wEAAwE;AACxE,2EAA2E;AAE3E,OAAO,EACL,OAAO,EACP,GAAG,EACH,OAAO,EACP,WAAW,EACX,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,wEAAwE;AACxE,2EAA2E;AAE3E,OAAO,EACL,OAAO,EACP,GAAG,EACH,OAAO,EACP,WAAW,EACX,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,cAAc,EACd,SAAS,EACT,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC"}

package/dist/reader/cell-utils.d.ts

@@ -0,0 +1,10 @@
+import type ExcelJS from "exceljs";
+/**
+ * Best-effort plain-text extraction from an ExcelJS cell value: handles
+ * strings, numbers, booleans, dates, rich text, hyperlink-style `{ text }`
+ * objects, and formula results. Anything else becomes "".
+ */
+export declare function cellText(value: ExcelJS.CellValue | undefined | null): string;
+export declare function cellOrNull(value: ExcelJS.CellValue | undefined | null): string | null;
+export declare function isMergeContinuation(cell: ExcelJS.Cell): boolean;
+//# sourceMappingURL=cell-utils.d.ts.map

package/dist/reader/cell-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cell-utils.d.ts","sourceRoot":"","sources":["../../src/reader/cell-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAmB5E;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,IAAI,GAC1C,MAAM,GAAG,IAAI,CAGf;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,OAAO,CAI/D"}

package/dist/reader/cell-utils.js

@@ -0,0 +1,40 @@
+/**
+ * Best-effort plain-text extraction from an ExcelJS cell value: handles
+ * strings, numbers, booleans, dates, rich text, hyperlink-style `{ text }`
+ * objects, and formula results. Anything else becomes "".
+ */
+export function cellText(value) {
+    if (value === null || value === undefined)
+        return "";
+    if (typeof value === "string")
+        return value;
+    if (typeof value === "number" || typeof value === "boolean")
+        return String(value);
+    if (value instanceof Date)
+        return value.toISOString();
+    if (typeof value === "object") {
+        if ("richText" in value && Array.isArray(value.richText)) {
+            return value.richText
+                .map((r) => r.text)
+                .join("");
+        }
+        if ("text" in value && typeof value.text === "string") {
+            return value.text;
+        }
+        if ("result" in value) {
+            return cellText(value.result);
+        }
+    }
+    return "";
+}
+export function cellOrNull(value) {
+    const t = cellText(value).trim();
+    return t === "" ? null : t;
+}
+export function isMergeContinuation(cell) {
+    if (!cell.isMerged)
+        return false;
+    const master = cell.master;
+    return master !== undefined && master.address !== cell.address;
+}
+//# sourceMappingURL=cell-utils.js.map

package/dist/reader/cell-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cell-utils.js","sourceRoot":"","sources":["../../src/reader/cell-utils.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,KAA2C;IAClE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACrD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAClF,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,UAAU,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAE,KAA+B,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpF,OAAQ,KAA0C,CAAC,QAAQ;iBACxD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBAClB,IAAI,CAAC,EAAE,CAAC,CAAC;QACd,CAAC;QACD,IAAI,MAAM,IAAI,KAAK,IAAI,OAAQ,KAA2B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7E,OAAQ,KAA0B,CAAC,IAAI,CAAC;QAC1C,CAAC;QACD,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;YACtB,OAAO,QAAQ,CAAE,KAAuC,CAAC,MAAM,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,KAA2C;IAE3C,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAkB;IACpD,IAAI,CAAC,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;AACjE,CAAC"}

package/dist/reader/parse-day-sheet.d.ts

@@ -2,7 +2,6 @@ import ExcelJS from "exceljs";
 import type { SupplementalNote, Day } from "../schema/program.js";
 export interface ParsedDay {
     sections: Day["sections"];
-    weekDates?: (string | null)[];
     supplementalNotes?: SupplementalNote[];
     warnings: string[];
 }

package/dist/reader/parse-day-sheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-day-sheet.d.ts","sourceRoot":"","sources":["../../src/reader/parse-day-sheet.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EACV,gBAAgB,EAEhB,GAAG,EAIJ,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IAC9B,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAmFD,wBAAgB,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,GAAG,SAAS,CAsG9D"}
+{"version":3,"file":"parse-day-sheet.d.ts","sourceRoot":"","sources":["../../src/reader/parse-day-sheet.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EACV,gBAAgB,EAEhB,GAAG,EAIJ,MAAM,sBAAsB,CAAC;AAG9B,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAyFD,wBAAgB,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,GAAG,SAAS,CA6H9D"}

package/dist/reader/parse-day-sheet.js

@@ -1,12 +1,10 @@
-const FIRST_BODY_ROW = 7;
-const WEEK_COLS = ["D", "F", "H", "J", "L", "N"];
-const SECTION_LABELS = new Map([
-    ["warmup", "warmup"],
-    ["sport specific", "sportSpecific"],
-    ["sport specific/", "sportSpecific"],
-    ["supplemental", "supplemental"],
-    ["conditioning", "conditioning"],
-]);
+import { cellText, cellOrNull, isMergeContinuation } from "./cell-utils.js";
+const MAX_WEEK_COUNT = 6;
+const FIRST_WEEK_COL_INDEX = 4; // column D
+const HEADER_SEARCH_ROWS = 12;
+// Layout of sheets written by this package, used when a sheet has no
+// recognizable "Exercise | Reps | Weight …" header row.
+const DEFAULT_HEADER_ROW = 5;
 const SUPPLEMENTAL_TRIGGER_LABELS = new Set([
     "sport specific",
     "sport specific/",
@@ -14,70 +12,62 @@ const SUPPLEMENTAL_TRIGGER_LABELS = new Set([
     "conditioning",
     "circuit",
 ]);
-// Columns scanned for supplementalNotes. Excludes A/B (cosmetic narrow margins)
-// and Q (rarely used).
-const SUPPLEMENTAL_COLS = ["C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P"];
 function isGroupLabel(s) {
     return /^\d+[A-Z]$/.test(s);
 }
-function cellText(value) {
-    if (value === null || value === undefined)
-        return "";
-    if (typeof value === "string")
-        return value;
-    if (typeof value === "number" || typeof value === "boolean")
-        return String(value);
-    if (value instanceof Date)
-        return value.toISOString();
-    if (typeof value === "object") {
-        if ("richText" in value && Array.isArray(value.richText)) {
-            return value.richText
-                .map((r) => r.text)
-                .join("");
-        }
-        if ("text" in value && typeof value.text === "string") {
-            return value.text;
-        }
-        if ("result" in value) {
-            return cellText(value.result);
+/** "Warmup 1", "Warm Up 2", "Warm-up 3": the label row closing an in-sheet warm-up exercise. */
+function isWarmupLabel(s) {
+    return /^warm[\s-]?up\s*#?\d+$/i.test(s);
+}
+/**
+ * Locate the exercise table from its header row ("Exercise | Reps | Weight |
+ * Reps | Weight | …"). Olympia's sheets vary: the header sits on row 4 or 5
+ * and a program runs 4 or 6 weeks, with the Notes column immediately right
+ * of the last week pair. The body starts two rows below the header.
+ */
+function detectLayout(ws) {
+    let headerRow = DEFAULT_HEADER_ROW;
+    let weekCount = MAX_WEEK_COUNT;
+    for (let r = 1; r <= HEADER_SEARCH_ROWS; r++) {
+        const row = ws.getRow(r);
+        if (cellText(row.getCell("C").value).trim().toLowerCase() !== "exercise")
+            continue;
+        let found = 0;
+        while (found < MAX_WEEK_COUNT &&
+            cellText(row.getCell(FIRST_WEEK_COL_INDEX + 2 * found).value).trim().toLowerCase() === "reps") {
+            found++;
         }
+        // An "Exercise" cell without Reps headers beside it (a title, a note)
+        // is not the header row; keep looking.
+        if (found === 0)
+            continue;
+        headerRow = r;
+        weekCount = found;
+        break;
     }
-    return "";
-}
-function cellOrNull(value) {
-    const t = cellText(value).trim();
-    return t === "" ? null : t;
-}
-function isMergeContinuation(cell) {
-    if (!cell.isMerged)
-        return false;
-    const master = cell.master;
-    return master !== undefined && master.address !== cell.address;
+    const weekCols = Array.from({ length: weekCount }, (_, i) => FIRST_WEEK_COL_INDEX + 2 * i);
+    return {
+        firstBodyRow: headerRow + 2,
+        weekCols,
+        notesCol: FIRST_WEEK_COL_INDEX + 2 * weekCount,
+    };
 }
-function readWeekRow(row) {
-    return WEEK_COLS.map((col) => cellOrNull(row.getCell(col).value));
+function readWeekRow(row, layout) {
+    return layout.weekCols.map((col) => cellOrNull(row.getCell(col).value));
 }
-function readWeekDates(row) {
-    return WEEK_COLS.map((col) => {
-        const t = cellText(row.getCell(col).value).trim();
-        if (t === "" || t.toLowerCase() === "date:")
-            return null;
-        return t;
-    });
+/** The Weight cell sits immediately right of each week's Reps cell. */
+function readWeightRow(row, layout) {
+    return layout.weekCols.map((col) => cellOrNull(row.getCell(col + 1).value));
 }
 export function parseDaySheet(ws) {
     const warnings = [];
     const sections = [];
+    const layout = detectLayout(ws);
     let current = { kind: "main", exercises: [] };
     let exercise = null;
-    let weekDates;
-    const dateRow = ws.getRow(2);
-    if (dateRow) {
-        const dates = readWeekDates(dateRow);
-        if (dates.some((d) => d !== null))
-            weekDates = dates;
-    }
-    const flushExercise = (groupLabel) => {
+    // An exercise closed by a "Warmup N" label belongs to the warmup section;
+    // every other exercise belongs to main. A change of kind starts a new section.
+    const flushExercise = (groupLabel, kind = "main") => {
         if (!exercise)
             return;
         const ex = {
@@ -88,9 +78,19 @@ export function parseDaySheet(ws) {
             ex.groupLabel = groupLabel;
         if (exercise.notes)
             ex.notes = exercise.notes;
+        if (exercise.weights.some((row) => row.some((cell) => cell !== null))) {
+            ex.weights = exercise.weights;
+        }
+        if (current.kind !== kind) {
+            if (current.exercises.length > 0) {
+                sections.push({ kind: current.kind, exercises: current.exercises });
+            }
+            current = { kind, exercises: [] };
+        }
         current.exercises.push(ex);
         exercise = null;
     };
+    const noteOf = (row) => cellText(row.getCell(layout.notesCol).value).trim();
     const flushSection = () => {
         flushExercise();
         sections.push({ kind: current.kind, exercises: current.exercises });
@@ -98,7 +98,7 @@ export function parseDaySheet(ws) {
     const lastRow = ws.actualRowCount > 0 ? ws.rowCount : 0;
     let supplementalStartRow;
     let supplementalNotes;
-    for (let r = FIRST_BODY_ROW; r <= lastRow; r++) {
+    for (let r = layout.firstBodyRow; r <= lastRow; r++) {
         const row = ws.getRow(r);
         const cCell = row.getCell("C");
         const cText = cellText(cCell.value).trim();
@@ -107,26 +107,41 @@ export function parseDaySheet(ws) {
         if (SUPPLEMENTAL_TRIGGER_LABELS.has(cLower)) {
             flushSection();
             supplementalStartRow = r;
-            supplementalNotes = captureSupplementalNotes(ws, r, lastRow);
+            supplementalNotes = captureSupplementalNotes(ws, r, lastRow, layout);
             break;
         }
-        // Group label terminates an exercise block.
-        if (cText !== "" && isGroupLabel(cText) && !isMergeContinuation(cCell)) {
+        // A group label ("1A") or warm-up label ("Warmup 1") terminates an exercise block.
+        const warmupLabel = isWarmupLabel(cText);
+        if (cText !== "" && (isGroupLabel(cText) || warmupLabel) && !isMergeContinuation(cCell)) {
             if (!exercise) {
-                warnings.push(`row ${r}: group label "${cText}" without a preceding exercise name`);
+                warnings.push(`row ${r}: label "${cText}" without a preceding exercise name`);
                 continue;
             }
-            exercise.sets.push(readWeekRow(row));
-            const pNote = cellText(row.getCell("P").value).trim();
+            // A label row with nothing in it, under rows that do hold a
+            // prescription, is only there to carry the label of a one-set
+            // exercise — it is not a set.
+            const labelSets = readWeekRow(row, layout);
+            const labelWeights = readWeightRow(row, layout);
+            const labelRowEmpty = [...labelSets, ...labelWeights].every((cell) => cell === null);
+            const blockHasContent = [...exercise.sets, ...exercise.weights].some((cells) => cells.some((cell) => cell !== null));
+            if (!(labelRowEmpty && blockHasContent)) {
+                exercise.sets.push(labelSets);
+                exercise.weights.push(labelWeights);
+            }
+            const pNote = noteOf(row);
             if (pNote && !exercise.notes)
                 exercise.notes = pNote;
-            flushExercise(cText);
+            if (warmupLabel)
+                flushExercise(undefined, "warmup");
+            else
+                flushExercise(cText);
             continue;
         }
         // Continuation of a merged exercise name?
         if (isMergeContinuation(cCell) && exercise) {
-            exercise.sets.push(readWeekRow(row));
-            const pNote = cellText(row.getCell("P").value).trim();
+            exercise.sets.push(readWeekRow(row, layout));
+            exercise.weights.push(readWeightRow(row, layout));
+            const pNote = noteOf(row);
             if (pNote && !exercise.notes)
                 exercise.notes = pNote;
             continue;
@@ -136,9 +151,10 @@ export function parseDaySheet(ws) {
             flushExercise();
             exercise = {
                 name: cText,
-                sets: [readWeekRow(row)],
+                sets: [readWeekRow(row, layout)],
+                weights: [readWeightRow(row, layout)],
             };
-            const pNote = cellText(row.getCell("P").value).trim();
+            const pNote = noteOf(row);
             if (pNote)
                 exercise.notes = pNote;
             continue;
@@ -153,7 +169,6 @@ export function parseDaySheet(ws) {
     }
     return {
         sections: nonEmpty,
-        ...(weekDates ? { weekDates } : {}),
         ...(supplementalNotes && supplementalNotes.length > 0
             ? { supplementalNotes }
             : {}),
@@ -171,11 +186,16 @@ export function parseDaySheet(ws) {
  * multiple cells appears once). The trigger labels themselves are skipped
  * since they're added back by the writer's fixed template.
  */
-function captureSupplementalNotes(ws, supplementalStartRow, lastRow) {
+function captureSupplementalNotes(ws, supplementalStartRow, lastRow, layout) {
     const out = [];
+    // Scan from column C through the Notes column. Excludes A/B (cosmetic
+    // narrow margins) and anything right of Notes.
+    const cols = [];
+    for (let i = 3; i <= layout.notesCol; i++)
+        cols.push(String.fromCharCode(64 + i));
     for (let r = supplementalStartRow; r <= lastRow; r++) {
         const row = ws.getRow(r);
-        for (const col of SUPPLEMENTAL_COLS) {
+        for (const col of cols) {
             const cell = row.getCell(col);
             if (isMergeContinuation(cell))
                 continue;