volleyballsimtypes 0.0.482 → 0.0.483

package/dist/esm/src/service/team/schemas/libero-sub.z.d.ts

@@ -1,19 +1,5 @@
 import { z } from 'zod';
-import { EnergyBand } from '../energy-band';
-export declare const LiberoSubModeSchema: z.ZodEnum<{
-    NEVER: "NEVER";
-    FATIGUE: "FATIGUE";
-    CONDITIONS: "CONDITIONS";
-    ALWAYS: "ALWAYS";
-}>;
-export declare const LiberoSetSubConfigSchema: z.ZodObject<{
-    mode: z.ZodEnum<{
-        NEVER: "NEVER";
-        FATIGUE: "FATIGUE";
-        CONDITIONS: "CONDITIONS";
-        ALWAYS: "ALWAYS";
-    }>;
-    fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+export declare const LiberoSetSubConfigSchema: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
     conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
         type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
     }, z.core.$strip>, z.ZodObject<{
@@ -45,18 +31,14 @@ export declare const LiberoSetSubConfigSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
         phase: z.ZodEnum<typeof import("..").MatchPhase>;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+        band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
     }, z.core.$strip>], "type">>>;
     conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-}, z.core.$strip>;
-export declare const LiberoSubConfigSchema: z.ZodObject<{
-    sets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        mode: z.ZodEnum<{
-            NEVER: "NEVER";
-            FATIGUE: "FATIGUE";
-            CONDITIONS: "CONDITIONS";
-            ALWAYS: "ALWAYS";
-        }>;
-        fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+}, z.core.$strip>>;
+export declare const LiberoSubConfigSchema: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+    sets: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
         conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
         }, z.core.$strip>, z.ZodObject<{
@@ -88,16 +70,12 @@ export declare const LiberoSubConfigSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
             phase: z.ZodEnum<typeof import("..").MatchPhase>;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+            band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
         }, z.core.$strip>], "type">>>;
         conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-    }, z.core.$strip>>>;
-    mode: z.ZodEnum<{
-        NEVER: "NEVER";
-        FATIGUE: "FATIGUE";
-        CONDITIONS: "CONDITIONS";
-        ALWAYS: "ALWAYS";
-    }>;
-    fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+    }, z.core.$strip>>>>;
     conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
         type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
     }, z.core.$strip>, z.ZodObject<{
@@ -129,6 +107,9 @@ export declare const LiberoSubConfigSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
         phase: z.ZodEnum<typeof import("..").MatchPhase>;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+        band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
     }, z.core.$strip>], "type">>>;
     conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-}, z.core.$strip>;
+}, z.core.$strip>>;

package/dist/esm/src/service/team/schemas/libero-sub.z.js

@@ -1,34 +1,18 @@
 import { z } from 'zod';
-import { EnergyBand } from '../energy-band';
+import { convertLegacyLiberoSetSubConfig, convertLegacyLiberoSubConfig } from '../sub-config-convert';
 import { ConditionLogicSchema, PinchConditionSchema } from './designated-sub.z';
-export const LiberoSubModeSchema = z.enum(['NEVER', 'FATIGUE', 'ALWAYS', 'CONDITIONS']);
-// Fields shared by the all-sets config and each per-set config. The swapped-in player is always the dedicated
-// `secondLibero`, so there is no bench to validate; the CONDITIONS mode reuses the pinch-server condition
-// catalog (PinchConditionSchema, which includes the libero-only PHASE condition) + ALL/ANY logic.
+// Pure condition engine (owner 2026-07-11): the second libero is active while `conditions` hold (combined
+// per `conditionLogic`, default ALL; the STARTING libero is the FATIGUE-condition subject). No conditions =
+// the starting libero always plays; [{ASAP}] = always the second libero (the old ALWAYS). The swapped-in
+// player is always the dedicated `secondLibero`, so there is no bench to validate. Legacy mode-shaped
+// configs (NEVER/FATIGUE/ALWAYS/CONDITIONS) are auto-converted by the preprocess.
 const liberoSetSubConfigShape = {
-    mode: LiberoSubModeSchema,
-    // fatigue mode only (absent => the team default `substitutionBand`):
-    fatigueBand: z.nativeEnum(EnergyBand).optional(),
-    // conditions mode only:
     conditions: z.array(PinchConditionSchema).optional(),
     conditionLogic: ConditionLogicSchema.optional()
 };
