volleyballsimtypes 0.0.481 → 0.0.483

package/dist/cjs/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, 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,36 +81,28 @@ 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 {
     rotation: number;
-    order: string[];
+    weights: Record<string, number>;
     tempos?: Record<string, 'FAST' | 'HIGH'>;
 }
+export interface ApiBlockingPreference {
+    rotation: number;
+    targets: Record<string, RoleEnum>;
+}
 export interface ApiSystemSet {
     rotationSystem: RotationSystemEnum;
     designatedSetters: string[];
@@ -126,8 +118,6 @@ export interface ApiLiberoInjury {
     inMatchDesignateId?: string;
 }
 export interface ApiLiberoSetSubConfig {
-    mode: LiberoSubMode;
-    fatigueBand?: EnergyBand;
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
 }
@@ -148,6 +138,8 @@ export interface Tactics {
     offensivePreferences: ApiOffensivePreference[];
     systemSets?: ApiSystemSet[];
     offensivePreferenceSets?: ApiOffensivePreference[][];
+    blockingPreferences: ApiBlockingPreference[];
+    blockingPreferenceSets?: ApiBlockingPreference[][];
     replaceKnockedImmediately?: Record<string, boolean>;
     injuryReplacements?: ApiInjuryReplacement[];
     liberoInjury?: ApiLiberoInjury;

package/dist/cjs/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, 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,37 +13,31 @@ 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 {
     rotation: number;
-    order: PlayerId[];
+    weights: Record<PlayerId, number>;
     tempos?: Record<PlayerId, 'FAST' | 'HIGH'>;
 }
+export interface BlockingPreferenceAttributes {
+    rotation: number;
+    targets: Record<PlayerId, RoleEnum>;
+}
 export interface SystemSetAttributes {
     rotationSystem: RotationSystemEnum;
     designatedSetters: PlayerId[];
@@ -59,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[];
@@ -85,10 +79,12 @@ export interface TacticsAttributes {
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;
+    blocking_preferences: BlockingPreferenceAttributes[];
+    blocking_preference_sets?: BlockingPreferenceAttributes[][];
 }
 export type TacticsPk = 'team_id';
 export type TacticsId = TacticsModel[TacticsPk];
-export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets' | 'replace_knocked_immediately' | 'injury_replacements' | 'libero_injury';
+export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets' | 'replace_knocked_immediately' | 'injury_replacements' | 'libero_injury' | 'blocking_preferences' | 'blocking_preference_sets';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -108,6 +104,8 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;
+    blocking_preferences: BlockingPreferenceAttributes[];
+    blocking_preference_sets?: BlockingPreferenceAttributes[][];
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

package/dist/cjs/src/data/models/tactics.js

@@ -86,6 +86,15 @@ class TacticsModel extends sequelize_1.Model {
             libero_injury: {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true
+            },
+            blocking_preferences: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: []
+            },
+            blocking_preference_sets: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

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

@@ -150,7 +150,16 @@ function starterAt(tactics, zone) {
         (0, globals_1.expect)(back.lineup).toEqual(full.lineup);
         (0, globals_1.expect)(back.libero_replacements).toEqual(full.libero_replacements);
         (0, globals_1.expect)(back.receive_rotation_offset).toBe(true);
-        (0, globals_1.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.
+        (0, globals_1.expect)(back.designated_subs).toEqual([{
+                starterId: ids[0],
+                conditions: [{ type: 'FATIGUE', band: 'WORN' }],
+                conditionLogic: 'ALL',
+                pinchServer: false,
+                subBackMode: 'FATIGUE',
+                sets: [{ conditions: [] }]
+            }]);
         (0, globals_1.expect)(back.libero_replacement_sets).toEqual(full.libero_replacement_sets);
         (0, globals_1.expect)(back.rotation_system).toBe('5-1');
         (0, globals_1.expect)(back.designated_setters).toEqual(full.designated_setters);

package/dist/cjs/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/cjs/src/data/transformers/rally-event.js

@@ -7,6 +7,7 @@ exports.transformToReception = transformToReception;
 exports.transformToServe = transformToServe;
 exports.transformToSet = transformToSet;
 exports.transformToSpike = transformToSpike;
+exports.transformToFreeBall = transformToFreeBall;
 exports.transformToSubstitution = transformToSubstitution;
 const service_1 = require("../../service");
 // Incident packing for the compact key 'i': values below 10 are injury severities, 10+ are knock tiers.
@@ -118,6 +119,17 @@ 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.
+function transformToFreeBall(event, roster) {
+    return service_1.FreeBall.create({
+        failure: event.f,
+        type: event.t,
+        playerId: roster[event.p],
+        target: event.a,
+        score: event.s
+    });
+}
 function transformToSubstitution(event, roster) {
     return service_1.Substitution.create({
         playerId: roster[event.p],

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

@@ -61,6 +61,7 @@ function decodeCompactEvent(event, roster) {
         case 4: return (0, rally_event_1.transformToSet)(event, roster);
         case 5: return (0, rally_event_1.transformToSpike)(event, roster);
         case 6: return (0, rally_event_1.transformToBlock)(event, roster);
+        case 7: return (0, rally_event_1.transformToFreeBall)(event, roster);
         default: throw new Error(`UNKNOWN_EVENT_TYPE: ${String(event.e)}`);
     }
 }
@@ -73,6 +74,7 @@ function decodeLegacyEvent(event) {
         case 4: return service_1.Set.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, score: event.s });
         case 5: return service_1.Spike.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, score: event.s });
         case 6: return service_1.Block.create({ failure: event.f, type: event.t, playerId: event.p, target: event.a, blockers: event.b ?? [], score: event.s });
+        case 7: return service_1.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/cjs/src/data/transformers/rally.test.d.ts

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

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

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const uuid_1 = require("uuid");
+const service_1 = require("../../service");
+const rally_1 = require("./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.
+(0, globals_1.describe)('rally compact round trip — every event type', () => {
+    const pA = (0, uuid_1.v4)();
+    const pB = (0, uuid_1.v4)();
+    const pC = (0, uuid_1.v4)();
+    const setId = (0, uuid_1.v4)();
+    const events = [
+        service_1.LiberoReplacement.create({ playerId: pA, libero: pB, type: service_1.LiberoReplacementTypeEnum.LIBERO_IN }),
+        service_1.Substitution.create({ playerId: pA, playerOut: pC, injury: true }),
+        service_1.Serve.create({ playerId: pA, target: 6, score: 55, failure: service_1.ServeFailureEnum.NO_FAILURE, type: service_1.ServeTypeEnum.JUMP_TOPSPIN }),
+        service_1.Reception.create({ playerId: pB, target: 5, score: 50, failure: service_1.ReceptionFailureEnum.NO_FAILURE, type: service_1.ReceptionTypeEnum.DIG }),
+        service_1.Set.create({ playerId: pC, target: 3, score: 48, failure: service_1.SetFailureEnum.NO_FAILURE, type: service_1.SetTypeEnum.OVERHAND, tempo: service_1.SetTempoEnum.FIRST }),
+        service_1.Spike.create({ playerId: pA, target: 4, score: 62.5, failure: service_1.SpikeFailureEnum.NO_FAILURE, type: service_1.SpikeTypeEnum.CROSS_SHOT }),
+        service_1.Block.create({ playerId: pB, blockers: [pB, pC], target: 8, score: 48, failure: service_1.BlockFailureEnum.NO_FAILURE, type: service_1.BlockTypeEnum.DOUBLE }),
+        service_1.FreeBall.create({ playerId: pC, target: 6, score: 45, failure: service_1.FreeBallFailureEnum.NO_FAILURE, type: service_1.FreeBallTypeEnum.OVER })
+    ];
+    const rally = service_1.Rally.create({ id: (0, uuid_1.v4)(), order: 0, servingTeamId: (0, uuid_1.v4)(), events });
+    (0, globals_1.it)('covers every EventTypeEnum member (adding a new event type must extend this list)', () => {
+        const numericTypes = Object.values(service_1.EventTypeEnum).filter((v) => typeof v === 'number');
+        const present = new Set(events.map(e => e.eventType));
+        for (const t of numericTypes)
+            (0, globals_1.expect)(present.has(t)).toBe(true);
+        (0, globals_1.expect)(present.size).toBe(numericTypes.length);
+    });
+    (0, globals_1.it)('encodes then decodes every event type back to an equal event (guards the decoder switch)', () => {
+        const attrs = (0, rally_1.transformFromRally)(rally, setId);
+        const decoded = (0, rally_1.transformToRally)(attrs);
+        (0, globals_1.expect)(decoded.events).toHaveLength(events.length);
+        (0, globals_1.expect)(decoded.events.map(e => e.eventType)).toEqual(events.map(e => e.eventType));
+        const [lib, sub, serve, rec, set, spike, block, free] = decoded.events;
+        (0, globals_1.expect)(lib.playerId).toBe(pA);
+        (0, globals_1.expect)(lib.libero).toBe(pB);
+        (0, globals_1.expect)(lib.type).toBe(service_1.LiberoReplacementTypeEnum.LIBERO_IN);
+        (0, globals_1.expect)(sub.playerOut).toBe(pC);
+        (0, globals_1.expect)(sub.injury).toBe(true);
+        (0, globals_1.expect)(serve.target).toBe(6);
+        (0, globals_1.expect)(serve.score).toBe(55);
+        (0, globals_1.expect)(serve.type).toBe(service_1.ServeTypeEnum.JUMP_TOPSPIN);
+        (0, globals_1.expect)(rec.target).toBe(5);
+        (0, globals_1.expect)(rec.type).toBe(service_1.ReceptionTypeEnum.DIG);
+        (0, globals_1.expect)(set.type).toBe(service_1.SetTypeEnum.OVERHAND);
+        (0, globals_1.expect)(set.tempo).toBe(service_1.SetTempoEnum.FIRST);
+        (0, globals_1.expect)(spike.type).toBe(service_1.SpikeTypeEnum.CROSS_SHOT);
+        (0, globals_1.expect)(spike.score).toBe(62.5);
+        (0, globals_1.expect)(block.type).toBe(service_1.BlockTypeEnum.DOUBLE);
+        (0, globals_1.expect)(block.blockers).toEqual([pB, pC]);
+        (0, globals_1.expect)(free.playerId).toBe(pC);
+        (0, globals_1.expect)(free.target).toBe(6);
+        (0, globals_1.expect)(free.score).toBe(45);
+        (0, globals_1.expect)(free.type).toBe(service_1.FreeBallTypeEnum.OVER);
+        (0, globals_1.expect)(free.failure).toBe(service_1.FreeBallFailureEnum.NO_FAILURE);
+    });
+});

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

@@ -5,24 +5,9 @@ exports.transformFromTactics = transformToAttributes;
 exports.tacticsColumnsToApiDto = tacticsColumnsToApiDto;
 exports.apiTacticsConfigToTacticsAttributes = apiTacticsConfigToAttributes;
 const service_1 = require("../../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;
-}
+// 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)
@@ -66,23 +51,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
@@ -92,7 +73,7 @@ function transformToAttributes(tactics, teamId) {
         designated_setters: tactics.designatedSetters.map((s) => s.id),
         offensive_preferences: tactics.offensivePreferences.map(p => ({
             rotation: p.rotation,
-            order: p.order.map((a) => a.id),
+            weights: p.weights,
             tempos: p.tempos
         })),
         system_sets: tactics.systemSets?.map(s => ({
@@ -101,9 +82,11 @@ function transformToAttributes(tactics, teamId) {
         })),
         offensive_preference_sets: tactics.offensivePreferenceSets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            order: p.order.map((a) => a.id),
+            weights: p.weights,
             tempos: p.tempos
         }))),
+        blocking_preferences: tactics.blockingPreferences.map(p => ({ rotation: p.rotation, targets: p.targets })),
+        blocking_preference_sets: tactics.blockingPreferenceSets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, targets: p.targets }))),
         replace_knocked_immediately: tactics.replaceKnockedImmediately,
         injury_replacements: tactics.injuryReplacements.map(ir => ({
             starterId: ir.starter.id,
@@ -163,15 +146,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,
@@ -182,7 +169,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
@@ -192,7 +179,7 @@ function transformToObject(model, roster) {
         designatedSetters: (model.designated_setters ?? []).map((id) => findPlayer(id, roster)),
         offensivePreferences: (model.offensive_preferences ?? []).map(p => ({
             rotation: p.rotation,
-            order: p.order.map((id) => findPlayer(id, roster)),
+            weights: p.weights,
             tempos: p.tempos
         })),
         systemSets: model.system_sets?.map(s => ({
@@ -201,9 +188,11 @@ function transformToObject(model, roster) {
         })),
         offensivePreferenceSets: model.offensive_preference_sets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            order: p.order.map((id) => findPlayer(id, roster)),
+            weights: p.weights,
             tempos: p.tempos
         }))),
+        blockingPreferences: (model.blocking_preferences ?? []).map(p => ({ rotation: p.rotation, targets: p.targets })),
+        blockingPreferenceSets: model.blocking_preference_sets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, targets: p.targets }))),
         // LENIENT: keep only boolean entries keyed by a court starter or, when a second libero exists, the starting
         // libero (the libero knock toggle is an L2-only feature, owner 2026-07-06) so stale jsonb (an ex-starter's
         // key, a non-boolean value, a libero key left after the L2 was removed) can never fail schema validation
