volleyballsimtypes 0.0.514 → 0.0.516

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

@@ -97,7 +97,7 @@ export interface ApiDesignatedSub extends ApiSetSubConfig {
 }
 export interface ApiOffensivePreference {
     rotation: number;
-    weights: Record<string, number>;
+    priorities: Record<string, 'HIGH' | 'MID' | 'LOW' | 'NONE'>;
     tempos?: Record<string, 'FAST' | 'HIGH'>;
 }
 export interface ApiBlockingPreference {
@@ -140,7 +140,6 @@ export interface Tactics {
     offensivePreferences: ApiOffensivePreference[];
     systemSets?: ApiSystemSet[];
     offensivePreferenceSets?: ApiOffensivePreference[][];
-    serveAttackShares?: Record<string, number>;
     basePositions?: BaseConfig;
     blockingPreferences: ApiBlockingPreference[];
     blockingPreferenceSets?: ApiBlockingPreference[][];

package/dist/cjs/src/api/tactics-player-refs.js

@@ -26,9 +26,9 @@ function collectTacticsPlayerIds(config) {
         config.secondLibero,
         ...((config.liberoReplacementSets ?? []).flat()),
         ...(config.designatedSetters ?? []),
-        ...((config.offensivePreferences ?? []).flatMap(p => Object.keys(p.weights))),
+        ...((config.offensivePreferences ?? []).flatMap(p => Object.keys(p.priorities))),
         ...((config.systemSets ?? []).flatMap(s => s.designatedSetters)),
-        ...((config.offensivePreferenceSets ?? []).flat().flatMap(p => Object.keys(p.weights))),
+        ...((config.offensivePreferenceSets ?? []).flat().flatMap(p => Object.keys(p.priorities))),
         ...((config.blockingPreferences ?? []).flatMap(p => [...Object.keys(p.commit ?? {}), ...Object.values(p.noBlock ?? {}).flat()])),
         ...((config.blockingPreferenceSets ?? []).flat().flatMap(p => [...Object.keys(p.commit ?? {}), ...Object.values(p.noBlock ?? {}).flat()])),
         // Injury replacements reference reserves (roster players outside the lineup); roster membership is the only

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

@@ -31,7 +31,7 @@ export interface DesignatedSubAttributes extends SetSubConfigAttributes {
 }
 export interface OffensivePreferenceAttributes {
     rotation: number;
-    weights: Record<PlayerId, number>;
+    priorities: Record<PlayerId, 'HIGH' | 'MID' | 'LOW' | 'NONE'>;
     tempos?: Record<PlayerId, 'FAST' | 'HIGH'>;
 }
 export interface BlockingPreferenceAttributes {
@@ -77,7 +77,6 @@ export interface TacticsAttributes {
     offensive_preferences: OffensivePreferenceAttributes[];
     system_sets?: SystemSetAttributes[];
     offensive_preference_sets?: OffensivePreferenceAttributes[][];
-    serve_attack_shares: Record<PlayerId, number>;
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;
@@ -87,7 +86,7 @@ export interface TacticsAttributes {
 }
 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' | 'serve_attack_shares' | 'replace_knocked_immediately' | 'injury_replacements' | 'libero_injury' | 'blocking_preferences' | 'blocking_preference_sets' | 'base_positions';
+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' | 'base_positions';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -104,7 +103,6 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     offensive_preferences: OffensivePreferenceAttributes[];
     system_sets?: SystemSetAttributes[];
     offensive_preference_sets?: OffensivePreferenceAttributes[][];
-    serve_attack_shares: Record<PlayerId, number>;
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;

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

@@ -75,11 +75,6 @@ class TacticsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true
             },
-            serve_attack_shares: {
-                type: sequelize_1.DataTypes.JSONB,
-                allowNull: false,
-                defaultValue: {}
-            },
             replace_knocked_immediately: {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true

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

@@ -73,7 +73,7 @@ function transformToAttributes(tactics, teamId) {
         designated_setters: tactics.designatedSetters.map((s) => s.id),
         offensive_preferences: tactics.offensivePreferences.map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         })),
         system_sets: tactics.systemSets?.map(s => ({
@@ -82,10 +82,9 @@ function transformToAttributes(tactics, teamId) {
         })),
         offensive_preference_sets: tactics.offensivePreferenceSets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         }))),