-// CONDITIONS mode needs at least one condition (mirrors the designated-sub pinch refine).
-function refineConditions(data, ctx) {
-    if (data.mode !== 'CONDITIONS')
-        return;
-    if (data.conditions == null || data.conditions.length === 0) {
-        ctx.addIssue({ code: 'custom', message: 'LIBERO_CONDITIONS_REQUIRE_A_CONDITION', path: ['conditions'] });
-    }
-}
-export const LiberoSetSubConfigSchema = z.object(liberoSetSubConfigShape).superRefine(refineConditions);
-export const LiberoSubConfigSchema = z.object({
+export const LiberoSetSubConfigSchema = z.preprocess(convertLegacyLiberoSetSubConfig, z.object(liberoSetSubConfigShape));
+export const LiberoSubConfigSchema = z.preprocess(convertLegacyLiberoSubConfig, z.object({
     ...liberoSetSubConfigShape,
     // Optional per-set overrides (index 0 = set 1 ... index 4 = set 5); absent => the flat config for all sets.
     sets: z.array(LiberoSetSubConfigSchema).max(5).optional()
-}).superRefine((data, ctx) => {
-    // The flat config is the fallback for any set a partial `sets` array doesn't cover, so validate it whenever
-    // `sets` is absent or covers fewer than 5 sets (each present per-set config is validated by its own schema).
-    if (data.sets == null || data.sets.length < 5)
-        refineConditions(data, ctx);
-});
+}));

package/dist/esm/src/service/team/schemas/libero-sub.z.test.js

@@ -1,86 +1,125 @@
 import { describe, it, expect } from '@jest/globals';
-import { LiberoSetSubConfigSchema, LiberoSubConfigSchema, LiberoSubModeSchema } from './libero-sub.z';
+import { LiberoSetSubConfigSchema, LiberoSubConfigSchema } from './libero-sub.z';
 import { EnergyBand } from '../energy-band';
 import { MatchPhase, PinchConditionType } from '../pinch-condition';
