volleyballsimtypes 0.0.481 → 0.0.483

package/dist/esm/src/service/team/index.js

@@ -7,9 +7,11 @@ export * from './energy-band';
 export * from './pinch-condition';
 export * from './designated-sub';
 export * from './libero-sub';
+export * from './sub-config-convert';
 export * from './rotation-system';
 export * from './lineup-function';
 export * from './base-position';
 export * from './offensive-preference';
+export * from './blocking-preference';
 export * from './injury-replacement';
 export * from './libero-injury';

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

@@ -1,9 +1,5 @@
-import { EnergyBand } from './energy-band';
 import { ConditionLogic, PinchCondition } from './pinch-condition';
-export type LiberoSubMode = 'NEVER' | 'FATIGUE' | 'ALWAYS' | 'CONDITIONS';
 export interface LiberoSetSubConfig {
-    readonly mode: LiberoSubMode;
-    readonly fatigueBand?: EnergyBand;
     readonly conditions?: PinchCondition[];
     readonly conditionLogic?: ConditionLogic;
 }

package/dist/esm/src/service/team/offensive-preference.d.ts

@@ -1,7 +1,6 @@
-import { Player } from '../player';
 export type TempoPreference = 'FAST' | 'HIGH';
 export interface OffensivePreference {
     readonly rotation: number;
-    readonly order: Player[];
+    readonly weights: Record<string, number>;
     readonly tempos?: Record<string, TempoPreference>;
 }

package/dist/esm/src/service/team/pinch-condition.d.ts

