volleyballsimtypes 0.0.482 → 0.0.485

package/dist/cjs/src/service/utils/object-utils.d.ts

@@ -1,4 +1,3 @@
-export declare const getKeys: <T extends object>(obj: T) => Array<keyof T>;
 export type DataProps<T> = {
     [K in keyof T as T[K] extends (...args: any[]) => any ? never : K]: T[K];
 };

package/dist/cjs/src/service/utils/object-utils.js

@@ -1,4 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKeys = void 0;
-exports.getKeys = Object.keys;

package/dist/esm/src/api/index.d.ts

@@ -1,4 +1,4 @@
-import { BoxScore, DataProps, DeclineStatus, Division as _Division, League as _League, Match as _Match, MatchSet as _MatchSet, Player as _Player, PlayerPosition, Qualifier as _Qualifier, QualifierMatch as _QualifierMatch, Rally as _Rally, RallyEvent as _RallyEvent, PointBreakdown, RallyMetrics, Season as _Season, Standing as _Standing, Team as _Team, Tournament as _Tournament, TournamentMatch as _TournamentMatch, National as _National, NationalMatch as _NationalMatch, Country as _Country, CourtPosition, ConditionLogic, EnergyBand, LiberoSubMode, MatchForfeitType, PerformanceStats, PinchCondition, RoleEnum, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../service';
+import { BoxScore, DataProps, DeclineStatus, Division as _Division, League as _League, Match as _Match, MatchSet as _MatchSet, Player as _Player, PlayerPosition, Qualifier as _Qualifier, QualifierMatch as _QualifierMatch, Rally as _Rally, RallyEvent as _RallyEvent, PointBreakdown, RallyMetrics, Season as _Season, Standing as _Standing, Team as _Team, Tournament as _Tournament, TournamentMatch as _TournamentMatch, National as _National, NationalMatch as _NationalMatch, Country as _Country, CourtPosition, ConditionLogic, EnergyBand, MatchForfeitType, PerformanceStats, PinchCondition, RoleEnum, RotationSystemEnum, SubBackMode, SubBand } from '../service';
 export type Rally = DataProps<_Rally> & {
     homePlayerPosition: PlayerPosition[];
     awayPlayerPosition: PlayerPosition[];
@@ -81,29 +81,17 @@ export interface StartingLineup {
     bench: string[];
 }
 export interface ApiSetSubConfig {
-    mode: SubMode;
     benchId?: string;
-    fatigueBand?: EnergyBand;
-    benchFatigueBand?: EnergyBand;
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
     pinchServer?: boolean;
+    benchFatigueBand?: EnergyBand;
     subBackMode?: SubBackMode;
     subBackConditions?: PinchCondition[];
     subBackConditionLogic?: ConditionLogic;
 }
-export interface ApiDesignatedSub {
+export interface ApiDesignatedSub extends ApiSetSubConfig {
     starterId: string;
-    benchId?: string;
-    mode: SubMode;
-    fatigueBand?: EnergyBand;
-    benchFatigueBand?: EnergyBand;
-    conditions?: PinchCondition[];
-    conditionLogic?: ConditionLogic;
-    pinchServer?: boolean;
-    subBackMode?: SubBackMode;
-    subBackConditions?: PinchCondition[];
-    subBackConditionLogic?: ConditionLogic;
     sets?: ApiSetSubConfig[];
 }
 export interface ApiOffensivePreference {
@@ -130,8 +118,6 @@ export interface ApiLiberoInjury {
     inMatchDesignateId?: string;
 }
 export interface ApiLiberoSetSubConfig {
-    mode: LiberoSubMode;
-    fatigueBand?: EnergyBand;
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
 }

package/dist/esm/src/data/models/tactics.d.ts

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import { PlayerId, TeamId, TeamModel } from '.';
-import { ConditionLogic, CourtPosition, EnergyBand, LiberoSubMode, PinchCondition, RoleEnum, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../../service';
+import { ConditionLogic, CourtPosition, EnergyBand, PinchCondition, RoleEnum, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../../service';
 export interface TacticsLineupAttributes {
     [CourtPosition.LIBERO_ZONE]?: PlayerId;
     [CourtPosition.LEFT_BACK]: PlayerId;
@@ -13,30 +13,20 @@ export interface TacticsLineupAttributes {
     bench: PlayerId[];
 }
 export interface SetSubConfigAttributes {
-    mode: SubMode;
     benchId?: PlayerId;
-    fatigueBand?: EnergyBand;
-    benchFatigueBand?: EnergyBand;
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
     pinchServer?: boolean;
+    benchFatigueBand?: EnergyBand;
     subBackMode?: SubBackMode;
     subBackConditions?: PinchCondition[];
     subBackConditionLogic?: ConditionLogic;
+    mode?: SubMode;
+    fatigueBand?: SubBand;
 }
-export interface DesignatedSubAttributes {
+export interface DesignatedSubAttributes extends SetSubConfigAttributes {
     starterId: PlayerId;
-    benchId?: PlayerId;
-    mode?: SubMode;
     isPinchServer?: boolean;
-    fatigueBand?: SubBand;
-    benchFatigueBand?: EnergyBand;
-    conditions?: PinchCondition[];
-    conditionLogic?: ConditionLogic;
-    pinchServer?: boolean;
-    subBackMode?: SubBackMode;
-    subBackConditions?: PinchCondition[];
-    subBackConditionLogic?: ConditionLogic;
     sets?: SetSubConfigAttributes[];
 }
 export interface OffensivePreferenceAttributes {
@@ -63,10 +53,10 @@ export interface LiberoInjuryAttributes {
     inMatchDesignateId?: PlayerId;
 }
 export interface LiberoSetSubConfigAttributes {
-    mode: LiberoSubMode;
-    fatigueBand?: EnergyBand;
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
+    mode?: string;
+    fatigueBand?: EnergyBand;
 }
 export interface LiberoSubConfigAttributes extends LiberoSetSubConfigAttributes {
     sets?: LiberoSetSubConfigAttributes[];

package/dist/esm/src/data/transformers/match-preset-override.test.js

@@ -148,7 +148,16 @@ describe('apiTacticsConfigToTacticsAttributes()', () => {
         expect(back.lineup).toEqual(full.lineup);
         expect(back.libero_replacements).toEqual(full.libero_replacements);
         expect(back.receive_rotation_offset).toBe(true);
-        expect(back.designated_subs).toEqual(full.designated_subs);
+        // The dto path converts legacy mode-shaped subs to the unified condition engine, so the round-trip lands
+        // in the converted (unified) shape rather than the legacy input.
+        expect(back.designated_subs).toEqual([{
+                starterId: ids[0],
+                conditions: [{ type: 'FATIGUE', band: 'WORN' }],
+                conditionLogic: 'ALL',
+                pinchServer: false,
+                subBackMode: 'FATIGUE',
+                sets: [{ conditions: [] }]
+            }]);
         expect(back.libero_replacement_sets).toEqual(full.libero_replacement_sets);
         expect(back.rotation_system).toBe('5-1');
         expect(back.designated_setters).toEqual(full.designated_setters);

package/dist/esm/src/data/transformers/rally-event.d.ts

@@ -1,4 +1,4 @@
-import { Block, LiberoReplacement, RallyEvent, Reception, Serve, Set, Spike, Substitution } from '../../service';
+import { Block, FreeBall, LiberoReplacement, RallyEvent, Reception, Serve, Set, Spike, Substitution } from '../../service';
 export interface CompactEvent {
     p: number;
     e: number;
@@ -21,4 +21,5 @@ export declare function transformToReception(event: CompactEvent, roster: string
 export declare function transformToServe(event: CompactEvent, roster: string[]): Serve;
 export declare function transformToSet(event: CompactEvent, roster: string[]): Set;
 export declare function transformToSpike(event: CompactEvent, roster: string[]): Spike;
+export declare function transformToFreeBall(event: CompactEvent, roster: string[]): FreeBall;
 export declare function transformToSubstitution(event: CompactEvent, roster: string[]): Substitution;

package/dist/esm/src/data/transformers/rally-event.js

@@ -1,4 +1,4 @@
-import { Block, InPlayEvent, LiberoReplacement, Reception, Serve, Set, Spike, Substitution } from '../../service';
+import { Block, FreeBall, InPlayEvent, LiberoReplacement, Reception, Serve, Set, Spike, Substitution } from '../../service';
 // Incident packing for the compact key 'i': values below 10 are injury severities, 10+ are knock tiers.
 function incidentToCompact(incident) {
     if (incident == null)
@@ -108,6 +108,17 @@ export function transformToSpike(event, roster) {
         incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
+// FreeBall (Last Resort save) is a plain InPlayEvent with no incident of its own, so it decodes from f/t/a/s
+// exactly like a spike minus the incident. Must stay in lockstep with the case 7 branch in rally.ts.
+export function transformToFreeBall(event, roster) {
+    return FreeBall.create({
+        failure: event.f,
+        type: event.t,
+        playerId: roster[event.p],
+        target: event.a,
+        score: event.s
+    });
+}
 export function transformToSubstitution(event, roster) {
     return Substitution.create({
         playerId: roster[event.p],

package/dist/esm/src/data/transformers/rally.js

@@ -1,8 +1,8 @@
 import { pack, unpack } from 'msgpackr';
 import { deflateRawSync, inflateRawSync } from 'zlib';
 import { decompressFromBase64 } from 'lz-string';
-import { Block, LiberoReplacement, Rally, Reception, Serve, Set as VolleySet, Spike, Substitution } from '../../service';
-import { transformToBlock, transformToCompact, transformToLiberoReplacement, transformToReception, transformToServe, transformToSet, transformToSpike, transformToSubstitution } from './rally-event';
+import { Block, FreeBall, LiberoReplacement, Rally, Reception, Serve, Set as VolleySet, Spike, Substitution } from '../../service';
+import { transformToBlock, transformToCompact, transformToFreeBall, transformToLiberoReplacement, transformToReception, transformToServe, transformToSet, transformToSpike, transformToSubstitution } from './rally-event';
 const VERSION_BYTE = 0x01;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function deflate(data) { return deflateRawSync(data); }
@@ -57,6 +57,7 @@ function decodeCompactEvent(event, roster) {
         case 4: return transformToSet(event, roster);
         case 5: return transformToSpike(event, roster);
         case 6: return transformToBlock(event, roster);
+        case 7: return transformToFreeBall(event, roster);
         default: throw new Error(`UNKNOWN_EVENT_TYPE: ${String(event.e)}`);
     }
 }
@@ -69,6 +70,7 @@ function decodeLegacyEvent(event) {
         case 4: return VolleySet.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, score: event.s });
         case 5: return Spike.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, score: event.s });
         case 6: return Block.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, blockers: event.b ?? [], score: event.s });
+        case 7: return FreeBall.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, score: event.s });
         default: throw new Error(`UNKNOWN_EVENT_TYPE: ${String(event.e)}`);
     }
 }

package/dist/esm/src/data/transformers/rally.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/data/transformers/rally.test.js

@@ -0,0 +1,60 @@
+import { describe, it, expect } from '@jest/globals';
+import { v4 as uuidv4 } from 'uuid';
+import { Block, BlockFailureEnum, BlockTypeEnum, EventTypeEnum, FreeBall, FreeBallFailureEnum, FreeBallTypeEnum, LiberoReplacement, LiberoReplacementTypeEnum, Rally, Reception, ReceptionFailureEnum, ReceptionTypeEnum, Serve, ServeFailureEnum, ServeTypeEnum, Set as VolleySet, SetFailureEnum, SetTempoEnum, SetTypeEnum, Spike, SpikeFailureEnum, SpikeTypeEnum, Substitution } from '../../service';
+import { transformFromRally, transformToRally } from './rally';
+// End-to-end rally round trip (encode -> bytea -> decode) exercising the decodeCompactEvent switch, with one
+// event of EVERY EventTypeEnum member. This is the guard that would have caught the FREE_BALL decoder gap: the
+// encoder is generic (out.e = evt.eventType) but the decoder is a hardcoded switch, so a new event type that is
+// not wired into the switch throws UNKNOWN_EVENT_TYPE here. The coverage test forces new members into this list.
+describe('rally compact round trip — every event type', () => {
+    const pA = uuidv4();
+    const pB = uuidv4();
+    const pC = uuidv4();
+    const setId = uuidv4();
+    const events = [
+        LiberoReplacement.create({ playerId: pA, libero: pB, type: LiberoReplacementTypeEnum.LIBERO_IN }),
+        Substitution.create({ playerId: pA, playerOut: pC, injury: true }),
+        Serve.create({ playerId: pA, target: 6, score: 55, failure: ServeFailureEnum.NO_FAILURE, type: ServeTypeEnum.JUMP_TOPSPIN }),
+        Reception.create({ playerId: pB, target: 5, score: 50, failure: ReceptionFailureEnum.NO_FAILURE, type: ReceptionTypeEnum.DIG }),
+        VolleySet.create({ playerId: pC, target: 3, score: 48, failure: SetFailureEnum.NO_FAILURE, type: SetTypeEnum.OVERHAND, tempo: SetTempoEnum.FIRST }),
+        Spike.create({ playerId: pA, target: 4, score: 62.5, failure: SpikeFailureEnum.NO_FAILURE, type: SpikeTypeEnum.CROSS_SHOT }),
+        Block.create({ playerId: pB, blockers: [pB, pC], target: 8, score: 48, failure: BlockFailureEnum.NO_FAILURE, type: BlockTypeEnum.DOUBLE }),
+        FreeBall.create({ playerId: pC, target: 6, score: 45, failure: FreeBallFailureEnum.NO_FAILURE, type: FreeBallTypeEnum.OVER })
+    ];
+    const rally = Rally.create({ id: uuidv4(), order: 0, servingTeamId: uuidv4(), events });
+    it('covers every EventTypeEnum member (adding a new event type must extend this list)', () => {
+        const numericTypes = Object.values(EventTypeEnum).filter((v) => typeof v === 'number');
+        const present = new Set(events.map(e => e.eventType));
+        for (const t of numericTypes)
+            expect(present.has(t)).toBe(true);
+        expect(present.size).toBe(numericTypes.length);
+    });
+    it('encodes then decodes every event type back to an equal event (guards the decoder switch)', () => {
+        const attrs = transformFromRally(rally, setId);
+        const decoded = transformToRally(attrs);
+        expect(decoded.events).toHaveLength(events.length);
+        expect(decoded.events.map(e => e.eventType)).toEqual(events.map(e => e.eventType));
+        const [lib, sub, serve, rec, set, spike, block, free] = decoded.events;
+        expect(lib.playerId).toBe(pA);
+        expect(lib.libero).toBe(pB);
+        expect(lib.type).toBe(LiberoReplacementTypeEnum.LIBERO_IN);
+        expect(sub.playerOut).toBe(pC);
+        expect(sub.injury).toBe(true);
+        expect(serve.target).toBe(6);
+        expect(serve.score).toBe(55);
+        expect(serve.type).toBe(ServeTypeEnum.JUMP_TOPSPIN);
+        expect(rec.target).toBe(5);
+        expect(rec.type).toBe(ReceptionTypeEnum.DIG);
+        expect(set.type).toBe(SetTypeEnum.OVERHAND);
+        expect(set.tempo).toBe(SetTempoEnum.FIRST);
+        expect(spike.type).toBe(SpikeTypeEnum.CROSS_SHOT);
+        expect(spike.score).toBe(62.5);
+        expect(block.type).toBe(BlockTypeEnum.DOUBLE);
+        expect(block.blockers).toEqual([pB, pC]);
+        expect(free.playerId).toBe(pC);
+        expect(free.target).toBe(6);
+        expect(free.score).toBe(45);
+        expect(free.type).toBe(FreeBallTypeEnum.OVER);
+        expect(free.failure).toBe(FreeBallFailureEnum.NO_FAILURE);
+    });
+});

package/dist/esm/src/data/transformers/tactics.js

@@ -1,22 +1,7 @@
-import { CourtPosition, Tactics } from '../../service';
-// Back-compat: new rows persist `mode`; rows written before the mode change persist `isPinchServer` (+ a
-// 'NEVER' fatigueBand for the old "never fatigue-sub" state). Derive the mode so existing data keeps working
-// until the next tactics save rewrites it in the new shape.
-function subModeFromAttributes(d) {
-    if (d.mode != null)
-        return d.mode;
-    if (d.isPinchServer === true)
-        return 'PINCH';
-    if (d.fatigueBand === 'NEVER')
-        return 'NEVER';
-    return 'FATIGUE';
-}
-// pinchServer only applies to PINCH ("Conditions") mode. A LEGACY PINCH row (no flag) defaults to true so
-// existing pinch servers keep serve-and-return behavior; a new conditional sub persists an explicit false. This
-// default must resolve identically on every READ path (both transformToObject and tacticsColumnsToApiDto).
-function effectivePinchServer(mode, pinchServer) {
-    return mode === 'PINCH' ? (pinchServer ?? true) : undefined;
-}
+import { convertLegacyLiberoSubConfig, convertLegacySetSubConfig, CourtPosition, Tactics } from '../../service';
+// Unified condition engine (owner 2026-07-11): the READ path passes legacy fields (mode / fatigueBand /
+// isPinchServer) through RAW; the schema preprocess in Tactics.create converts every legacy shape (see
+// service/team/sub-config-convert.ts). The WRITE path persists only the unified shape.
 function findPlayer(id, roster) {
     const player = roster.find((p) => p.id === id);
     if (player == null)
@@ -60,23 +45,19 @@ function transformToAttributes(tactics, teamId) {
         designated_subs: tactics.designatedSubs.map(ds => ({
             starterId: ds.starter.id,
             benchId: ds.bench?.id,
-            mode: ds.mode,
-            fatigueBand: ds.fatigueBand,
-            benchFatigueBand: ds.benchFatigueBand,
             conditions: ds.conditions,
             conditionLogic: ds.conditionLogic,
             pinchServer: ds.pinchServer,
+            benchFatigueBand: ds.benchFatigueBand,
             subBackMode: ds.subBackMode,
             subBackConditions: ds.subBackConditions,
             subBackConditionLogic: ds.subBackConditionLogic,
             sets: ds.sets?.map(s => ({
-                mode: s.mode,
                 benchId: s.bench?.id,
-                fatigueBand: s.fatigueBand,
-                benchFatigueBand: s.benchFatigueBand,
                 conditions: s.conditions,
                 conditionLogic: s.conditionLogic,
                 pinchServer: s.pinchServer,
+                benchFatigueBand: s.benchFatigueBand,
                 subBackMode: s.subBackMode,
                 subBackConditions: s.subBackConditions,
                 subBackConditionLogic: s.subBackConditionLogic
@@ -159,15 +140,19 @@ function transformToObject(model, roster) {
         secondLibero,
         liberoSub: secondLibero != null ? (model.libero_sub ?? undefined) : undefined,
         liberoReplacementSets,
+        // Legacy fields (mode / fatigueBand / isPinchServer) pass through RAW: the DesignatedSubSchema preprocess
+        // inside Tactics.create converts every legacy shape (mode-era AND isPinchServer-era rows) to the unified
+        // condition engine. Only the player references are resolved here.
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starter: findPlayer(d.starterId, roster),
             bench: d.benchId != null ? findPlayer(d.benchId, roster) : undefined,
-            mode: subModeFromAttributes(d),
-            fatigueBand: d.fatigueBand === 'NEVER' ? undefined : d.fatigueBand,
+            mode: d.mode,
+            isPinchServer: d.isPinchServer,
+            fatigueBand: d.fatigueBand,
             benchFatigueBand: d.benchFatigueBand,
             conditions: d.conditions,
             conditionLogic: d.conditionLogic,
-            pinchServer: effectivePinchServer(subModeFromAttributes(d), d.pinchServer),
+            pinchServer: d.pinchServer,
             subBackMode: d.subBackMode,
             subBackConditions: d.subBackConditions,
             subBackConditionLogic: d.subBackConditionLogic,
@@ -178,7 +163,7 @@ function transformToObject(model, roster) {
                 benchFatigueBand: s.benchFatigueBand,
                 conditions: s.conditions,
                 conditionLogic: s.conditionLogic,
-                pinchServer: effectivePinchServer(s.mode, s.pinchServer),
+                pinchServer: s.pinchServer,
                 subBackMode: s.subBackMode,
                 subBackConditions: s.subBackConditions,
                 subBackConditionLogic: s.subBackConditionLogic
@@ -326,33 +311,20 @@ function tacticsColumnsToApiDto(model) {
         receiveRotationOffset: model.receive_rotation_offset,
         substitutionBand: model.substitution_band,
         secondLibero: validSecondLibero,
-        liberoSub: validSecondLibero != null ? model.libero_sub : undefined,
+        // The API surfaces the UNIFIED condition-engine shape: legacy rows (mode-era / isPinchServer-era) convert
+        // here via the same service converters the schema preprocess uses, so clients never see a mode.
+        liberoSub: validSecondLibero != null
+            ? (model.libero_sub != null ? convertLegacyLiberoSubConfig(model.libero_sub) : undefined)
+            : undefined,
         liberoReplacementSets: validLiberoReplacementSets,
-        designatedSubs: (model.designated_subs ?? []).map(d => ({
-            starterId: d.starterId,
-            benchId: d.benchId,
-            mode: subModeFromAttributes(d),
-            fatigueBand: d.fatigueBand === 'NEVER' ? undefined : d.fatigueBand,
-            benchFatigueBand: d.benchFatigueBand,
-            conditions: d.conditions,
-            conditionLogic: d.conditionLogic,
-            pinchServer: effectivePinchServer(subModeFromAttributes(d), d.pinchServer),
-            subBackMode: d.subBackMode,
-            subBackConditions: d.subBackConditions,
-            subBackConditionLogic: d.subBackConditionLogic,
-            sets: d.sets?.map(s => ({
-                mode: s.mode,
-                benchId: s.benchId,
-                fatigueBand: s.fatigueBand,
-                benchFatigueBand: s.benchFatigueBand,
-                conditions: s.conditions,
-                conditionLogic: s.conditionLogic,
-                pinchServer: effectivePinchServer(s.mode, s.pinchServer),
-                subBackMode: s.subBackMode,
-                subBackConditions: s.subBackConditions,
-                subBackConditionLogic: s.subBackConditionLogic
-            }))
-        })),
+        designatedSubs: (model.designated_subs ?? []).map(d => {
+            const { starterId, sets, ...cfg } = d;
+            return {
+                ...convertLegacySetSubConfig(cfg),
+                starterId,
+                sets: sets?.map(s => convertLegacySetSubConfig(s))
+            };
+        }),
         rotationSystem: model.rotation_system,
         designatedSetters: model.designated_setters,
         offensivePreferences: model.offensive_preferences,

package/dist/esm/src/data/transformers/tactics.test.js

@@ -38,25 +38,28 @@ describe('tacticsColumnsToApiDto()', () => {
         expect(dto.lineup.bench).toEqual(['b1', 'b2']);
         expect(dto.offensivePreferences).toEqual([{ rotation: 1, weights: { lf: 60, rf: 40 } }]);
     });
-    it("resolves a legacy isPinchServer entry to mode 'PINCH'", () => {
+    it('converts a legacy isPinchServer entry to a unified pinch server (conditions kept, no mode)', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
             { starterId: 's1', benchId: 'b1', isPinchServer: true, conditions: [{ type: 'ASAP' }] }
         ]));
-        expect(dto.designatedSubs[0].mode).toBe('PINCH');
+        expect(dto.designatedSubs[0].pinchServer).toBe(true);
+        expect(dto.designatedSubs[0].conditions).toEqual([{ type: 'ASAP' }]);
+        expect(dto.designatedSubs[0].mode).toBeUndefined();
     });
-    it("resolves a legacy 'NEVER' fatigueBand to mode NEVER and drops the band", () => {
+    it("converts a legacy 'NEVER' fatigueBand to an explicit empty condition list", () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
             { starterId: 's1', fatigueBand: 'NEVER' }
         ]));
-        expect(dto.designatedSubs[0].mode).toBe('NEVER');
+        expect(dto.designatedSubs[0].conditions).toEqual([]);
         expect(dto.designatedSubs[0].fatigueBand).toBeUndefined();
     });
-    it('passes a fatigue entry with its own bands through unchanged', () => {
+    it('converts a legacy fatigue entry to a FATIGUE condition carrying its band', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
             { starterId: 's1', benchId: 'b1', mode: 'FATIGUE', fatigueBand: EnergyBand.WORN, benchFatigueBand: EnergyBand.TIRED }
         ]));
-        expect(dto.designatedSubs[0].mode).toBe('FATIGUE');
-        expect(dto.designatedSubs[0].fatigueBand).toBe(EnergyBand.WORN);
+        expect(dto.designatedSubs[0].conditions).toEqual([{ type: 'FATIGUE', band: EnergyBand.WORN }]);
+        expect(dto.designatedSubs[0].subBackMode).toBe('FATIGUE');
+        expect(dto.designatedSubs[0].pinchServer).toBe(false);
         expect(dto.designatedSubs[0].benchFatigueBand).toBe(EnergyBand.TIRED);
     });
     it('defaults a legacy PINCH row (no pinchServer flag) to pinchServer true', () => {
@@ -65,11 +68,12 @@ describe('tacticsColumnsToApiDto()', () => {
         ]));
         expect(dto.designatedSubs[0].pinchServer).toBe(true);
     });
-    it('leaves pinchServer undefined for a non-PINCH row', () => {
+    it('passes an already-unified entry through untouched', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
-            { starterId: 's1', benchId: 'b1', mode: 'FATIGUE', fatigueBand: EnergyBand.TIRED }
+            { starterId: 's1', benchId: 'b1', conditions: [{ type: 'FATIGUE', band: EnergyBand.TIRED }], conditionLogic: 'ALL', pinchServer: false, subBackMode: 'FATIGUE' }
         ]));
-        expect(dto.designatedSubs[0].pinchServer).toBeUndefined();
+        expect(dto.designatedSubs[0].conditions).toEqual([{ type: 'FATIGUE', band: EnergyBand.TIRED }]);
+        expect(dto.designatedSubs[0].pinchServer).toBe(false);
     });
     it('passes a conditional regular sub (pinchServer false + condition sub-back) through unchanged', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
@@ -106,7 +110,8 @@ describe('tacticsColumnsToApiDto()', () => {
         model.libero_sub = { mode: 'FATIGUE' };
         const dto = tacticsColumnsToApiDto(model);
         expect(dto.secondLibero).toBe('reserve1');
-        expect(dto.liberoSub).toEqual({ mode: 'FATIGUE' });
+        // Legacy FATIGUE libero rule converts to the unified condition shape on the API read path.
+        expect(dto.liberoSub).toEqual({ conditions: [{ type: 'FATIGUE' }], conditionLogic: 'ALL' });
     });
     it('keeps a libero-keyed replaceKnockedImmediately entry when a second libero exists (L2-only feature)', () => {
         const model = makeTactics([]);

package/dist/esm/src/service/competition/season.d.ts

@@ -10,12 +10,11 @@ export declare class Season {
     readonly iteration: Iteration;
     readonly divisionId: string;
     readonly standings: Standing[];
-    private _status;
-    private _champion?;
+    private readonly _status;
+    private readonly _champion?;
     static create(input: unknown): Season;
     private constructor();
     calculateStandings(): Standing[];
-    updateStandings(): void;
     get champion(): Team | undefined;
     get status(): Status;
     static createSeason(iteration: Iteration, teams: Team[], divisionId: string): Season;

package/dist/esm/src/service/competition/season.js

@@ -34,17 +34,6 @@ export class Season {
             return standing;
         });
     }
-    updateStandings() {
-        if (this.matches == null || this.matches.length < 1)
-            throw new Error('NO_MATCHES');
-        const updated = this.calculateStandings();
-        this.standings.splice(0, this.standings.length, ...updated);
-        const isOver = this.matches.every((match) => match.isOver());
-        if (isOver) {
-            this._status = StatusEnum.COMPLETE;
-            this._champion = this.teams.find((team) => team.id === this.standings[0].teamId);
-        }
-    }
     get champion() {
         if (this._champion != null)
             return this._champion;

package/dist/esm/src/service/event/block.d.ts

@@ -21,5 +21,4 @@ export declare class Block extends InPlayEvent<BlockFailure, BlockType> {
     readonly blockers: string[];
     static create(input: unknown): Block;
     private constructor();
-    toString(): string;
 }

package/dist/esm/src/service/event/block.js

@@ -37,10 +37,4 @@ export class Block extends InPlayEvent {
         this.failure = failure;
         this.blockers = blockers;
     }
-    toString() {
-        const failure = `"failure":${this.failure}`;
-        const type = `"type":${this.type}`;
-        const blockers = `"blockers":[${this.blockers.map(b => `"${b}"`).join(',')}]`;
-        return `{${this._toString()},${failure},${type},${blockers}}`;
-    }
 }

package/dist/esm/src/service/event/free-ball.d.ts

@@ -13,5 +13,4 @@ export declare class FreeBall extends InPlayEvent<FreeBallFailure, FreeBallType>
     readonly type: FreeBallType;
     static create(input: unknown): FreeBall;
     private constructor();
-    toString(): string;
 }

package/dist/esm/src/service/event/free-ball.js

@@ -35,9 +35,4 @@ export class FreeBall extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    toString() {
-        const failure = `"failure":${this.failure}`;
-        const type = `"type":${this.type}`;
-        return `{${this._toString()},${failure},${type}}`;
-    }
 }

package/dist/esm/src/service/event/in-play-event.d.ts

@@ -20,5 +20,4 @@ export declare abstract class InPlayEvent<F, T> extends RallyEvent {
     readonly activeTraits: Trait[];
     readonly incident?: EventIncident;
     protected constructor({ eventType, playerId, target, score, activeTraits, incident }: InPlayEventOpts);
-    protected _toString(): string;
 }

package/dist/esm/src/service/event/in-play-event.js

@@ -7,12 +7,4 @@ export class InPlayEvent extends RallyEvent {
         this.activeTraits = activeTraits;
         this.incident = incident;
     }
-    _toString() {
-        const score = `"score":${this.score}`;
-        const playerId = `"playerId":"${this.playerId}"`;
-        const target = `"target":${this.target}`;
-        const eventType = `"eventType":${this.eventType}`;
-        const traits = `"activeTraits":[${this.activeTraits.map(t => `"${t}"`).join(',')}]`;
-        return `${score},${playerId},${target},${eventType},${traits}`;
-    }
 }

package/dist/esm/src/service/event/libero-replacement.d.ts

@@ -9,5 +9,4 @@ export declare class LiberoReplacement extends RallyEvent {
     readonly libero: string;
     static create(input: unknown): LiberoReplacement;
     private constructor();
-    toString(): string;
 }

package/dist/esm/src/service/event/libero-replacement.js

@@ -24,11 +24,4 @@ export class LiberoReplacement extends RallyEvent {
         this.type = type;
         this.libero = libero;
     }
-    toString() {
-        const playerId = `"playerId":"${this.playerId}"`;
-        const type = `"type":${this.type}`;
-        const eventType = `"eventType":${this.eventType}`;
-        const libero = `"libero":"${this.libero}"`;
-        return `{${playerId},${type},${eventType},${libero}}`;
-    }
 }

package/dist/esm/src/service/event/rally-event.d.ts

@@ -17,5 +17,4 @@ export declare abstract class RallyEvent {
     readonly playerId: string;
     readonly eventType: EventType;
     protected constructor({ eventType, playerId }: RallyEventOpts);
-    abstract toString(): string;
 }

package/dist/esm/src/service/event/reception.d.ts

@@ -20,5 +20,4 @@ export declare class Reception extends InPlayEvent<ReceptionFailure, ReceptionTy
     readonly type: ReceptionType;
     static create(input: unknown): Reception;
     private constructor();
-    toString(): string;
 }

package/dist/esm/src/service/event/reception.js

@@ -38,9 +38,4 @@ export class Reception extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    toString() {
-        const failure = `"failure":${this.failure}`;
-        const type = `"type":${this.type}`;
-        return `{${this._toString()},${failure},${type}}`;
-    }
 }

package/dist/esm/src/service/event/serve.d.ts

@@ -19,5 +19,4 @@ export declare class Serve extends InPlayEvent<ServeFailure, ServeType> {
     readonly type: ServeType;
     static create(input: unknown): Serve;
     private constructor();
-    toString(): string;
 }

package/dist/esm/src/service/event/serve.js

@@ -35,9 +35,4 @@ export class Serve extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    toString() {
-        const failure = `"failure":${this.failure}`;
-        const type = `"type":${this.type}`;
-        return `{${this._toString()},${failure},${type}}`;
-    }
 }

package/dist/esm/src/service/event/set.d.ts

@@ -24,5 +24,4 @@ export declare class Set extends InPlayEvent<SetFailure, SetType> {
     readonly tempo?: SetTempo;
     static create(input: unknown): Set;
     private constructor();
-    toString(): string;
 }

package/dist/esm/src/service/event/set.js

@@ -44,10 +44,4 @@ export class Set extends InPlayEvent {
         this.failure = failure;
         this.tempo = tempo;
     }
-    toString() {
-        const failure = `"failure":${this.failure}`;
-        const type = `"type":${this.type}`;
-        const tempo = this.tempo !== undefined ? `,"tempo":${this.tempo}` : '';
-        return `{${this._toString()},${failure},${type}${tempo}}`;
-    }
 }