-describe('LiberoSubModeSchema', () => {
-    it('accepts NEVER, FATIGUE, ALWAYS and CONDITIONS', () => {
-        for (const mode of ['NEVER', 'FATIGUE', 'ALWAYS', 'CONDITIONS']) {
-            expect(LiberoSubModeSchema.safeParse(mode).success).toBe(true);
-        }
-    });
-    it('rejects an unknown mode', () => {
-        expect(LiberoSubModeSchema.safeParse('SOMETIMES').success).toBe(false);
+// Unified condition engine (owner 2026-07-11): the libero rule is a pure condition list; legacy mode-shaped
+// configs (NEVER/FATIGUE/ALWAYS/CONDITIONS) auto-convert in the schema preprocess.
+describe('LiberoSetSubConfigSchema (unified)', () => {
+    it('accepts an empty config (no conditions = the starting libero always plays)', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({});
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.conditions ?? []).toHaveLength(0);
     });
-});
-describe('LiberoSetSubConfigSchema', () => {
-    it('accepts a mode with no band', () => {
-        expect(LiberoSetSubConfigSchema.safeParse({ mode: 'ALWAYS' }).success).toBe(true);
+    it('accepts a FATIGUE condition with a band', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({
+            conditions: [{ type: PinchConditionType.FATIGUE, band: EnergyBand.TIRED }]
+        });
+        expect(res.success).toBe(true);
     });
-    it('accepts a fatigue mode with a band', () => {
-        expect(LiberoSetSubConfigSchema.safeParse({ mode: 'FATIGUE', fatigueBand: EnergyBand.TIRED }).success).toBe(true);
+    it('accepts a FATIGUE condition without a band (team default)', () => {
+        expect(LiberoSetSubConfigSchema.safeParse({ conditions: [{ type: PinchConditionType.FATIGUE }] }).success).toBe(true);
     });
-    it('rejects an unknown band', () => {
-        expect(LiberoSetSubConfigSchema.safeParse({ mode: 'FATIGUE', fatigueBand: 'SLEEPY' }).success).toBe(false);
+    it('rejects a FATIGUE condition with an unknown band', () => {
+        expect(LiberoSetSubConfigSchema.safeParse({ conditions: [{ type: PinchConditionType.FATIGUE, band: 'SLEEPY' }] }).success).toBe(false);
     });
-    it('accepts CONDITIONS with a PHASE condition (serve/receive split)', () => {
+    it('accepts a PHASE condition (serve/receive split)', () => {
         const res = LiberoSetSubConfigSchema.safeParse({
-            mode: 'CONDITIONS',
             conditionLogic: 'ALL',
             conditions: [{ type: PinchConditionType.PHASE, phase: MatchPhase.RECEIVING }]
         });
         expect(res.success).toBe(true);
     });
-    it('accepts CONDITIONS mixing a pinch condition and a PHASE condition', () => {
+    it('accepts mixed conditions (score + phase + fatigue) under ANY logic', () => {
         const res = LiberoSetSubConfigSchema.safeParse({
-            mode: 'CONDITIONS',
             conditionLogic: 'ANY',
             conditions: [
                 { type: PinchConditionType.MIN_OWN_SCORE, score: 20 },
-                { type: PinchConditionType.PHASE, phase: MatchPhase.SERVING }
+                { type: PinchConditionType.PHASE, phase: MatchPhase.SERVING },
+                { type: PinchConditionType.FATIGUE, band: EnergyBand.EXHAUSTED }
             ]
         });
         expect(res.success).toBe(true);
     });
-    it('rejects CONDITIONS mode with no conditions', () => {
-        expect(LiberoSetSubConfigSchema.safeParse({ mode: 'CONDITIONS' }).success).toBe(false);
-        expect(LiberoSetSubConfigSchema.safeParse({ mode: 'CONDITIONS', conditions: [] }).success).toBe(false);
-    });
     it('rejects an invalid PHASE value', () => {
         const res = LiberoSetSubConfigSchema.safeParse({
-            mode: 'CONDITIONS',
             conditions: [{ type: PinchConditionType.PHASE, phase: 'ATTACKING' }]
         });
         expect(res.success).toBe(false);
     });
 });
+describe('LiberoSetSubConfigSchema (legacy conversion)', () => {
+    it('converts legacy NEVER to an empty condition list', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({ mode: 'NEVER' });
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.conditions).toEqual([]);
+    });
+    it('converts legacy ALWAYS to a single ASAP condition', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({ mode: 'ALWAYS' });
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.conditions).toEqual([{ type: PinchConditionType.ASAP }]);
+    });
+    it('converts legacy FATIGUE + band to a FATIGUE condition carrying the band', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({ mode: 'FATIGUE', fatigueBand: EnergyBand.WORN });
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.conditions).toEqual([{ type: PinchConditionType.FATIGUE, band: EnergyBand.WORN }]);
+    });
+    it('converts legacy FATIGUE without a band to a bandless FATIGUE condition (team default)', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({ mode: 'FATIGUE' });
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.conditions).toEqual([{ type: PinchConditionType.FATIGUE }]);
+    });
+    it('converts legacy CONDITIONS by stripping the mode and keeping the conditions', () => {
+        const conditions = [{ type: PinchConditionType.PHASE, phase: MatchPhase.RECEIVING }];
+        const res = LiberoSetSubConfigSchema.safeParse({ mode: 'CONDITIONS', conditionLogic: 'ALL', conditions });
+        expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.conditions).toEqual(conditions);
+            expect(res.data.mode).toBeUndefined();
+        }
+    });
+    it('heals a legacy CONDITIONS config with no conditions to never (empty list) instead of rejecting', () => {
+        const res = LiberoSetSubConfigSchema.safeParse({ mode: 'CONDITIONS' });
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.conditions ?? []).toHaveLength(0);
+    });
+});
 describe('LiberoSubConfigSchema', () => {
-    it('accepts a flat config with no per-set overrides', () => {
+    it('accepts a flat config with no per-set overrides (legacy shape converts)', () => {
         expect(LiberoSubConfigSchema.safeParse({ mode: 'FATIGUE', fatigueBand: EnergyBand.WORN }).success).toBe(true);
     });
-    it('accepts up to five per-set configs', () => {
+    it('accepts up to five per-set configs (legacy per-set entries convert)', () => {
         const res = LiberoSubConfigSchema.safeParse({
             mode: 'NEVER',
             sets: [
                 { mode: 'NEVER' },
                 { mode: 'ALWAYS' },
                 { mode: 'FATIGUE', fatigueBand: EnergyBand.TIRED },
-                { mode: 'NEVER' },
-                { mode: 'ALWAYS' }
+                { conditions: [{ type: PinchConditionType.FATIGUE }] },
+                {}
             ]
         });
         expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.sets?.[0].conditions).toEqual([]);
+            expect(res.data.sets?.[1].conditions).toEqual([{ type: PinchConditionType.ASAP }]);
+            expect(res.data.sets?.[2].conditions).toEqual([{ type: PinchConditionType.FATIGUE, band: EnergyBand.TIRED }]);
+        }
     });
     it('rejects more than five per-set configs', () => {
         const res = LiberoSubConfigSchema.safeParse({
-            mode: 'NEVER',
-            sets: Array.from({ length: 6 }, () => ({ mode: 'NEVER' }))
+            sets: Array.from({ length: 6 }, () => ({}))
         });
         expect(res.success).toBe(false);
     });
-    it('rejects an unknown mode in a per-set config', () => {
+    it('rejects an unknown condition type in a per-set config', () => {
         const res = LiberoSubConfigSchema.safeParse({
-            mode: 'NEVER',
-            sets: [{ mode: 'WHENEVER' }]
+            sets: [{ conditions: [{ type: 'WHENEVER' }] }]
         });
         expect(res.success).toBe(false);
     });

package/dist/esm/src/service/team/schemas/tactics.z.d.ts

@@ -15,16 +15,9 @@ export declare const TacticsInputSchema: z.ZodObject<{
     }, z.core.$strip>;
     liberoReplacements: z.ZodArray<z.ZodCustom<Player, Player>>;
     receiveRotationOffset: z.ZodDefault<z.ZodBoolean>;
-    designatedSubs: z.ZodDefault<z.ZodArray<z.ZodObject<{
-        sets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-            mode: z.ZodEnum<{
-                NEVER: "NEVER";
-                FATIGUE: "FATIGUE";
-                PINCH: "PINCH";
-            }>;
+    designatedSubs: z.ZodDefault<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+        sets: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
             bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-            fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
-            benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
             conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
             }, z.core.$strip>, z.ZodObject<{
@@ -56,9 +49,13 @@ export declare const TacticsInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                 phase: z.ZodEnum<typeof import("..").MatchPhase>;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
             }, z.core.$strip>], "type">>>;
             conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
             pinchServer: z.ZodOptional<z.ZodBoolean>;
+            benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
             subBackMode: z.ZodOptional<z.ZodEnum<{
                 FATIGUE: "FATIGUE";
                 CONDITIONS: "CONDITIONS";
@@ -94,17 +91,13 @@ export declare const TacticsInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                 phase: z.ZodEnum<typeof import("..").MatchPhase>;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
             }, z.core.$strip>], "type">>>;
             subBackConditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-        }, z.core.$strip>>>;
-        mode: z.ZodEnum<{
-            NEVER: "NEVER";
-            FATIGUE: "FATIGUE";
-            PINCH: "PINCH";
-        }>;
+        }, z.core.$strip>>>>;
         bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-        fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
-        benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
         conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
         }, z.core.$strip>, z.ZodObject<{
@@ -136,9 +129,13 @@ export declare const TacticsInputSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
             phase: z.ZodEnum<typeof import("..").MatchPhase>;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+            band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
         }, z.core.$strip>], "type">>>;
         conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
         pinchServer: z.ZodOptional<z.ZodBoolean>;
