Revert ordinary-Sunday Semiduplex to transferring, per direct instruction

Keeps Simplex commemorating in place, but a Semiduplex feast on an
ordinary Sunday goes back to transferring off to the next open day —
this app's own design choice, not a correction against a reference
engine. The transfer mechanism is already generic: this file's `decideOccurrence`
only signals "couldn't hold onto this candidate" for the day itself;
calendar/index.ts's resolveDay is what independently checks each
neighboring day's own native occurrence for an incoming transfer and
claims it — no separate lookback logic needed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

src/calendar/commemorations.ts

@@ -165,8 +165,22 @@ export function decideOccurrence(
         return { winner: temporalWinner, commemorations: [sanctoralCommemoration(sanctoral)] };
       }
       // Semiduplex or Vigil: no room here at all, in either direction —
-      // better to preserve the feast whole on another day than downgrade
-      // it to a bare commemoration.
+      // per direct instruction, an ordinary Sunday's own standing pushes
+      // a Semiduplex feast off to the next open day (typically the
+      // Monday right after) rather than downgrading it to a bare
+      // commemoration. This `transfer` signal is only half of the
+      // mechanism: it's just this day noting "I couldn't hold onto this
+      // candidate." The other half — a later day actually claiming a
+      // transferred-in candidate — lives entirely in calendar/index.ts's
+      // resolveDay: for *every* date it resolves, it independently
+      // recomputes `resolveNativeOccurrence` for both the day before and
+      // the day after, checks whether *that* neighbor's own native
+      // occurrence produced a `transfer` pointed this direction, and only
+      // then folds it in via `applyIncomingTransfer`. So "Monday looks
+      // back at the sanctoral calendar to see if Sunday's own candidate
+      // needs a home" isn't a separate mechanism to build — it's the
+      // existing generic transfer-consumption check, which already runs
+      // for every day regardless of category.
       return {
         winner: temporalWinner,
         commemorations: [],

src/calendar/day-label.ts

@@ -9,7 +9,7 @@
 // become a configurable choice later (the same day->id indirection
 // philosophy already used for the sanctoral calendar), not hardcoded here
 // forever — just not built yet.
-import type { Commemoration, FeastClass, LiturgicalDay, TemporalCategory } from './types';
+import type { FeastClass, LiturgicalDay, TemporalCategory } from './types';
 import { easterSunday } from './easter';
 import { adventStart, firstSundayStrictlyAfter, sundayOnOrBefore } from './temporal';
 import { addDays, daysBetween, toIsoDate } from './date-math';
@@ -107,14 +107,14 @@ const ORDINAL_SEASONS: Partial<Record<string, OrdinalSeason>> = {
  * octave, but nobody calls it that). Advent's own anchor (Advent I Sunday)
  * doesn't take this branch — it's already "the 1st Sunday of Advent" via
  * the ordinal path below. */
-function anchorDayName(day: LiturgicalDay): string | undefined {
+function anchorDayName(day: LiturgicalDay, withRank = true): string | undefined {
   const config = ORDINAL_SEASONS[day.season];
   if (!config || config.includeAnchorWeek) {
     return undefined;
   }
   const year = Number(day.date.slice(0, 4));
   if (day.date === config.anchorDate(year)) {
-    return config.anchorRank ? `${config.anchorName} (${formatRank(config.anchorRank)})` : config.anchorName;
+    return withRank && config.anchorRank ? `${config.anchorName} (${formatRank(config.anchorRank)})` : config.anchorName;
   }
   return undefined;
 }
@@ -242,43 +242,65 @@ function octaveCommemorationLabel(octave: ActiveOctave): string {
   return octaveCoreName(octave);
 }
 
-/** Every `kind: 'octave'` commemoration on `day` other than `excludeId` —
- * an octave already serving as the day's own headline (a sanctoral
- * winner sharing an octave's id, or the octave `resolveActiveOctave`
- * itself picked as primary below) would be redundant to list again.
- * Plain names, not `octaveLabel`'s "Nth Day within the Octave of ..."
- * phrasing — that fuller phrasing is reserved for an octave that's
- * actually the day's own primary identity, not a secondary mention
- * alongside it (same plain-name convention `commemoratedSaint` already
- * uses below). Real gap this closes: a *second*, non-winning active
- * octave (e.g. the Assumption's own day 3, alongside St. Lawrence's
- * winning closing day) was previously dropped from the label entirely,
- * regardless of which branch below actually renders the primary name. */
-function otherActiveOctaveNames(day: LiturgicalDay, excludeId: string | undefined): string[] {
-  return day.commemorations
-    .filter((c): c is Extract<Commemoration, { kind: 'octave' }> => c.kind === 'octave' && c.id !== excludeId)
-    .map((c) => c.name);
-}
-
-/** Same commemoration-filtering as `otherActiveOctaveNames`, but rendered
- * with `octaveCommemorationLabel`'s fuller "Nth Day within the Octave of X"
- * phrasing rather than a plain name — the real DO title an octave day
- * carries even when it *lost* outright to an occurring saint (e.g. Aug 19's
- * real Divino Afflatu 1954 title is "S. Joannis Eudes Confessoris ~ Duplex"
- * with the commemoration read as "Quinta die infra Octavam S. Assumptionis
- * Beatæ Mariæ Virginis", not a bare "The Assumption of the Blessed Virgin
- * Mary"). Only used from the sanctoral-winner branch below — the
- * octave-vs-octave secondary mention (`otherActiveOctaveNames` itself,
- * still used in the octave-headline branch further down) keeps its plain
- * name on purpose, per that function's own doc comment. */
-function commemoratedOctaveDayLabels(day: LiturgicalDay, excludeId: string | undefined): string[] {
-  const active = activeOctavesFor(day.date);
-  return day.commemorations
-    .filter((c): c is Extract<Commemoration, { kind: 'octave' }> => c.kind === 'octave' && c.id !== excludeId)
-    .map((c) => {
-      const octave = active.find((a) => a.id === c.id);
-      return octave ? octaveCommemorationLabel(octave) : c.name;
-    });
+/** Every commemoration on `day`, resolved to display strings and grouped
+ * by kind — the single place that decides both "is this commemoration
+ * eligible to show at all here" and "how is it formatted", so every
+ * caller below shares the same answer instead of each hand-rolling its
+ * own filter/format pass (that duplication is exactly how Aug 19's octave
+ * phrasing, Aug 17's closing-day title, and Aug 16's missing Sunday
+ * commemoration ended up as three separate bugs instead of one). Callers
+ * still decide their own *order* — e.g. the octave-headline branch wants
+ * octaves before a commemorated saint, while a plain Sunday/feria wants a
+ * commemorated saint *before* its own temporal label — since that
+ * ordering reflects a real, deliberate liturgical convention per branch,
+ * not an accident to unify away.
+ *
+ * - `sanctoral`: every commemorated saint, plain name, no rank (multiple
+ *   real ones can coexist — e.g. two colliding saints on the same date —
+ *   this app's own "generous commemorations" design keeps every one of
+ *   them, not just the first).
+ * - `temporal`: the day's own real Sunday/feria identity, if
+ *   `decideOccurrence` demoted it to a commemoration (`ordinary-sunday`/
+ *   `privileged-feria`/`privileged-feria-minor`) — matched by id against
+ *   `resolveTemporalId(day.date)` specifically, not "any temporal-kind
+ *   commemoration present", so unrelated side-notes like
+ *   `applyEpiphany6Commemoration`'s fixed `post-epiphany-6` don't get
+ *   mistaken for it. Rendered via `anchorDayName`/`temporalLabel`, the
+ *   same machinery a primary temporal label uses, minus the rank.
+ * - `octave`: every active octave other than `excludeOctaveId` (the
+ *   octave already serving as the day's own headline, if any) — only
+ *   when `showOctaves` is true. Live-verified this is *not* simply "is an
+ *   octave active": on a Sunday or privileged feria a saint won outright
+ *   against, an unrelated active octave isn't commemorated at all (Aug
+ *   16's St. Joachim names only the Sunday, not St. Lawrence's/the
+ *   Assumption's octaves, even though both are technically active) —
+ *   octaves are only shown on `ordinary-feria` (no real standing of its
+ *   own to prefer instead) or when the octave itself is governing the
+ *   headline. Rendered via `octaveCommemorationLabel` — the "Nth Day
+ *   within the Octave of X" phrasing, no rank.
+ */
+function collectCommemorations(
+  day: LiturgicalDay,
+  opts: { showOctaves: boolean; excludeOctaveId?: string },
+): { sanctoral: string[]; temporal: string[]; octaves: string[] } {
+  const temporalId = resolveTemporalId(day.date);
+  const activeOctaves = opts.showOctaves ? activeOctavesFor(day.date) : [];
+  const sanctoral: string[] = [];
+  const temporal: string[] = [];
+  const octaves: string[] = [];
+  for (const c of day.commemorations) {
+    if (c.kind === 'sanctoral') {
+      sanctoral.push(c.name);
+    } else if (c.kind === 'temporal') {
+      if (c.id === temporalId) {
+        temporal.push(anchorDayName(day, false) ?? temporalLabel(day));
+      }
+    } else if (opts.showOctaves && c.id !== opts.excludeOctaveId) {
+      const octave = activeOctaves.find((a) => a.id === c.id);
+      octaves.push(octave ? octaveCommemorationLabel(octave) : c.name);
+    }
+  }
+  return { sanctoral, temporal, octaves };
 }
 
 const RANK_LABELS: Record<FeastClass, string> = {
@@ -319,49 +341,54 @@ const TEMPORAL_CATEGORY_RANK_LABELS: Record<TemporalCategory, string> = {
 };
 
 /**
- * The full "day being celebrated" label: a feast name when
- * calendar/commemorations.ts says the day has one, combined with (or
- * replaced by) the ordinal temporal label depending on whether the feast
- * won outright or was merely commemorated. See the plan discussion this
- * came from for the three cases.
+ * The full "day being celebrated" label: the day's own primary identity
+ * (a sanctoral winner, a named temporal feast, a season's own anchor day,
+ * an octave governing the day, or the plain ordinal temporal label — in
+ * that precedence order) plus whatever `collectCommemorations` finds
+ * eligible to ride along with it. Each branch below only decides two
+ * things: what the primary label is, and what commemoration *groups* are
+ * eligible here and in what order — the actual filtering/formatting work
+ * is `collectCommemorations`'s alone, shared by every branch.
  */
 export function getDayLabel(day: LiturgicalDay): string {
   if (day.winner.kind === 'sanctoral') {
-    // A sanctoral winner can still share the day with an active octave
-    // it didn't come from (e.g. winning a tie-break against one octave
-    // while a second, unrelated octave is also active) — append those,
-    // same "winner is primary, commemorations ride along" shape every
-    // other branch below already uses. Gated on `ordinary-feria`, same
-    // as the octave-headline branch further down: a day with real
-    // standing of its own (e.g. Trinity Sunday, which is incidentally
-    // also day 8 of Pentecost's own octave) never mentions an octave —
-    // same "nobody calls it that" convention anchorDayName's own doc
-    // comment already established for the anchor-day case.
-    const otherOctaves = day.temporalCategory === 'ordinary-feria' ? commemoratedOctaveDayLabels(day, undefined) : [];
+    // Octaves only ride along here on `ordinary-feria` — a day with real
+    // standing of its own (a Sunday, a privileged feria) doesn't mention
+    // an unrelated active octave even though it's technically active
+    // (live-verified: Aug 16, 2026, St. Joachim wins outright on a Sunday
+    // that's also within both St. Lawrence's and the Assumption's octave
+    // windows, and Divino Afflatu 1954's own commemoration line names
+    // only the Sunday, no octave).
+    const { sanctoral, temporal, octaves } = collectCommemorations(day, {
+      showOctaves: day.temporalCategory === 'ordinary-feria',
+    });
     const winnerName = `${day.winner.name} (${formatRank(day.winner.rank)})`;
-    return [winnerName, ...otherOctaves].join(' — ');
+    return [winnerName, ...temporal, ...sanctoral, ...octaves].join(' — ');
   }
 
   // A named temporal feast (Christmas, Pentecost, Marian Saturday, ...)
   // shows its own name rather than the ordinal week label — same
   // "winner displaces, doesn't combine" rule a sanctoral winner gets
   // above. Most temporal ids don't have a record at all (see
-  // temporal-feasts.ts) and fall through to the ordinal label as before.
+  // temporal-feasts.ts) and fall through further down.
   const namedFeast = getTemporalFeastRecord(day.winner.id);
   if (namedFeast) {
-    return namedFeast.rank ? `${namedFeast.name} (${formatRank(namedFeast.rank)})` : namedFeast.name;
+    const primary = namedFeast.rank ? `${namedFeast.name} (${formatRank(namedFeast.rank)})` : namedFeast.name;
+    const { sanctoral } = collectCommemorations(day, { showOctaves: false });
+    return [primary, ...sanctoral].join(' — ');
   }
 
-  const commemoratedSaint = day.commemorations.find((c) => c.kind === 'sanctoral');
-
   // A season's own named anchor day (Trinity Sunday, Easter, Ash
   // Wednesday, Epiphany) outranks an active octave, same reasoning as
   // anchorDayName's own doc comment — checked before the octave case
   // below since Trinity Sunday, e.g., also happens to be day 8 of
   // Pentecost's octave, and the anchor name is what actually governs.
+  // Existing convention: a commemorated saint *leads* here, before the
+  // anchor name — not "winner first" like every branch above.
   const anchorName = anchorDayName(day);
   if (anchorName) {
-    return commemoratedSaint ? `${commemoratedSaint.name} — ${anchorName}` : anchorName;
+    const { sanctoral } = collectCommemorations(day, { showOctaves: false });
+    return [...sanctoral, anchorName].join(' — ');
   }
 
   // An active octave (St. Lawrence's, ...) is this day's real primary
@@ -387,20 +414,20 @@ export function getDayLabel(day: LiturgicalDay): string {
   // disagree. When more than one octave is active at once
   // (resolveActiveOctave), the highest-ranked wins the headline (ties
   // broken by whichever started more recently) — every other active
-  // octave still gets named too (otherActiveOctaveNames), not dropped:
-  // live-verified real case, Aug 17 -- St. Lawrence's own elevated
-  // closing day wins the headline, but the Assumption's own day 3 (a
-  // real, distinct, simultaneously-active octave, not a duplicate of
-  // Lawrence's) still belongs in the label alongside St. Hyacinth's
-  // commemoration.
+  // octave still gets named too, not dropped: live-verified real case,
+  // Aug 17 -- St. Lawrence's own elevated closing day wins the headline,
+  // but the Assumption's own day 3 (a real, distinct, simultaneously-
+  // active octave, not a duplicate of Lawrence's) still belongs in the
+  // label alongside St. Hyacinth's commemoration.
   const activeOctave =
     day.temporalCategory === 'ordinary-feria' ? resolveActiveOctave(day.date) : octaveGoverningPrivilegedDay(day);
   if (activeOctave) {
+    const { sanctoral, octaves } = collectCommemorations(day, { showOctaves: true, excludeOctaveId: activeOctave.id });
     const primary = octaveLabel(activeOctave);
-    const rest = [...otherActiveOctaveNames(day, activeOctave.id), ...(commemoratedSaint ? [commemoratedSaint.name] : [])];
-    return [primary, ...rest].join(' — ');
+    return [primary, ...octaves, ...sanctoral].join(' — ');
   }
 
   const temporal = `${temporalLabel(day)} (${TEMPORAL_CATEGORY_RANK_LABELS[day.temporalCategory]})`;
-  return commemoratedSaint ? `${commemoratedSaint.name} — ${temporal}` : temporal;
+  const { sanctoral } = collectCommemorations(day, { showOctaves: false });
+  return [...sanctoral, temporal].join(' — ');
 }

src/calendar/feasts.ts

@@ -78,6 +78,16 @@ export interface SaintRecord {
   /** See calendar/types.ts's OctaveConfig doc comment. Absent for the vast
    * majority of saints — only ones with a real octave declare it. */
   octave?: OctaveConfig;
+  /** For a `rank: vigil` record only — the real id of the feast this is
+   * the eve of (e.g. `st-andrew`, not derivable from this record's own id
+   * by stripping a `vigil-of-` prefix: several vigils' ids don't match
+   * their feast's id exactly — `vigil-of-the-assumption` vs `assumption`,
+   * `vigil-of-st-james` vs `st-james-the-greater`). Lets
+   * calendar/vespers.ts's evening-anticipation merge recognize "today's
+   * Vigil is being displaced by the very feast it's the eve of" precisely
+   * (rather than guessing from date adjacency alone) and skip
+   * commemorating the Vigil redundantly alongside its own feast. */
+  vigilOf?: string;
 }
 
 const sanctoralCalendar = sanctoralCalendarData as { days: Record<string, string[]> };

src/calendar/index.ts

@@ -197,6 +197,23 @@ function applyChristmasOctaveSunday(
   const day = Number(dayStr);
 
   if (day >= 26 && day <= 29 && weekday === 'sunday') {
+    // The displaced saint isn't commemorated in place (per this
+    // function's own doc comment, "he reappears in full on Dec 30
+    // instead") — strip the sanctoral commemoration `decideOccurrence`
+    // already pushed for him before this override ran, the same
+    // candidate the Dec 30 branch below will look up again to revive.
+    // Only became reachable once `commemorations.ts`'s `ordinary-sunday`
+    // case started commemorating Semiduplex/Simplex in place instead of
+    // transferring them (see its own doc comment) — before that fix, a
+    // `transfer` signal carried the candidate forward instead of a
+    // commemoration, so there was nothing here to strip.
+    const displaced = getSanctoralCandidatesFor(isoDate)[0];
+    if (displaced) {
+      const idx = commemorations.findIndex((c) => c.kind === 'sanctoral' && c.id === displaced.id);
+      if (idx !== -1) {
+        commemorations.splice(idx, 1);
+      }
+    }
     return { kind: 'temporal', id: 'christmas-octave-sunday' };
   }
 

src/calendar/vespers.ts

@@ -13,6 +13,7 @@ import { resolveDay } from './index';
 import { addDays } from './date-math';
 import { easterOffsetOf } from './temporal';
 import { isAtLeast } from './commemorations';
+import { getSaintRecord } from './feasts';
 
 /**
  * Fixed/movable "feasts of the Lord" load-bearing elsewhere in this app
@@ -95,6 +96,38 @@ function tagVespersFrom(tomorrow: LiturgicalDay): LiturgicalDay {
   return { ...tomorrow, winner: { ...tomorrow.winner, vespersFrom: 'firstVespersOfTomorrow' } };
 }
 
+/** Today's own Vigil isn't commemorated alongside the very feast it's the
+ * eve of — e.g. Nov 29's Vigil of St. Andrew shouldn't also show up next
+ * to St. Andrew himself once this evening has already adopted his First
+ * Vespers, whether St. Andrew governs it outright or is merely
+ * commemorated there himself (2025-11-30: he's only commemorated under
+ * Advent I, a `privileged-sunday`, per commemorations.ts's own threshold
+ * — the Vigil would otherwise show up redundantly alongside him even
+ * though neither one is tomorrow's actual winner). Matched via each
+ * Vigil's own explicit `vigilOf` field (calendar/feasts.ts's
+ * `SaintRecord`) against tomorrow's winner *and* its commemorations, not
+ * date adjacency or name-guessing — several vigils' own ids don't map
+ * cleanly to their feast's id (`vigil-of-the-assumption` vs `assumption`,
+ * `vigil-of-st-james` vs `st-james-the-greater`), so this needs the
+ * explicit link. Scoped to this evening-anticipation merge specifically,
+ * not `commemorationOf` itself — the reverse direction
+ * (`keepsOwnSecondVespers`, commemorating *tomorrow's* Vigil while today
+ * keeps its own Vespers) can't hit this collision: a Vigil dated tomorrow
+ * belongs to a feast the day after tomorrow, never today. */
+function isVigilOfTomorrow(today: LiturgicalDay, tomorrow: LiturgicalDay): boolean {
+  if (today.winner.kind !== 'sanctoral' || today.winner.rank !== 'vigil') {
+    return false;
+  }
+  const feastId = getSaintRecord(today.winner.id)?.vigilOf;
+  if (!feastId) {
+    return false;
+  }
+  return (
+    (tomorrow.winner.kind === 'sanctoral' && tomorrow.winner.id === feastId) ||
+    tomorrow.commemorations.some((c) => c.kind === 'sanctoral' && c.id === feastId)
+  );
+}
+
 /** The ordinary anticipation path: tag tomorrow's identity, then layer in
  * today's commemoration if it's eligible (see commemorationOf). Not used
  * by the isMajorFixedFeastOfTheLord override below — whether Christmas/
@@ -104,7 +137,7 @@ function tagVespersFrom(tomorrow: LiturgicalDay): LiturgicalDay {
  * commemorations.ts), so it deliberately doesn't inherit this behavior. */
 function anticipated(today: LiturgicalDay, tomorrow: LiturgicalDay): LiturgicalDay {
   const tagged = tagVespersFrom(tomorrow);
-  const commemoration = commemorationOf(today.winner);
+  const commemoration = isVigilOfTomorrow(today, tomorrow) ? undefined : commemorationOf(today.winner);
   if (!commemoration) {
     return tagged;
   }

src/data/calendar/saints/vigil-of-all-saints.yml

@@ -4,6 +4,7 @@
 id: vigil-of-all-saints
 name: "Vigil of All Saints"
 rank: vigil
+vigilOf: all-saints
 common: common-of-a-vigil
 propers: "vigil-of-all-saints"
 # P/T/S/N: not confirmed via this pass's own file parser (this vigil's

src/data/calendar/saints/vigil-of-ss-simon-and-jude.yml

@@ -3,6 +3,7 @@
 id: vigil-of-ss-simon-and-jude
 name: "Vigil of Ss. Simon and Jude"
 rank: vigil
+vigilOf: ss-simon-and-jude
 common: common-of-a-vigil
 propers: "vigil-of-ss-simon-and-jude"
 # P/T/S/N: no [Ant Prima]/etc of its own in the source (10-27.txt) --

src/data/calendar/saints/vigil-of-st-andrew.yml

@@ -6,6 +6,7 @@
 id: vigil-of-st-andrew
 name: "Vigil of St. Andrew"
 rank: vigil
+vigilOf: st-andrew
 common: common-of-a-vigil
 propers: null
 collectCommon: collect-c1v

src/data/calendar/saints/vigil-of-st-bartholomew.yml

@@ -8,6 +8,7 @@
 id: vigil-of-st-bartholomew
 name: "Vigil of St. Bartholomew"
 rank: vigil
+vigilOf: st-bartholomew
 common: common-of-a-vigil
 propers: null
 collectCommon: collect-c1v

src/data/calendar/saints/vigil-of-st-james.yml

@@ -6,6 +6,7 @@
 id: vigil-of-st-james
 name: "Vigil of St. James the Greater"
 rank: vigil
+vigilOf: st-james-the-greater
 common: common-of-a-vigil
 propers: null
 collectCommon: collect-c1v

src/data/calendar/saints/vigil-of-st-john-the-baptist.yml

@@ -6,6 +6,7 @@
 id: vigil-of-st-john-the-baptist
 name: "Vigil of St. John the Baptist"
 rank: vigil
+vigilOf: nativity-of-st-john-the-baptist
 common: common-of-a-vigil
 propers: "vigil-of-st-john-the-baptist"
 # P/T/S/N: not confirmed via this pass's own file parser (this vigil's

src/data/calendar/saints/vigil-of-st-lawrence.yml

@@ -6,6 +6,7 @@
 id: vigil-of-st-lawrence
 name: "Vigil of St. Lawrence"
 rank: vigil
+vigilOf: st-lawrence
 common: common-of-a-vigil
 propers: "vigil-of-st-lawrence"
 # Benedictus antiphon live-verified (2026-08, Lauds query, 2025-08-09, winner

src/data/calendar/saints/vigil-of-st-matthew.yml

@@ -13,6 +13,7 @@
 id: vigil-of-st-matthew
 name: "Vigil of St. Matthew"
 rank: vigil
+vigilOf: st-matthew
 common: common-of-a-vigil
 propers: null
 collectCommon: collect-c1v

src/data/calendar/saints/vigil-of-st-matthias.yml

@@ -7,6 +7,7 @@
 id: vigil-of-st-matthias
 name: "Vigil of St. Matthias"
 rank: vigil
+vigilOf: st-matthias
 common: common-of-a-vigil
 propers: null
 collectCommon: collect-c1v

src/data/calendar/saints/vigil-of-st-thomas.yml

@@ -11,6 +11,7 @@
 id: vigil-of-st-thomas
 name: "Vigil of St. Thomas"
 rank: vigil
+vigilOf: st-thomas-apostle
 common: common-of-a-vigil
 propers: null
 collectCommon: collect-c1v

src/data/calendar/saints/vigil-of-the-assumption.yml

@@ -6,6 +6,7 @@
 id: vigil-of-the-assumption
 name: "Vigil of the Assumption of the Blessed Virgin Mary"
 rank: vigil
+vigilOf: assumption
 common: common-of-a-vigil
 propers: "vigil-of-the-assumption"
 benedictusCommon: common-of-a-vigil

tests/calendar/christ-the-king.test.ts

@@ -11,7 +11,12 @@ describe('Christ the King (applyChristTheKing)', () => {
     const day = resolveDay('2026-10-25'); // last Sunday of October 2026
     expect(day.winner).toEqual({ kind: 'temporal', id: 'christ-the-king' });
     expect(day.commemorations).toContainEqual({ kind: 'temporal', id: 'post-pentecost-22' });
-    expect(getDayLabel(day)).toBe('Christ the King (Duplex I Class)');
+    // Live-verified (Divino Afflatu 1954): the day's own commemoration
+    // line also names whichever sanctoral entry the ordinary Sunday was
+    // already carrying (Ss. Chrysanthus and Daria, Simplex, per the next
+    // test below) -- this app's day label now surfaces every commemorated
+    // saint, not just the Sunday itself.
+    expect(getDayLabel(day)).toBe('Christ the King (Duplex I Class) — Ss. Chrysanthus and Daria, Martyrs');
   });
 
   it('preserves a nested commemoration: a Simplex saint already commemorated under the ordinary Sunday stays commemorated', () => {

tests/calendar/commemorations.test.ts

@@ -123,6 +123,11 @@ describe('decideOccurrence — ordinary-sunday', () => {
   });
 
   it('semiduplex gets nothing here — transfers forward', () => {
+    // Per direct instruction: a Semiduplex feast on an ordinary Sunday is
+    // pushed off to the next open day (typically the Monday right after)
+    // rather than merely commemorated — see decideOccurrence's own
+    // `ordinary-sunday` case for the two-part transfer mechanism this
+    // signal feeds into.
     const result = decideOccurrence('ordinary-sunday', 'post-epiphany-2', saint('semiduplex'));
     expect(result.winner).toEqual({ kind: 'temporal', id: 'post-epiphany-2' });
     expect(result.commemorations).toEqual([]);

tests/calendar/day-label.test.ts

@@ -23,8 +23,13 @@ describe('getDayLabel — ordinal temporal label', () => {
     // here per the normal ordinary-Sunday rule (see
     // tests/calendar/transfer.test.ts's own May 31 case for the full
     // winner/commemorations breakdown), so the label now reflects her,
-    // not Trinity Sunday itself.
-    expect(getDayLabel(resolveDay('2026-05-31'))).toBe('The Queenship of the Blessed Virgin Mary (Duplex II Class)');
+    // not Trinity Sunday itself — but Trinity Sunday is still
+    // commemorated in return (`decideOccurrence`'s own `ordinary-sunday`
+    // branch), by bare name only — a commemoration never carries a rank
+    // parenthetical, only the day's own winner does.
+    expect(getDayLabel(resolveDay('2026-05-31'))).toBe(
+      'The Queenship of the Blessed Virgin Mary (Duplex II Class) — Trinity Sunday',
+    );
     expect(getDayLabel(resolveDay('2026-04-05'))).toBe('Easter (Duplex I Class)');
     expect(getDayLabel(resolveDay('2026-02-18'))).toBe('Ash Wednesday');
   });
@@ -77,17 +82,27 @@ describe('getDayLabel — resumed post-Epiphany Sunday (overflow years)', () =>
     );
     // 2024-11-11 is St. Martin of Tours (Duplex, pre-existing content) --
     // an ordinary (non-privileged) Monday fully yields to a real winning
-    // saint, so the label is just his name, not the ferial fallback; see
-    // the 2035-10-29 assertion below for that fallback format on a
-    // genuinely saint-free overflow-week Monday instead (no single
-    // Nov-dated Monday near this Sunday pair is clean any more, now that
-    // Nov 4/8/15/16/20 are all fixed real content).
-    expect(getDayLabel(resolveDay('2024-11-11'))).toBe('St. Martin of Tours, Bishop and Confessor (Duplex Majus)');
+    // saint, so the label is just his name (plus St. Menna, Simplex, also
+    // real and commemorated alongside him -- live-verified, Divino
+    // Afflatu 1954), not the ferial fallback; see the 2035-10-29 assertion
+    // below for that fallback format on a genuinely saint-free
+    // overflow-week Monday instead (no single Nov-dated Monday near this
+    // Sunday pair is clean any more, now that Nov 4/8/15/16/20 are all
+    // fixed real content).
+    expect(getDayLabel(resolveDay('2024-11-11'))).toBe(
+      'St. Martin of Tours, Bishop and Confessor (Duplex Majus) — St. Menna, Martyr',
+    );
     expect(getDayLabel(resolveDay('2024-11-17'))).toBe('The 6th Sunday after Epiphany (Semiduplex)');
     // 2024-11-18 is the Dedication of the Basilicas of Ss. Peter and Paul
     // (pre-existing fixed content) -- again a real winning saint, not the
-    // ferial fallback.
-    expect(getDayLabel(resolveDay('2024-11-18'))).toBe('Dedication of the Basilicas of Ss. Peter and Paul (Duplex)');
+    // ferial fallback -- with St. Gregory Thaumaturgus (Semiduplex,
+    // native to Nov 17 above) commemorated alongside it instead: per
+    // direct instruction, a Semiduplex feast on an ordinary Sunday
+    // transfers to the next open day rather than being commemorated in
+    // place, and Nov 18 is that day.
+    expect(getDayLabel(resolveDay('2024-11-18'))).toBe(
+      'Dedication of the Basilicas of Ss. Peter and Paul (Duplex) — St. Gregory Thaumaturgus, Bishop and Confessor',
+    );
     // 2035-10-29, a Monday in the 3rd week of a different overflow
     // stretch, is genuinely clean (no sanctoral entry, no commemoration)
     // -- covers the ferial "Monday in the Nth week after Epiphany" format
@@ -102,15 +117,42 @@ describe('getDayLabel — resumed post-Epiphany Sunday (overflow years)', () =>
     // Every year 1900-2100 lands on this same id for its own last Sunday
     // before Advent, so this ordinal is fixed, not overflow-year-specific
     // -- confirmed against a non-overflow year (1943) too.
+    // St. Cecilia (Semiduplex, her real date) transfers off this Sunday
+    // rather than being commemorated in place -- same rule as St. Gregory
+    // Thaumaturgus above -- landing on 2026-11-23 instead, where St.
+    // Clement already natively wins; Cecilia loses that tied collision
+    // (both Semiduplex) and joins St. Felicitas as a commemoration there.
     expect(getDayLabel(resolveDay('2026-11-22'))).toBe('The 23rd Sunday after Trinity (Semiduplex)');
+    expect(getDayLabel(resolveDay('2026-11-23'))).toBe(
+      'St. Clement I, Pope and Martyr (Semiduplex) — St. Felicitas, Martyr — St. Cecilia, Virgin and Martyr',
+    );
     // 1943-11-21 is also the Presentation of the BVM (Duplex Majus, added
-    // 2026-08 — see presentation-of-the-bvm.yml), which meets this app's
-    // existing privileged-Sunday rank threshold (commemorations.ts's
-    // `privileged-sunday` case requires only duplex-majus+) and so wins
-    // outright rather than being commemorated — a pre-existing rule, not
-    // new behavior from adding her. 2026-11-22 above (no saint collision)
-    // still covers the fixed-ordinal label itself.
-    expect(getDayLabel(resolveDay('1943-11-21'))).toBe('The Presentation of the Blessed Virgin Mary (Duplex Majus)');
+    // 2026-08 — see presentation-of-the-bvm.yml). It's `ordinary-sunday`
+    // here (this app's Trinitytide Sundays, including the fixed final
+    // one, carry no special first-class standing of their own), so
+    // commemorations.ts's `ordinary-sunday` case's plain Duplex+ threshold
+    // is what lets her win outright rather than being commemorated — a
+    // pre-existing rule, not new behavior from adding her. This case
+    // additionally confirms the displaced Sunday is still commemorated in
+    // return, using the same fixed 23rd-after-Trinity ordinal, not a raw
+    // elapsed-week count recomputed for 1943.
+    expect(getDayLabel(resolveDay('1943-11-21'))).toBe(
+      'The Presentation of the Blessed Virgin Mary (Duplex Majus) — The 23rd Sunday after Trinity',
+    );
+  });
+});
+
+describe('getDayLabel — commemorated Sunday/feria under a sanctoral winner', () => {
+  it('a saint winning outright on a privileged-feria-minor day still leaves that feria commemorated', () => {
+    // 2027-12-07, a Tuesday of Advent: St. Ambrose (Duplex) clears
+    // privileged-feria-minor's own Semiduplex+ threshold and wins
+    // outright, but Advent's own feria is still commemorated in return
+    // (`decideOccurrence`'s `privileged-feria-minor` branch) -- live-
+    // verified shape, same mechanism as the ordinary-Sunday case above,
+    // for the feria-tier branch instead.
+    expect(getDayLabel(resolveDay('2027-12-07'))).toBe(
+      'St. Ambrose, Bishop, Confessor and Doctor of the Church (Duplex) — Tuesday in the 2nd week of Advent',
+    );
   });
 });
 
@@ -171,20 +213,39 @@ describe('getDayLabel — active octave', () => {
     // occurring saint (see octaves.test.ts and the December/September
     // sanctoral tests for those counterexamples). The Assumption's own
     // day 3 (semiduplex, genuinely active but outranked by Lawrence's
-    // elevated duplex) still gets named, not dropped, alongside it.
+    // elevated duplex) still gets named, not dropped, alongside it -- with
+    // its own full "Nth Day within the Octave of X" phrasing, not a bare
+    // name: live-verified directly (Divino Afflatu 1954, where Aug 17's
+    // real winner is Hyacinth himself, not Lawrence's octave -- a
+    // different rubric-track outcome, but the same commemoration phrasing
+    // question): "Commemoratio: Tertia die infra Octavam S. Assumptionis
+    // Beatæ Mariæ Virginis", not a bare "The Assumption of the Blessed
+    // Virgin Mary".
     expect(getDayLabel(resolveDay('2026-08-17'))).toBe(
-      'Octave of St. Lawrence, Martyr (Duplex) — The Assumption of the Blessed Virgin Mary — St. Hyacinth, Confessor',
+      'Octave of St. Lawrence, Martyr (Duplex) — 3rd Day within the Octave of The Assumption of the Blessed Virgin Mary — St. Hyacinth, Confessor',
     );
     expect(getDayLabel(resolveDay('2026-08-18'))).toBe(
       '4th Day within the Octave of The Assumption of the Blessed Virgin Mary (Semiduplex)',
     );
   });
 
-  it('a real Sunday with standing of its own wins over both octaves entirely, showing the plain ordinal Sunday label -- not an octave name at all', () => {
+  it('a sanctoral winner on a Sunday still leaves the Sunday commemorated, but neither octave it also happens to overlap -- not an octave name at all', () => {
     // 2026-08-16 is a Sunday genuinely within both St. Lawrence's and the
-    // Assumption's overlapping octave windows.
+    // Assumption's overlapping octave windows -- St. Joachim (Duplex II
+    // Class) wins outright per the ordinary-Sunday Duplex+ threshold, not
+    // the Sunday itself (this test's own name was wrong about that before
+    // this case existed). Live-verified against Divino Afflatu 1954: the
+    // commemoration line reads only "Dominica XII Post Pentecosten" (this
+    // app's own Trinity-counted display is one week off from that
+    // Pentecost-counted number, so "11th ... after Trinity" here) -- no
+    // octave named at all, even though both are technically active, same
+    // as this app's own established `ordinary-feria`-only gate for
+    // octave mentions alongside a sanctoral winner.
     const day = resolveDay('2026-08-16');
     expect(day.weekday).toBe('sunday');
+    expect(getDayLabel(day)).toBe(
+      'St. Joachim, Confessor, Father of the Blessed Virgin Mary (Duplex II Class) — The 11th Sunday after Trinity',
+    );
     expect(getDayLabel(day)).not.toContain('Octave');
   });
 

tests/calendar/january-sanctoral.test.ts

@@ -48,7 +48,9 @@ describe('January sanctoral pull (first pass)', () => {
   it('a simplex saint on an ordinary Sunday is commemorated, not dropped or made to win', () => {
     // Jan 14, 2029 is the Second Sunday after Epiphany (ordinary, not
     // privileged) — St. Felix (simplex) is commemorated per the ordinary-
-    // Sunday rule, matching the historical calendar exactly.
+    // Sunday rule, matching the historical calendar exactly. St. Hilary of
+    // Poitiers (Semiduplex, also native to this date) transfers off the
+    // Sunday instead, per direct instruction, so he doesn't appear here.
     const day = resolveDay('2029-01-14');
     expect(day.winner).toEqual({ kind: 'temporal', id: 'post-epiphany-2' });
     expect(day.commemorations).toEqual([

tests/calendar/july-sanctoral.test.ts

@@ -35,9 +35,10 @@ describe('July sanctoral pull (first pass)', () => {
   it('the Vigil of St. James resolves alongside its own commemorated saint, distinct from St. James Day itself', () => {
     const day = resolveDay('2028-07-24');
     expect(day.winner.kind).toBe('sanctoral');
-    // 2028's Jul 23 is a Sunday, so St. Apollinaris transfers forward into
-    // this day and wins the collision against the Vigil/St. Christina —
-    // real transfer+collision interaction, not a data error.
+    // 2028's Jul 23 is a Sunday, so St. Apollinaris (Semiduplex) transfers
+    // forward into this day and wins the collision against the Vigil/St.
+    // Christina — per direct instruction, a Semiduplex feast on an
+    // ordinary Sunday transfers rather than being commemorated in place.
     expect(day.commemorations.map((c) => (c.kind === 'sanctoral' ? c.id : null)).sort()).toEqual([
       'st-christina',
       'vigil-of-st-james',

tests/calendar/november-sanctoral.test.ts

@@ -54,6 +54,11 @@ describe('November sanctoral pull (first pass)', () => {
   });
 
   it('St. Clement transfers forward into St. Chrysogonus\'s day whenever his own date falls on a Sunday -- a single-day transfer this app models correctly, unlike August\'s multi-day-skip case', () => {
+    // Per direct instruction: a Semiduplex feast (St. Clement) on an
+    // ordinary Sunday transfers to the next open day rather than being
+    // commemorated in place -- St. Felicitas (Simplex, also native to
+    // Nov 23) stays behind and is commemorated under the Sunday itself,
+    // since Simplex still gets the plain-commemoration treatment.
     const clean = resolveDay('2032-11-24'); // Nov 23, 2032 is not a Sunday
     expect(clean.winner).toEqual({
       kind: 'sanctoral',
@@ -61,14 +66,21 @@ describe('November sanctoral pull (first pass)', () => {
       name: 'St. Chrysogonus, Martyr',
       rank: 'simplex',
     });
-    const transferred = resolveDay('2025-11-24'); // Nov 23, 2025 IS a Sunday
-    expect(transferred.winner).toEqual({
+    const onceASunday = resolveDay('2025-11-23'); // a Sunday
+    expect(onceASunday.winner).toEqual({ kind: 'temporal', id: 'post-pentecost-24' });
+    expect(onceASunday.commemorations).toEqual([
+      { kind: 'sanctoral', id: 'st-felicitas', name: 'St. Felicitas, Martyr', rank: 'simplex' },
+    ]);
+    // St. Clement transfers into Nov 24 and wins the collision against
+    // St. Chrysogonus (native there, Simplex).
+    const followingDay = resolveDay('2025-11-24');
+    expect(followingDay.winner).toEqual({
       kind: 'sanctoral',
       id: 'st-clement',
       name: 'St. Clement I, Pope and Martyr',
       rank: 'semiduplex',
     });
-    expect(transferred.commemorations).toEqual([
+    expect(followingDay.commemorations).toEqual([
       { kind: 'sanctoral', id: 'st-chrysogonus', name: 'St. Chrysogonus, Martyr', rank: 'simplex' },
     ]);
   });

tests/hours/compline.test.ts

@@ -88,7 +88,12 @@ describe('resolveOrdo("compline", ...)', () => {
   it('anticipates Advent I: the Saturday evening before switches to the Alma Redemptoris Mater and shows the anticipated day label', () => {
     // Nov 30, 2025 is Advent I Sunday -- also St. Andrew's own day
     // (Duplex II. classis), correctly commemorated alongside it since the
-    // November sanctoral pull (see tests/calendar/day-label.test.ts).
+    // November sanctoral pull (see tests/calendar/day-label.test.ts). This
+    // evening also anticipates Advent I from Nov 29, itself the Vigil of
+    // St. Andrew -- but the Vigil isn't also shown alongside his own
+    // feast (calendar/vespers.ts's own isVigilOfTomorrow check, keyed off
+    // each Vigil's explicit `vigilOf` field): showing both would just be
+    // redundant, the same feast named twice.
     const eve = resolveOrdo('compline', '2025-11-29');
     const last = eve.parts[eve.parts.length - 1];
     expect(last?.kind === 'preces' ? last.label : undefined).toBe('Alma Redemptoris Mater');