-        serve_attack_shares: tactics.serveAttackShares ?? {},
         base_positions: tactics.basePositions,
         blocking_preferences: tactics.blockingPreferences.map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock })),
         blocking_preference_sets: tactics.blockingPreferenceSets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock }))),
@@ -181,7 +180,7 @@ function transformToObject(model, roster) {
         designatedSetters: (model.designated_setters ?? []).map((id) => findPlayer(id, roster)),
         offensivePreferences: (model.offensive_preferences ?? []).map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         })),
         systemSets: model.system_sets?.map(s => ({
@@ -190,24 +189,9 @@ function transformToObject(model, roster) {
         })),
         offensivePreferenceSets: model.offensive_preference_sets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         }))),
-        // LENIENT: keep only serve shares keyed by a current libero-replacement (flat or per-set) with a value in the
-        // 0-100 band, so a stale key (a released player, or a libero-replacement config change) can never fail schema
-        // validation and crash a team load; a dropped key = no serve share.
-        serveAttackShares: (() => {
-            const liberoReplacementIds = new Set([
-                ...model.libero_replacements,
-                ...(model.libero_replacement_sets ?? []).flat()
-            ]);
-            const healed = {};
-            for (const [id, value] of Object.entries(model.serve_attack_shares ?? {})) {
-                if (liberoReplacementIds.has(id) && typeof value === 'number' && value >= 0 && value <= 100)
-                    healed[id] = value;
-            }
-            return healed;
-        })(),
         basePositions: model.base_positions ?? undefined,
         blockingPreferences: (model.blocking_preferences ?? []).map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock })),
         blockingPreferenceSets: model.blocking_preference_sets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock }))),
@@ -354,21 +338,6 @@ function tacticsColumnsToApiDto(model) {
         offensivePreferences: model.offensive_preferences,
         systemSets: model.system_sets,
         offensivePreferenceSets: model.offensive_preference_sets,
-        // Same stale-data policy as the heals below: only serve shares keyed by a current libero-replacement (flat or
-        // per-set) with a value in the 0-100 band survive; an empty map surfaces as absent so the UI never reloads and
-        // re-emits a stale key.
-        serveAttackShares: (() => {
-            const liberoReplacementIds = new Set([
-                ...model.libero_replacements,
-                ...(model.libero_replacement_sets ?? []).flat()
-            ]);
-            const healed = {};
-            for (const [id, value] of Object.entries(model.serve_attack_shares ?? {})) {
-                if (liberoReplacementIds.has(id) && typeof value === 'number' && value >= 0 && value <= 100)
-                    healed[id] = value;
-            }
-            return Object.keys(healed).length > 0 ? healed : undefined;
-        })(),
         basePositions: model.base_positions ?? undefined,
         blockingPreferences: model.blocking_preferences,
         blockingPreferenceSets: model.blocking_preference_sets,
@@ -477,7 +446,6 @@ function apiTacticsConfigToAttributes(config, teamId) {
         offensive_preferences: config.offensivePreferences,
         system_sets: config.systemSets,
         offensive_preference_sets: config.offensivePreferenceSets,
-        serve_attack_shares: config.serveAttackShares ?? {},
         base_positions: config.basePositions,
         blocking_preferences: config.blockingPreferences ?? [],
         blocking_preference_sets: config.blockingPreferenceSets,

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

@@ -26,7 +26,7 @@ function makeTactics(designatedSubs) {
         libero_replacement_sets: undefined,
         rotation_system: '5-1',
         designated_setters: ['lf'],
-        offensive_preferences: [{ rotation: 1, weights: { lf: 60, rf: 40 } }],
+        offensive_preferences: [{ rotation: 1, priorities: { lf: 'HIGH', rf: 'MID' } }],
         blocking_preferences: []
     };
 }
@@ -38,7 +38,7 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(dto.rotationSystem).toBe('5-1');
         (0, globals_1.expect)(dto.liberoReplacements).toEqual(['lf']);
         (0, globals_1.expect)(dto.lineup.bench).toEqual(['b1', 'b2']);
-        (0, globals_1.expect)(dto.offensivePreferences).toEqual([{ rotation: 1, weights: { lf: 60, rf: 40 } }]);
+        (0, globals_1.expect)(dto.offensivePreferences).toEqual([{ rotation: 1, priorities: { lf: 'HIGH', rf: 'MID' } }]);
     });
     (0, globals_1.it)('converts a legacy isPinchServer entry to a unified pinch server (conditions kept, no mode)', () => {
         const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([
@@ -133,32 +133,16 @@ function makeTactics(designatedSubs) {
     (0, globals_1.it)('passes per-set tactics columns through to the API DTO shape', () => {
         const model = makeTactics([]);
         model.system_sets = [{ rotationSystem: service_1.RotationSystemEnum.FIVE_ONE, designatedSetters: ['lf'] }];
-        model.offensive_preference_sets = [[{ rotation: 1, weights: { rf: 55, mf: 45 } }]];
+        model.offensive_preference_sets = [[{ rotation: 1, priorities: { rf: 'HIGH', mf: 'MID' } }]];
         const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
         (0, globals_1.expect)(dto.systemSets).toEqual([{ rotationSystem: '5-1', designatedSetters: ['lf'] }]);
-        (0, globals_1.expect)(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, weights: { rf: 55, mf: 45 } }]]);
+        (0, globals_1.expect)(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, priorities: { rf: 'HIGH', mf: 'MID' } }]]);
     });
     (0, globals_1.it)('leaves the per-set DTO fields undefined when the columns are absent', () => {
         const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([]));
         (0, globals_1.expect)(dto.systemSets).toBeUndefined();
         (0, globals_1.expect)(dto.offensivePreferenceSets).toBeUndefined();
     });