+        benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
         subBackMode: z.ZodOptional<z.ZodEnum<{
             FATIGUE: "FATIGUE";
             CONDITIONS: "CONDITIONS";
@@ -174,21 +171,17 @@ export declare const TacticsInputSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
             phase: z.ZodEnum<typeof import("..").MatchPhase>;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+            band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
         }, z.core.$strip>], "type">>>;
         subBackConditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
         starter: z.ZodCustom<Player, Player>;
-    }, z.core.$strip>>>;
+    }, z.core.$strip>>>>;
     substitutionBand: z.ZodDefault<z.ZodUnion<readonly [z.ZodEnum<typeof EnergyBand>, z.ZodLiteral<"NEVER">]>>;
     secondLibero: z.ZodOptional<z.ZodCustom<Player, Player>>;
-    liberoSub: z.ZodOptional<z.ZodObject<{
-        sets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-            mode: z.ZodEnum<{
-                NEVER: "NEVER";
-                FATIGUE: "FATIGUE";
-                CONDITIONS: "CONDITIONS";
-                ALWAYS: "ALWAYS";
-            }>;
-            fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+    liberoSub: z.ZodOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+        sets: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
             conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
             }, z.core.$strip>, z.ZodObject<{
@@ -220,16 +213,12 @@ export declare const TacticsInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                 phase: z.ZodEnum<typeof import("..").MatchPhase>;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
             }, z.core.$strip>], "type">>>;
             conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-        }, z.core.$strip>>>;