@@ -328,38 +317,27 @@ 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 ? (0, service_1.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 {
+                ...(0, service_1.convertLegacySetSubConfig)(cfg),
+                starterId,
+                sets: sets?.map(s => (0, service_1.convertLegacySetSubConfig)(s))
+            };
+        }),
         rotationSystem: model.rotation_system,
         designatedSetters: model.designated_setters,
         offensivePreferences: model.offensive_preferences,
         systemSets: model.system_sets,
         offensivePreferenceSets: model.offensive_preference_sets,
+        blockingPreferences: model.blocking_preferences,
+        blockingPreferenceSets: model.blocking_preference_sets,
         // Same stale-data policy as the heals below: only boolean entries keyed by a court starter or, when a second
         // libero exists, the starting libero (the libero knock toggle is an L2-only feature, owner 2026-07-06)
         // survive; an empty map surfaces as absent (missing key = ON).
@@ -465,6 +443,8 @@ function apiTacticsConfigToAttributes(config, teamId) {
         offensive_preferences: config.offensivePreferences,
         system_sets: config.systemSets,
         offensive_preference_sets: config.offensivePreferenceSets,
+        blocking_preferences: config.blockingPreferences ?? [],
+        blocking_preference_sets: config.blockingPreferenceSets,
         replace_knocked_immediately: config.replaceKnockedImmediately,
         injury_replacements: config.injuryReplacements,
         libero_injury: config.liberoInjury