-    (0, globals_1.it)('surfaces serve attack shares keyed by a libero replacement', () => {
-        const model = makeTactics([]);
-        model.serve_attack_shares = { lf: 30 }; // lf is the configured libero_replacement
-        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
-        (0, globals_1.expect)(dto.serveAttackShares).toEqual({ lf: 30 });
-    });
-    (0, globals_1.it)('drops a serve attack share keyed by a non-libero-replacement (stale heal)', () => {
-        const model = makeTactics([]);
-        model.serve_attack_shares = { lf: 30, rf: 40 }; // rf is not in libero_replacements (['lf'])
-        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
-        (0, globals_1.expect)(dto.serveAttackShares).toEqual({ lf: 30 });
-    });
-    (0, globals_1.it)('leaves serveAttackShares undefined when the column is empty', () => {
-        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([]));
-        (0, globals_1.expect)(dto.serveAttackShares).toBeUndefined();
-    });
 });
 (0, globals_1.describe)('per-set tactics — service <-> row round-trip', () => {
     const country = (0, test_helpers_1.makeCountry)();
@@ -176,7 +160,7 @@ function makeTactics(designatedSubs) {
             { rotationSystem: service_1.RotationSystemEnum.FIVE_ONE, designatedSetters: [p1] },
             { rotationSystem: service_1.RotationSystemEnum.SIX_ZERO, designatedSetters: [] }
         ],
-        offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]
+        offensivePreferenceSets: [[{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }]]
     });
     (0, globals_1.it)('transformFromTactics writes the per-set overrides as id-based jsonb columns', () => {
         const attrs = (0, tactics_1.transformFromTactics)(tactics, 'team-1');
@@ -184,7 +168,7 @@ function makeTactics(designatedSubs) {
             { rotationSystem: '5-1', designatedSetters: [p1.id] },
             { rotationSystem: '6-0', designatedSetters: [] }
         ]);
-        (0, globals_1.expect)(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]);
+        (0, globals_1.expect)(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }]]);
     });
     (0, globals_1.it)('transformToTactics resolves the stored ids back to roster players', () => {
         const attrs = (0, tactics_1.transformFromTactics)(tactics, 'team-1');
@@ -192,7 +176,7 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(back.systemSets?.[0].rotationSystem).toBe(service_1.RotationSystemEnum.FIVE_ONE);
         (0, globals_1.expect)(back.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
         (0, globals_1.expect)(back.systemSets?.[1].designatedSetters).toEqual([]);
-        (0, globals_1.expect)(back.offensivePreferenceSets?.[0][0].weights).toEqual({ [p2.id]: 60, [p3.id]: 40 });
+        (0, globals_1.expect)(back.offensivePreferenceSets?.[0][0].priorities).toEqual({ [p2.id]: 'HIGH', [p3.id]: 'MID' });
     });
     (0, globals_1.it)('omits the per-set columns entirely for an all-sets config', () => {
         const flat = service_1.Tactics.create({
@@ -206,27 +190,6 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(back.systemSets).toBeUndefined();
         (0, globals_1.expect)(back.offensivePreferenceSets).toBeUndefined();
     });
-    (0, globals_1.it)('round-trips serve attack shares keyed by a libero replacement', () => {
-        const withServe = service_1.Tactics.create({
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            serveAttackShares: { [p5.id]: 35 }
-        });
-        const attrs = (0, tactics_1.transformFromTactics)(withServe, 'team-1');
-        (0, globals_1.expect)(attrs.serve_attack_shares).toEqual({ [p5.id]: 35 });
-        const back = (0, tactics_1.transformToTactics)(attrs, roster);
-        (0, globals_1.expect)(back.serveAttackShares).toEqual({ [p5.id]: 35 });
-    });
-    (0, globals_1.it)('drops a stale serve attack share key on load (lenient heal, no crash)', () => {
-        const attrs = (0, tactics_1.transformFromTactics)(service_1.Tactics.create({
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            serveAttackShares: { [p5.id]: 35 }
-        }), 'team-1');
-        attrs.libero_replacements = [];
-        const back = (0, tactics_1.transformToTactics)(attrs, roster);
-        (0, globals_1.expect)(back.serveAttackShares).toEqual({});
-    });
     (0, globals_1.it)('round-trips base positions (coords + reception participation)', () => {
         const config = {
             coords: { RECEIVE: { 1: { 5: { d: 5.5, r: -3 }, 6: { d: 6.5, r: 0 } } }, DEFENCE: { 3: { 2: { d: 0.9, r: 3 } } } },
@@ -255,11 +218,11 @@ function makeTactics(designatedSubs) {
         const withTempos = service_1.Tactics.create({
             lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
             liberoReplacements: [],
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
         });
         const attrs = (0, tactics_1.transformFromTactics)(withTempos, 'team-1');
         (0, globals_1.expect)(attrs.offensive_preferences).toEqual([
-            { rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }
+            { rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }
         ]);
         const back = (0, tactics_1.transformToTactics)(attrs, roster);
         (0, globals_1.expect)(back.offensivePreferences[0].tempos).toEqual({ [p2.id]: 'FAST', [p3.id]: 'HIGH' });

package/dist/cjs/src/service/team/attack-priority.d.ts

@@ -0,0 +1,3 @@
+export type AttackPriority = 'HIGH' | 'MID' | 'LOW' | 'NONE';
+export declare const ATTACK_PRIORITIES: readonly AttackPriority[];
+export declare const PRIORITY_WEIGHT: Record<AttackPriority, number>;

package/dist/cjs/src/service/team/attack-priority.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PRIORITY_WEIGHT = exports.ATTACK_PRIORITIES = void 0;
+exports.ATTACK_PRIORITIES = ['HIGH', 'MID', 'LOW', 'NONE'];
+// The relative pull of each priority. Tunable in one place; the engine reads these to weight the setter's target.
+exports.PRIORITY_WEIGHT = {
+    HIGH: 20,
+    MID: 10,
+    LOW: 5,
+    NONE: 0
+};

package/dist/cjs/src/service/team/base-config.d.ts

@@ -7,5 +7,7 @@ export interface BaseCoord {
 export interface BaseConfig {
     readonly coords: Record<string, Record<string, Record<string, BaseCoord>>>;
     readonly receive: Record<string, Record<string, boolean>>;
+    readonly receiveByPlayer?: Record<string, Record<string, boolean>>;
     readonly blocking?: Record<string, Record<string, Record<string, boolean>>>;
+    readonly attackContact?: Record<string, Record<string, BaseCoord>>;
 }

package/dist/cjs/src/service/team/default-base-config.js

@@ -88,11 +88,40 @@ const COORDS = {
         6: { 1: { d: 5.35, r: 2.35 }, 2: { d: 2.05, r: 2.1 }, 3: { d: 0.8, r: 4 }, 4: { d: 2.1, r: -1.95 }, 5: { d: 4.9, r: -1.4 }, 6: { d: 0.4, r: 1.3 } }
     }
 };
+// Per-attacker attack subbases (owner 2026-08-12): the point-of-attack ATK_L/M/R coverage shapes are replaced by ONE
+// subbase per attacker, keyed by the attacker's ZONE (ATK_Z1..ATK_Z6). Each is the whole-team formation used when the
+// attacker at that zone gets the ball. A FRONT-row zone (2/3/4) reuses its lane's old ATK_L/M/R shape, where the lane
+// is ranked by that zone's ATTACK-base lateral this rotation (leftmost r -> ATK_L, middle -> ATK_M, rightmost -> ATK_R);
+// a BACK-row zone (1/5/6) replicates the ATTACK base. Derived from COORDS so the code default and the migration agree.
+// The old ATK_L/M/R stay in COORDS as the derivation SOURCE but are NOT exposed in the default (below).
+const FRONT_ZONES = [2, 3, 4];
+const BACK_ZONES = [1, 5, 6];
+function defaultAttackSubbases() {
+    const cloneFormation = (zones) => {
+        const out = {};
+        for (const [zone, c] of Object.entries(zones))
+            out[zone] = { d: c.d, r: c.r };
+        return out;
+    };
+    const out = { ATK_Z1: {}, ATK_Z2: {}, ATK_Z3: {}, ATK_Z4: {}, ATK_Z5: {}, ATK_Z6: {} };
+    for (let rot = 1; rot <= 6; rot++) {
+        const ranked = [...FRONT_ZONES].sort((a, b) => COORDS.ATTACK[rot][a].r - COORDS.ATTACK[rot][b].r);
+        const laneFor = { [ranked[0]]: 'ATK_L', [ranked[1]]: 'ATK_M', [ranked[2]]: 'ATK_R' };
+        for (const z of FRONT_ZONES)
+            out['ATK_Z' + String(z)][String(rot)] = cloneFormation(COORDS[laneFor[z]][rot]);
+        for (const z of BACK_ZONES)
+            out['ATK_Z' + String(z)][String(rot)] = cloneFormation(COORDS.ATTACK[rot]);
+    }
+    return out;
+}
 // The default coordinate table as a BaseConfig.coords (jsonb string keys). Shared, readonly; materialized (and so
-// serialized) per team on save, so sharing the reference in memory is safe.
+// serialized) per team on save, so sharing the reference in memory is safe. ATK_L/M/R are dropped from the exposed
+// default (replaced by ATK_Z<n>); everything else is copied verbatim from COORDS.
 const DEFAULT_COORDS = (() => {
     const out = {};
     for (const [formation, rotations] of Object.entries(COORDS)) {
+        if (formation === 'ATK_L' || formation === 'ATK_M' || formation === 'ATK_R')
+            continue; // replaced by ATK_Z<n>
         out[formation] = {};
         for (const [rotation, zones] of Object.entries(rotations)) {
             out[formation][rotation] = {};
@@ -100,8 +129,35 @@ const DEFAULT_COORDS = (() => {
                 out[formation][rotation][zone] = { d: coord.d, r: coord.r };
         }
     }
-    return out;
+    return { ...out, ...defaultAttackSubbases() };
 })();
+// The default desired-contact per attacker (trajectory-set, owner 2026-08-12 decision D9): a near-net hitting point
+// in each attacker's lane, NOT the old "set to the standing dot" location. `contact.d` = a near-net depth for the
+// front row or the pipe depth for the back row; `contact.r` = the attacker's ATTACK-dot lateral clamped to the
+// antenna. Keyed [rotation][zone] -> {d,r}. The near-net depth + antenna are first-cut calibration knobs. The sim
+// does not read this yet (added with the engine phase); storing it here is inert. See plans/trajectory-set-and-approach.md.
+const NEAR_NET_CONTACT_DEPTH = 0.5; // front-row contact, m off the net
+const PIPE_CONTACT_DEPTH = 1.8; // back-row (pipe) contact, m off the net (matches the sim's BACKROW_SET_DEPTH)
+const CONTACT_ANTENNA = 4.3; // keep the contact just inside the sideline / antenna
+// LAZY + memoized (not an eager IIFE): `isBackRow` lives in the match module, which sits in a load cycle with the
+// team barrel, so calling it at module-load time hits an uninitialised import. Computed once on first use, then the
+// shared readonly reference is reused (like DEFAULT_COORDS; serialized per team on save, so sharing is safe).
+let cachedAttackContact;
+function defaultAttackContact() {
+    if (cachedAttackContact != null)
+        return cachedAttackContact;
+    const out = {};
+    for (const [rotation, zones] of Object.entries(COORDS.ATTACK)) {
+        out[rotation] = {};
+        for (const [zone, coord] of Object.entries(zones)) {
+            const backRow = (0, match_1.isBackRow)(Number(zone));
+            const r = Math.max(-CONTACT_ANTENNA, Math.min(CONTACT_ANTENNA, coord.r));
+            out[rotation][zone] = { d: backRow ? PIPE_CONTACT_DEPTH : NEAR_NET_CONTACT_DEPTH, r };
+        }
+    }
+    cachedAttackContact = out;
+    return out;
+}
 // The owner's corrected per-point-of-attack block map for the 5-1 (exported 2026-08-09), keyed
 // [DEF_L|DEF_M|DEF_R][rotation][zone] -> canBlock. `false` = that front-row zone sits OUT of the block for an attack
 // from that side; `true` = reads/joins the wall. Only the front-row zones in play for the rotation are tagged. Same
@@ -167,5 +223,5 @@ function defaultReceiveMap(system) {
 // 5-1 uses the owner's exported receive map, the other systems derive their receive map per system.
 function defaultBaseConfig(system) {
     const receive = system === rotation_system_1.RotationSystemEnum.FIVE_ONE ? DEFAULT_5_1_RECEIVE : defaultReceiveMap(system);
-    return { coords: DEFAULT_COORDS, receive, blocking: DEFAULT_BLOCKING };
+    return { coords: DEFAULT_COORDS, receive, blocking: DEFAULT_BLOCKING, attackContact: defaultAttackContact() };
 }

package/dist/cjs/src/service/team/default-base-config.test.d.ts

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

package/dist/cjs/src/service/team/default-base-config.test.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const rotation_system_1 = require("./rotation-system");
+const default_base_config_1 = require("./default-base-config");
+// Back-row rotational zones (right/left/middle back). Front row is {2,3,4}.
+const BACK_ROW = new Set([1, 5, 6]);
+// The trajectory-set default desired-contact (owner D9, 2026-08-12): a near-net hitting point in each attacker's
+// lane, NOT the old set-to-the-standing-dot location. Front row contacts sit ~0.5 m off the net; back row on the
+// ~1.8 m pipe line; the lateral is the ATTACK-dot's r clamped inside the antenna (|r| <= 4.3).
+describe('defaultBaseConfig attackContact (trajectory-set default)', () => {
+    const cfg = (0, default_base_config_1.defaultBaseConfig)(rotation_system_1.RotationSystemEnum.FIVE_ONE);
+    it('provides a finite desired contact for every rotation and zone', () => {
+        expect(cfg.attackContact).toBeDefined();
+        for (let rot = 1; rot <= 6; rot++) {
+            for (let zone = 1; zone <= 6; zone++) {
+                const c = cfg.attackContact?.[String(rot)]?.[String(zone)];
+                expect(c).toBeDefined();
+                expect(Number.isFinite(c?.d)).toBe(true);
+                expect(Number.isFinite(c?.r)).toBe(true);
+            }
+        }
+    });
+    it('places front-row contacts near the net (0.5 m) and back-row on the pipe line (1.8 m)', () => {
+        for (let rot = 1; rot <= 6; rot++) {
+            for (let zone = 1; zone <= 6; zone++) {
+                const c = cfg.attackContact?.[String(rot)]?.[String(zone)];
+                expect(c.d).toBeCloseTo(BACK_ROW.has(zone) ? 1.8 : 0.5);
+            }
+        }
+    });
+    it('clamps every contact inside the antenna (|r| <= 4.3), even for a wide-pin attack dot', () => {
+        for (let rot = 1; rot <= 6; rot++) {
+            for (let zone = 1; zone <= 6; zone++) {
+                const c = cfg.attackContact?.[String(rot)]?.[String(zone)];
+                expect(Math.abs(c.r)).toBeLessThanOrEqual(4.3 + 1e-9);
+            }
+        }
+    });
+    it('keeps the contact on the attacker approach-lane side (rotation 1 OH wide dot r=5 -> +4.3)', () => {
+        const c = cfg.attackContact?.['1']?.['4'];
+        expect(c.d).toBeCloseTo(0.5); // front row, near the net
+        expect(c.r).toBeCloseTo(4.3); // clamped from the OH's wide ATTACK dot (r=5), same (positive) side
+    });
+});

package/dist/cjs/src/service/team/index.d.ts

@@ -3,6 +3,7 @@ export * from './team-generator';
 export * from './formation';
 export * from './tactics';
 export * from './base-config';
+export * from './attack-priority';
 export * from './default-base-config';
 export * from './receive-overlap';
 export * from './team-name';

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

@@ -19,6 +19,7 @@ __exportStar(require("./team-generator"), exports);
 __exportStar(require("./formation"), exports);
 __exportStar(require("./tactics"), exports);
 __exportStar(require("./base-config"), exports);
+__exportStar(require("./attack-priority"), exports);
 __exportStar(require("./default-base-config"), exports);
 __exportStar(require("./receive-overlap"), exports);
 __exportStar(require("./team-name"), exports);

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

@@ -1,6 +1,7 @@
+import { AttackPriority } from './attack-priority';
 export type TempoPreference = 'FAST' | 'HIGH';
 export interface OffensivePreference {
     readonly rotation: number;
-    readonly weights: Record<string, number>;
+    readonly priorities: Record<string, AttackPriority>;
     readonly tempos?: Record<string, TempoPreference>;
 }

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

@@ -261,23 +261,32 @@ export declare const TacticsInputSchema: z.ZodObject<{
     designatedSetters: z.ZodDefault<z.ZodArray<z.ZodCustom<Player, Player>>>;
     offensivePreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
         rotation: z.ZodNumber;
-        weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
+        priorities: z.ZodRecord<z.ZodString, z.ZodEnum<{
+            HIGH: "HIGH";
+            MID: "MID";
+            LOW: "LOW";
+            NONE: "NONE";
+        }>>;
         tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-            FAST: "FAST";
             HIGH: "HIGH";
+            FAST: "FAST";
         }>>>;
     }, z.core.$strip>>>;
-    serveAttackShares: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodNumber>>;
     systemSets: z.ZodOptional<z.ZodArray<z.ZodObject<{
         rotationSystem: z.ZodEnum<typeof RotationSystemEnum>;
         designatedSetters: z.ZodArray<z.ZodCustom<Player, Player>>;
     }, z.core.$strip>>>;
     offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
         rotation: z.ZodNumber;
-        weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
+        priorities: z.ZodRecord<z.ZodString, z.ZodEnum<{
+            HIGH: "HIGH";
+            MID: "MID";
+            LOW: "LOW";
+            NONE: "NONE";
+        }>>;
         tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-            FAST: "FAST";
             HIGH: "HIGH";
+            FAST: "FAST";
         }>>>;
     }, z.core.$strip>>>>;
     blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -304,7 +313,12 @@ export declare const TacticsInputSchema: z.ZodObject<{
             r: z.ZodNumber;
         }, z.core.$strip>>>>;
         receive: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>;
+        receiveByPlayer: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>>;
         blocking: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>>>;
+        attackContact: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodObject<{
+            d: z.ZodNumber;
+            r: z.ZodNumber;
+        }, z.core.$strip>>>>;
     }, z.core.$strip>>;
     replaceKnockedImmediately: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
     injuryReplacements: z.ZodDefault<z.ZodArray<z.ZodObject<{