-        mode: z.ZodEnum<{
-            NEVER: "NEVER";
-            FATIGUE: "FATIGUE";
-            CONDITIONS: "CONDITIONS";
-            ALWAYS: "ALWAYS";
-        }>;
-        fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+        }, z.core.$strip>>>>;
         conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
         }, z.core.$strip>, z.ZodObject<{
@@ -261,9 +250,12 @@ export declare const TacticsInputSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
             phase: z.ZodEnum<typeof import("..").MatchPhase>;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+            band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
         }, z.core.$strip>], "type">>>;
         conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-    }, z.core.$strip>>;
+    }, z.core.$strip>>>;
     liberoReplacementSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodCustom<Player, Player>>>>;
     rotationSystem: z.ZodDefault<z.ZodEnum<typeof RotationSystemEnum>>;
     designatedSetters: z.ZodDefault<z.ZodArray<z.ZodCustom<Player, Player>>>;

package/dist/esm/src/service/team/schemas/tactics.z.js

@@ -218,10 +218,11 @@ export const TacticsInputSchema = z.object({
         ...(libero != null ? [libero.id] : []),
         ...data.lineup.bench.map(p => p.id)
     ]);
-    const liberoSubModes = data.liberoSub != null
-        ? [data.liberoSub.mode, ...(data.liberoSub.sets ?? []).map(s => s.mode)]
+    // Unified condition engine: the rule wants a swap when ANY config (flat or per-set) has conditions.
+    const liberoConditionSets = data.liberoSub != null
+        ? [data.liberoSub.conditions ?? [], ...(data.liberoSub.sets ?? []).map(s => s.conditions ?? [])]
         : [];
-    const wantsLiberoSwap = liberoSubModes.some(mode => mode !== 'NEVER');
+    const wantsLiberoSwap = liberoConditionSets.some(conditions => conditions.length > 0);
     if (wantsLiberoSwap && data.secondLibero == null) {
         ctx.addIssue({ code: 'custom', message: 'LIBERO_SWAP_REQUIRES_SECOND_LIBERO', path: ['secondLibero'] });
     }

package/dist/esm/src/service/team/schemas/team.z.d.ts

@@ -23,16 +23,9 @@ export declare const TeamInputSchema: z.ZodObject<{
         }, z.core.$strip>;
         liberoReplacements: z.ZodArray<z.ZodCustom<Player, Player>>;
         receiveRotationOffset: z.ZodDefault<z.ZodBoolean>;
-        designatedSubs: z.ZodDefault<z.ZodArray<z.ZodObject<{
-            sets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                mode: z.ZodEnum<{
-                    NEVER: "NEVER";
-                    FATIGUE: "FATIGUE";
-                    PINCH: "PINCH";
-                }>;
+        designatedSubs: z.ZodDefault<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+            sets: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
                 bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-                fatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
-                benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
                 conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                     type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
                 }, z.core.$strip>, z.ZodObject<{
@@ -64,9 +57,13 @@ export declare const TeamInputSchema: z.ZodObject<{
                 }, z.core.$strip>, z.ZodObject<{
                     type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                     phase: z.ZodEnum<typeof import("..").MatchPhase>;
+                }, z.core.$strip>, z.ZodObject<{
+                    type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                    band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
                 }, z.core.$strip>], "type">>>;
                 conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
                 pinchServer: z.ZodOptional<z.ZodBoolean>;
+                benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
                 subBackMode: z.ZodOptional<z.ZodEnum<{
                     FATIGUE: "FATIGUE";
                     CONDITIONS: "CONDITIONS";
@@ -102,17 +99,13 @@ export declare const TeamInputSchema: z.ZodObject<{
                 }, z.core.$strip>, z.ZodObject<{
                     type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                     phase: z.ZodEnum<typeof import("..").MatchPhase>;
+                }, z.core.$strip>, z.ZodObject<{
+                    type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                    band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
                 }, z.core.$strip>], "type">>>;
                 subBackConditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-            }, z.core.$strip>>>;