@@ -1,5 +1,6 @@
+import { EnergyBand, SubBand } from './energy-band';
 export declare enum PinchConditionType {
-    ASAP = "ASAP",// every time the linked starter wins back the serve
+    ASAP = "ASAP",// unconditionally true (pinch server: every serve gain; libero rule: "Always")
     TEAM_SET_POINT = "TEAM_SET_POINT",// team within `margin` of winning the set
     OPPONENT_SET_POINT = "OPPONENT_SET_POINT",// opponent within `margin` of winning the set
     SCORE_DIFF = "SCORE_DIFF",// team trailing/leading by at least `points`
@@ -7,7 +8,8 @@ export declare enum PinchConditionType {
     FROM_SET = "FROM_SET",// only set N or later
     MIN_OWN_SCORE = "MIN_OWN_SCORE",// only once own score >= N
     MIN_OPPONENT_SCORE = "MIN_OPPONENT_SCORE",// only once opponent score >= N
-    PHASE = "PHASE"
+    PHASE = "PHASE",// the team is serving or receiving this rally (used by the libero deployment rule)
+    FATIGUE = "FATIGUE"
 }
 export declare enum MatchPhase {
     SERVING = "SERVING",
@@ -66,7 +68,11 @@ export interface PhaseCondition {
     readonly type: PinchConditionType.PHASE;
     readonly phase: MatchPhase;
 }
-export type PinchCondition = AsapCondition | TeamSetPointCondition | OpponentSetPointCondition | ScoreDiffCondition | AfterRotationsCondition | FromSetCondition | MinOwnScoreCondition | MinOpponentScoreCondition | PhaseCondition;
+export interface FatigueCondition {
+    readonly type: PinchConditionType.FATIGUE;
+    readonly band?: EnergyBand;
+}
+export type PinchCondition = AsapCondition | TeamSetPointCondition | OpponentSetPointCondition | ScoreDiffCondition | AfterRotationsCondition | FromSetCondition | MinOwnScoreCondition | MinOpponentScoreCondition | PhaseCondition | FatigueCondition;
 export type ConditionLogic = 'ALL' | 'ANY';
 export interface PinchSetState {
     readonly ownScore: number;
@@ -75,4 +81,6 @@ export interface PinchSetState {
     readonly setNumber: number;
     readonly ownServeTurns: number;
     readonly phase: MatchPhase;
+    readonly subjectBand?: EnergyBand;
+    readonly defaultBand?: SubBand;
 }

package/dist/esm/src/service/team/pinch-condition.js

@@ -1,6 +1,7 @@
-// Conditions that gate when a pinch server is forced in to serve (in for its linked starter when the team
-// wins back the serve, out the moment the serve is lost). Each condition is evaluated against the live set
-// state; a pinch entry combines them with ALL (every condition must hold) or ANY (one is enough).
+// The ONE condition vocabulary of the substitution engine (owner 2026-07-11): designated substitutions,
+// pinch servers, sub-backs, and the libero deployment rule all evaluate the same catalog against the live
+// set state, combined with ALL (every condition must hold) or ANY (one is enough). A config with NO
+// conditions never fires.
 export var PinchConditionType;
 (function (PinchConditionType) {
     PinchConditionType["ASAP"] = "ASAP";
@@ -11,7 +12,11 @@ export var PinchConditionType;
     PinchConditionType["FROM_SET"] = "FROM_SET";
     PinchConditionType["MIN_OWN_SCORE"] = "MIN_OWN_SCORE";
     PinchConditionType["MIN_OPPONENT_SCORE"] = "MIN_OPPONENT_SCORE";
-    PinchConditionType["PHASE"] = "PHASE"; // the team is serving or receiving this rally (used by the libero deployment rule)
+    PinchConditionType["PHASE"] = "PHASE";
+    // The SUBJECT player's energy is at-or-worse than `band` (absent band = the team `substitutionBand`). The
+    // subject comes from the evaluation context, never from the condition: sub-in conditions judge the STARTER
+    // on court, sub-back conditions judge the SUBSTITUTE on court, the libero rule judges the STARTING libero.
+    PinchConditionType["FATIGUE"] = "FATIGUE";
 })(PinchConditionType || (PinchConditionType = {}));
 // Which side of the rally the team is on. Known at each dead ball: the serving team is SERVING, the other
 // RECEIVING. Consumed by the PHASE condition (libero deployment); pinch servers always evaluate while SERVING.

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

@@ -34,26 +34,17 @@ export declare const PinchConditionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<
 }, z.core.$strip>, z.ZodObject<{
     type: z.ZodLiteral<PinchConditionType.PHASE>;
     phase: z.ZodEnum<typeof MatchPhase>;
+}, z.core.$strip>, z.ZodObject<{
+    type: z.ZodLiteral<PinchConditionType.FATIGUE>;
+    band: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
 }, z.core.$strip>], "type">;
 export declare const ConditionLogicSchema: z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>;
-export declare const SubModeSchema: z.ZodEnum<{
-    NEVER: "NEVER";
-    FATIGUE: "FATIGUE";
-    PINCH: "PINCH";
-}>;
 export declare const SubBackModeSchema: z.ZodEnum<{
     FATIGUE: "FATIGUE";
     CONDITIONS: "CONDITIONS";
 }>;
-export declare const SetSubConfigSchema: z.ZodObject<{
-    mode: z.ZodEnum<{
-        NEVER: "NEVER";
-        FATIGUE: "FATIGUE";
-        PINCH: "PINCH";
-    }>;
+export declare const SetSubConfigSchema: 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<PinchConditionType.ASAP>;
     }, z.core.$strip>, z.ZodObject<{
@@ -85,9 +76,13 @@ export declare const SetSubConfigSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.PHASE>;
         phase: z.ZodEnum<typeof MatchPhase>;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<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";
@@ -123,19 +118,15 @@ export declare const SetSubConfigSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.PHASE>;
         phase: z.ZodEnum<typeof MatchPhase>;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<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>;
-export declare const DesignatedSubSchema: z.ZodObject<{
-    sets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        mode: z.ZodEnum<{
-            NEVER: "NEVER";
-            FATIGUE: "FATIGUE";
-            PINCH: "PINCH";
-        }>;
+}, z.core.$strip>>;
+export declare const DesignatedSubSchema: 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<PinchConditionType.ASAP>;
         }, z.core.$strip>, z.ZodObject<{
@@ -167,9 +158,13 @@ export declare const DesignatedSubSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<PinchConditionType.PHASE>;
             phase: z.ZodEnum<typeof MatchPhase>;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<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";
@@ -205,17 +200,13 @@ export declare const DesignatedSubSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<PinchConditionType.PHASE>;
             phase: z.ZodEnum<typeof MatchPhase>;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<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<PinchConditionType.ASAP>;
     }, z.core.$strip>, z.ZodObject<{
@@ -247,9 +238,13 @@ export declare const DesignatedSubSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.PHASE>;
         phase: z.ZodEnum<typeof MatchPhase>;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<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";
@@ -285,7 +280,10 @@ export declare const DesignatedSubSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.PHASE>;
         phase: z.ZodEnum<typeof MatchPhase>;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<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>>;

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

@@ -2,6 +2,7 @@ import { z } from 'zod';
 import { Player } from '../../player';
 import { EnergyBand } from '../energy-band';
 import { Comparison, MatchPhase, OpponentRelation, PinchConditionType, ScoreDirection } from '../pinch-condition';
+import { convertLegacyDesignatedSub, convertLegacySetSubConfig } from '../sub-config-convert';
 const playerInstanceSchema = z.custom((v) => v instanceof Player, {
     message: 'INVALID_PLAYER_INSTANCE'
 });
@@ -18,44 +19,47 @@ export const PinchConditionSchema = z.discriminatedUnion('type', [
     z.object({ type: z.literal(PinchConditionType.MIN_OWN_SCORE), score: z.number().int().min(0).max(40), comparison: z.nativeEnum(Comparison).optional() }),
     z.object({ type: z.literal(PinchConditionType.MIN_OPPONENT_SCORE), score: z.number().int().min(0).max(40), comparison: z.nativeEnum(Comparison).optional() }),
     // PHASE is used by the libero deployment rule (which reuses this schema); pinch servers never offer it.
-    z.object({ type: z.literal(PinchConditionType.PHASE), phase: z.nativeEnum(MatchPhase) })
+    z.object({ type: z.literal(PinchConditionType.PHASE), phase: z.nativeEnum(MatchPhase) }),
+    // The subject player's energy is at-or-worse than `band` (absent = the team `substitutionBand`); the
+    // subject comes from the evaluation context (starter / substitute / starting libero).
+    z.object({ type: z.literal(PinchConditionType.FATIGUE), band: z.nativeEnum(EnergyBand).optional() })
 ]);
 export const ConditionLogicSchema = z.union([z.literal('ALL'), z.literal('ANY')]);
-export const SubModeSchema = z.enum(['FATIGUE', 'PINCH', 'NEVER']);
 export const SubBackModeSchema = z.enum(['FATIGUE', 'CONDITIONS']);
-// Fields shared by the all-sets config and each per-set config.
+// Fields shared by the all-sets config and each per-set config. Pure condition engine (owner 2026-07-11):
+// no mode; `conditions` is the sub-in trigger and an EMPTY/absent list means the starter is never substituted
+// by this rule. Legacy mode-shaped inputs are auto-converted by the preprocess below.
 const setSubConfigShape = {
-    mode: SubModeSchema,
     bench: playerInstanceSchema.optional(),
-    fatigueBand: z.nativeEnum(EnergyBand).optional(),
-    benchFatigueBand: z.nativeEnum(EnergyBand).optional(),
     conditions: z.array(PinchConditionSchema).optional(),
     conditionLogic: ConditionLogicSchema.optional(),
-    // pinch ("Conditions") mode. true = serve-and-return pinch server; false/absent = regular conditional sub.
+    // true = serve-and-return pinch server; false/absent = regular conditional sub (stays until sub-back).
     pinchServer: z.boolean().optional(),
-    // a regular conditional sub's sub-back trigger + its condition set (subBackMode === 'CONDITIONS').
+    // The substitute's own pull band for FATIGUE sub-backs (absent = the team `substitutionBand`).
+    benchFatigueBand: z.nativeEnum(EnergyBand).optional(),
     subBackMode: SubBackModeSchema.optional(),
     subBackConditions: z.array(PinchConditionSchema).optional(),
     subBackConditionLogic: ConditionLogicSchema.optional()
 };
-// Pinch ("Conditions") mode needs a designated bench player and at least one sub-in condition. A regular
-// conditional sub (pinchServer !== true) with a CONDITIONS sub-back also needs at least one sub-back condition.
-function refinePinch(data, ctx) {
-    if (data.mode !== 'PINCH')
-        return;
-    if (data.bench == null) {
-        ctx.addIssue({ code: 'custom', message: 'PINCH_SERVER_REQUIRES_BENCH', path: ['bench'] });
-    }
-    if (data.conditions == null || data.conditions.length === 0) {
-        ctx.addIssue({ code: 'custom', message: 'PINCH_SERVER_REQUIRES_CONDITIONS', path: ['conditions'] });
+// A pinch server needs a designated bench player and at least one sub-in condition. A regular conditional sub
+// with a CONDITIONS sub-back needs at least one sub-back condition. Empty sub-in conditions are otherwise
+// VALID (= never fires).
+function refineSubConfig(data, ctx) {
+    if (data.pinchServer === true) {
+        if (data.bench == null) {
+            ctx.addIssue({ code: 'custom', message: 'PINCH_SERVER_REQUIRES_BENCH', path: ['bench'] });
+        }
+        if (data.conditions == null || data.conditions.length === 0) {
+            ctx.addIssue({ code: 'custom', message: 'PINCH_SERVER_REQUIRES_CONDITIONS', path: ['conditions'] });
+        }
     }
     if (data.pinchServer !== true && data.subBackMode === 'CONDITIONS' &&
         (data.subBackConditions == null || data.subBackConditions.length === 0)) {
         ctx.addIssue({ code: 'custom', message: 'CONDITIONAL_SUB_BACK_REQUIRES_CONDITIONS', path: ['subBackConditions'] });
     }
 }
-export const SetSubConfigSchema = z.object(setSubConfigShape).superRefine(refinePinch);
-export const DesignatedSubSchema = z.object({
+export const SetSubConfigSchema = z.preprocess(convertLegacySetSubConfig, z.object(setSubConfigShape).superRefine(refineSubConfig));
+export const DesignatedSubSchema = z.preprocess(convertLegacyDesignatedSub, z.object({
     starter: playerInstanceSchema,
     ...setSubConfigShape,
     // Optional per-set overrides (index 0 = set 1 ... index 4 = set 5); absent => the flat config for all sets.
@@ -64,5 +68,5 @@ export const DesignatedSubSchema = z.object({
     // 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 SetSubConfigSchema).
     if (data.sets == null || data.sets.length < 5)
-        refinePinch(data, ctx);
-});
+        refineSubConfig(data, ctx);
+}));

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

@@ -114,12 +114,14 @@ describe('DesignatedSubSchema', () => {
         });
         expect(res.success).toBe(true);
     });
-    it('rejects an unknown mode', () => {
+    it('heals an unknown legacy mode by stripping it (lenient conversion, config stays valid)', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,
             mode: 'SOMETIMES'
         });
-        expect(res.success).toBe(false);
+        expect(res.success).toBe(true);
+        if (res.success)
+            expect(res.data.mode).toBeUndefined();
     });
     it('accepts a pinch-mode entry with a bench server and conditions', () => {
         const res = DesignatedSubSchema.safeParse({

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);
     });