-            mode: z.ZodEnum<{
-                NEVER: "NEVER";
-                FATIGUE: "FATIGUE";
-                PINCH: "PINCH";
-            }>;
+            }, z.core.$strip>>>>;
             bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-            fatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
-            benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
             conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
             }, z.core.$strip>, z.ZodObject<{
@@ -144,9 +137,13 @@ export declare const TeamInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                 phase: z.ZodEnum<typeof import("..").MatchPhase>;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
             }, z.core.$strip>], "type">>>;
             conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
             pinchServer: z.ZodOptional<z.ZodBoolean>;
+            benchFatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
             subBackMode: z.ZodOptional<z.ZodEnum<{
                 FATIGUE: "FATIGUE";
                 CONDITIONS: "CONDITIONS";
@@ -182,21 +179,17 @@ export declare const TeamInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                 phase: z.ZodEnum<typeof import("..").MatchPhase>;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
             }, z.core.$strip>], "type">>>;
             subBackConditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
             starter: z.ZodCustom<Player, Player>;
-        }, z.core.$strip>>>;
+        }, z.core.$strip>>>>;
         substitutionBand: z.ZodDefault<z.ZodUnion<readonly [z.ZodEnum<typeof import("..").EnergyBand>, z.ZodLiteral<"NEVER">]>>;
         secondLibero: z.ZodOptional<z.ZodCustom<Player, Player>>;
-        liberoSub: z.ZodOptional<z.ZodObject<{
-            sets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                mode: z.ZodEnum<{
-                    NEVER: "NEVER";
-                    FATIGUE: "FATIGUE";
-                    CONDITIONS: "CONDITIONS";
-                    ALWAYS: "ALWAYS";
-                }>;
-                fatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
+        liberoSub: z.ZodOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+            sets: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
                 conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                     type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
                 }, z.core.$strip>, z.ZodObject<{
@@ -228,16 +221,12 @@ export declare const TeamInputSchema: z.ZodObject<{
                 }, z.core.$strip>, z.ZodObject<{
                     type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                     phase: z.ZodEnum<typeof import("..").MatchPhase>;
+                }, z.core.$strip>, z.ZodObject<{
+                    type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                    band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
                 }, z.core.$strip>], "type">>>;
                 conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-            }, z.core.$strip>>>;
-            mode: z.ZodEnum<{
-                NEVER: "NEVER";
-                FATIGUE: "FATIGUE";
-                CONDITIONS: "CONDITIONS";
-                ALWAYS: "ALWAYS";
-            }>;
-            fatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
+            }, z.core.$strip>>>>;
             conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
             }, z.core.$strip>, z.ZodObject<{
@@ -269,9 +258,12 @@ export declare const TeamInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.PHASE>;
                 phase: z.ZodEnum<typeof import("..").MatchPhase>;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.FATIGUE>;
+                band: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
             }, z.core.$strip>], "type">>>;
             conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
-        }, z.core.$strip>>;
+        }, z.core.$strip>>>;
         liberoReplacementSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodCustom<Player, Player>>>>;
         rotationSystem: z.ZodDefault<z.ZodEnum<typeof import("..").RotationSystemEnum>>;
         designatedSetters: z.ZodDefault<z.ZodArray<z.ZodCustom<Player, Player>>>;

package/dist/esm/src/service/team/sub-config-convert.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Convert ONE legacy set-sub config (flat or per-set entry). Handles BOTH legacy generations:
+ * mode-era rows ({mode: NEVER|FATIGUE|PINCH}) and the oldest isPinchServer-era rows (no mode;
+ * isPinchServer flag + a 'NEVER' fatigueBand for the old never-sub state). Non-records and
+ * already-unified shapes (neither mode nor isPinchServer nor fatigueBand keys) pass through.
+ */
+export declare function convertLegacySetSubConfig(raw: unknown): unknown;
+/** Convert a legacy DesignatedSub (flat fields + per-set entries); unified shapes pass through. */
+export declare function convertLegacyDesignatedSub(raw: unknown): unknown;
+/** Convert ONE legacy libero set-sub config; unified shapes pass through. */
+export declare function convertLegacyLiberoSetSubConfig(raw: unknown): unknown;
+/** Convert a legacy LiberoSubConfig (flat fields + per-set entries); unified shapes pass through. */
+export declare function convertLegacyLiberoSubConfig(raw: unknown): unknown;