Align hosted matchup scoring with slate

src/matchups.js

@@ -105,6 +105,8 @@ const SLATE_COLUMNS = [
   'game_pk',
   'away_team',
   'home_team',
+  'away_probable_pitcher_id',
+  'home_probable_pitcher_id',
   'away_probable_pitcher',
   'home_probable_pitcher',
   'away_probable_hand',
@@ -188,11 +190,16 @@ const PITCHER_ROLLING_COLUMNS = [
 ];
 
 const BATTER_ZONE_COLUMNS = [
+  'batter_id',
+  'pitcher_hand_key',
   'batter',
   'player_id',
   'hitter_name',
+  'pitch_type',
   'zone_label',
   'zone',
+  'hit_rate',
+  'hr_rate',
   'xwoba',
   'hard_hit_pct',
   'barrel_bip_pct',
@@ -204,8 +211,11 @@ const PITCHER_ZONE_COLUMNS = [
   'pitcher_id',
   'player_id',
   'pitcher_name',
+  'batter_side_key',
+  'pitch_type',
   'zone_label',
   'zone',
+  'usage_rate',
   'xwoba_allowed',
   'hard_hit_pct_allowed',
   'barrel_bip_pct_allowed',
@@ -353,6 +363,266 @@ function sortPitchers(rows) {
   );
 }
 
+function normalizeSeries(values, inverse = false) {
+  const numerics = values.map((value) => numberOrNull(value));
+  const finite = numerics.filter((value) => value !== null);
+  if (!finite.length) {
+    return values.map(() => 0.5);
+  }
+
+  const min = Math.min(...finite);
+  const max = Math.max(...finite);
+  const normalized = numerics.map((value) => {
+    if (value === null || Math.abs(max - min) < 1e-9) {
+      return 0.5;
+    }
+    return (value - min) / (max - min);
+  });
+
+  return normalized.map((value) => inverse ? 1 - value : value);
+}
+
+function launchAngleBandScore(value, low = 20, ideal = 27.5, high = 35) {
+  const numeric = numberOrNull(value);
+  if (numeric === null) {
+    return 0.5;
+  }
+  if (numeric >= low && numeric <= high) {
+    if (numeric <= ideal) {
+      return 0.8 + 0.2 * ((numeric - low) / Math.max(ideal - low, 1e-9));
+    }
+    return 0.8 + 0.2 * ((high - numeric) / Math.max(high - ideal, 1e-9));
+  }
+  if (numeric < low) {
+    return Math.max(0, 0.8 - ((low - numeric) / Math.max(low, 1e-9)) * 0.8);
+  }
+  return Math.max(0, 0.8 - ((numeric - high) / Math.max(high, 1e-9)) * 0.8);
+}
+
+function weightedAverage(pairs) {
+  const valid = pairs.filter(({ value, weight }) => value !== null && weight !== null && weight > 0);
+  if (!valid.length) {
+    return null;
+  }
+  const totalWeight = valid.reduce((sum, item) => sum + item.weight, 0);
+  if (totalWeight <= 0) {
+    return null;
+  }
+  return valid.reduce((sum, item) => sum + (item.value * item.weight), 0) / totalWeight;
+}
+
+function aggregateBatterZoneMap(rows) {
+  if (!rows.length) {
+    return [];
+  }
+
+  const grouped = new Map();
+  for (const row of rows) {
+    const zone = numberOrNull(row.zone);
+    if (zone === null) {
+      continue;
+    }
+    const key = String(Math.trunc(zone));
+    const bucket = grouped.get(key) ?? [];
+    bucket.push(row);
+    grouped.set(key, bucket);
+  }
+
+  const output = [];
+  for (const [key, group] of grouped.entries()) {
+    const zone = Number(key);
+    const zoneValue = (
+      (weightedAverage(group.map((row) => ({ value: numberOrNull(row.hit_rate), weight: numberOrNull(row.sample_size) }))) ?? 0) * 0.6
+      + (weightedAverage(group.map((row) => ({ value: numberOrNull(row.hr_rate), weight: numberOrNull(row.sample_size) }))) ?? 0) * 0.4
+    );
+    output.push({
+      zone,
+      sample_size: group.reduce((sum, row) => sum + (numberOrNull(row.sample_size) ?? 0), 0),
+      zone_value: zoneValue,
+    });
+  }
+
+  return output;
+}
+
+function aggregatePitcherZoneMap(rows) {
+  if (!rows.length) {
+    return [];
+  }
+
+  const grouped = new Map();
+  for (const row of rows) {
+    const zone = numberOrNull(row.zone);
+    if (zone === null) {
+      continue;
+    }
+    const key = String(Math.trunc(zone));
+    const bucket = grouped.get(key) ?? [];
+    bucket.push(row);
+    grouped.set(key, bucket);
+  }
+
+  const output = [];
+  for (const [key, group] of grouped.entries()) {
+    const zone = Number(key);
+    output.push({
+      zone,
+      sample_size: group.reduce((sum, row) => sum + (numberOrNull(row.sample_size) ?? 0), 0),
+      zone_value: group.reduce((sum, row) => sum + (numberOrNull(row.usage_rate) ?? 0), 0),
+    });
+  }
+
+  return output;
+}
+
+function buildZoneOverlayMap(batterMap, pitcherMap) {
+  if (!batterMap.length || !pitcherMap.length) {
+    return [];
+  }
+
+  const pitcherByZone = new Map(pitcherMap.map((row) => [row.zone, row]));
+  const merged = batterMap
+    .filter((row) => pitcherByZone.has(row.zone))
+    .map((row) => ({
+      zone: row.zone,
+      sample_size: Math.min(row.sample_size ?? 0, pitcherByZone.get(row.zone)?.sample_size ?? 0),
+      batter_zone_value: row.zone_value,
+      pitcher_zone_value: pitcherByZone.get(row.zone)?.zone_value ?? null,
+    }));
+
+  if (!merged.length) {
+    return [];
+  }
+
+  const batterScale = normalizeSeries(merged.map((row) => row.batter_zone_value));
+  const pitcherScale = normalizeSeries(merged.map((row) => row.pitcher_zone_value));
+  return merged.map((row, index) => ({
+    zone: row.zone,
+    sample_size: row.sample_size,
+    zone_value: batterScale[index] * pitcherScale[index],
+  }));
+}
+
+function overlayZoneFitScore(batterMap, pitcherMap) {
+  const overlay = buildZoneOverlayMap(batterMap, pitcherMap);
+  if (!overlay.length) {
+    return 0.5;
+  }
+  const sampleSum = overlay.reduce((sum, row) => sum + (numberOrNull(row.sample_size) ?? 0), 0);
+  if (sampleSum < 15) {
+    return 0.5;
+  }
+  const score = weightedAverage(overlay.map((row) => ({ value: numberOrNull(row.zone_value), weight: numberOrNull(row.sample_size) })));
+  if (score === null) {
+    return 0.5;
+  }
+  return Math.max(0, Math.min(1, score));
+}
+
+function selectBatterZoneRows(rows, batterId, opposingPitcherHand) {
+  const hitterRows = rows.filter((row) => String(row.batter_id ?? row.batter ?? '') === String(batterId));
+  if (!hitterRows.length) {
+    return [];
+  }
+  const handKey = opposingPitcherHand === 'R' ? 'vs_rhp' : opposingPitcherHand === 'L' ? 'vs_lhp' : 'overall';
+  const specific = hitterRows.filter((row) => String(row.pitcher_hand_key ?? '') === handKey);
+  if (specific.length) {
+    return specific;
+  }
+  const overall = hitterRows.filter((row) => String(row.pitcher_hand_key ?? '') === 'overall');
+  return overall.length ? overall : hitterRows;
+}
+
+function selectPitcherZoneRows(rows, pitcherId, hitterSide) {
+  const pitcherRows = rows.filter((row) => String(row.pitcher_id ?? '') === String(pitcherId));
+  if (!pitcherRows.length) {
+    return [];
+  }
+  const sideKey = hitterSide === 'L' ? 'vs_lhh' : hitterSide === 'R' ? 'vs_rhh' : 'overall';
+  const specific = pitcherRows.filter((row) => String(row.batter_side_key ?? '') === sideKey);
+  if (specific.length) {
+    return specific;
+  }
+  const overall = pitcherRows.filter((row) => String(row.batter_side_key ?? '') === 'overall');
+  return overall.length ? overall : pitcherRows;
+}
+
+function buildZoneFitScores(rows, batterZoneRows, pitcherZoneRows) {
+  const pitcherCache = new Map();
+  const batterCache = new Map();
+
+  return rows.map((row) => {
+    const batterId = String(row.batter ?? row.player_id ?? '');
+    const pitcherId = String(row.opposing_pitcher_id ?? '');
+    if (!batterId || !pitcherId) {
+      return 0.5;
+    }
+
+    const batterKey = `${batterId}|${row.opposing_pitcher_hand ?? 'overall'}`;
+    const pitcherKey = `${pitcherId}|${row.stand ?? 'overall'}`;
+
+    if (!batterCache.has(batterKey)) {
+      batterCache.set(batterKey, aggregateBatterZoneMap(selectBatterZoneRows(batterZoneRows, batterId, row.opposing_pitcher_hand)));
+    }
+    if (!pitcherCache.has(pitcherKey)) {
+      pitcherCache.set(pitcherKey, aggregatePitcherZoneMap(selectPitcherZoneRows(pitcherZoneRows, pitcherId, row.stand)));
+    }
+
+    return overlayZoneFitScore(batterCache.get(batterKey) ?? [], pitcherCache.get(pitcherKey) ?? []);
+  });
+}
+
+function addHitterMatchupScore(rows, batterZoneRows, pitcherZoneRows) {
+  if (!rows.length) {
+    return [];
+  }
+
+  const zoneFitScores = buildZoneFitScores(rows, batterZoneRows, pitcherZoneRows);
+  const swstrScores = normalizeSeries(rows.map((row) => row.swstr_pct), true);
+  const barrelScores = normalizeSeries(rows.map((row) => row.barrel_bbe_pct));
+  const sweetSpotScores = normalizeSeries(rows.map((row) => row.sweet_spot_pct));
+  const barrelSupportScores = normalizeSeries(rows.map((row) => row.barrel_bbe_pct));
+  const shapeScores = rows.map((row, index) => (
+    (launchAngleBandScore(row.avg_launch_angle, 12, 22, 32) * 0.55)
+    + (sweetSpotScores[index] * 0.35)
+    + (barrelSupportScores[index] * 0.10)
+  ));
+  const pulledBarrelScales = normalizeSeries(rows.map((row) => row.pulled_barrel_pct));
+
+  const matchupScored = rows.map((row, index) => {
+    const baseScore = ((swstrScores[index] * 0.35) + (barrelScores[index] * 0.30) + (shapeScores[index] * 0.20) + (zoneFitScores[index] * 0.15)) * 100;
+    const pulledBarrelBonus = Math.max(0, (pulledBarrelScales[index] - 0.5) / 0.5) * 0.08;
+    const matchupScore = Math.max(0, Math.min(100, baseScore * (1 + pulledBarrelBonus)));
+    return {
+      ...row,
+      zone_fit_score: zoneFitScores[index],
+      matchup_score: matchupScore,
+      _shape_score: shapeScores[index],
+      _pulled_barrel_scale: pulledBarrelScales[index],
+    };
+  });
+
+  const matchupNorm = normalizeSeries(matchupScored.map((row) => row.matchup_score));
+  const barrelBipNorm = normalizeSeries(matchupScored.map((row) => row.barrel_bip_pct));
+  const hhNorm = normalizeSeries(matchupScored.map((row) => row.hard_hit_pct));
+
+  return sortHitters(matchupScored.map((row, index) => ({
+    ...row,
+    ceiling_score: Math.max(0, Math.min(100,
+      (
+        (matchupNorm[index] * 0.35)
+        + ((row._pulled_barrel_scale ?? 0.5) * 0.30)
+        + (barrelBipNorm[index] * 0.20)
+        + ((row._shape_score ?? 0.5) * 0.10)
+        + (hhNorm[index] * 0.05)
+      ) * 100
+    )),
+  }))).map((row) => {
+    const { _shape_score, _pulled_barrel_scale, ...clean } = row;
+    return clean;
+  });
+}
+
 function buildBestMatchupBoardRows(rows) {
   if (!rows?.length) {
     return [];
@@ -400,12 +670,14 @@ function mapSlateTeams(slateRows) {
     lookup.set(awayTeam, {
       gamePk: row.game_pk ?? null,
       opponentTeam: homeTeam,
+      opposingPitcherId: row.home_probable_pitcher_id ?? null,
       opposingPitcherName: row.home_probable_pitcher ?? null,
       opposingPitcherHand: row.home_probable_hand ?? null,
     });
     lookup.set(homeTeam, {
       gamePk: row.game_pk ?? null,
       opponentTeam: awayTeam,
+      opposingPitcherId: row.away_probable_pitcher_id ?? null,
       opposingPitcherName: row.away_probable_pitcher ?? null,
       opposingPitcherHand: row.away_probable_hand ?? null,
     });
@@ -478,6 +750,7 @@ function withDefaults(row, slateLookup, options = {}) {
       : row.pitcher_name,
     game_pk: row.game_pk ?? slate.gamePk ?? null,
     opponent_team: row.opponent_team ?? slate.opponentTeam ?? null,
+    opposing_pitcher_id: row.opposing_pitcher_id ?? slate.opposingPitcherId ?? null,
     opposing_pitcher_name: row.opposing_pitcher_name ?? slate.opposingPitcherName ?? null,
     opposing_pitcher_hand: row.opposing_pitcher_hand ?? slate.opposingPitcherHand ?? null,
   };
@@ -680,13 +953,64 @@ export class HostedArtifactSource {
   }
 
   async getBestMatchups(options = {}) {
-    const result = await this.getTopHitters({
-      ...options,
-      limit: limitOrDefault(options.limit ?? (options.team ? 3 : 12), 12),
-    });
+    const targetDate = parseDateOrToday(options.date);
+    const resolvedDate = await this.getLatestAvailableDate(targetDate);
+    if (!resolvedDate) {
+      throw new Error('No hosted matchup slate was available in the fallback window.');
+    }
+
+    const [slateRows, hitterRows, exclusionRows, rosterRows, batterZoneRows, pitcherZoneRows] = await Promise.all([
+      this.readDailyFile(resolvedDate, 'slate.parquet', SLATE_COLUMNS),
+      this.readDailyFile(resolvedDate, 'daily_hitter_metrics.parquet', HITTER_COLUMNS),
+      this.readDailyFile(resolvedDate, 'hitter_pitcher_exclusions.parquet', EXCLUSION_COLUMNS).catch(() => []),
+      this.readDailyFile(resolvedDate, 'rosters.parquet', ROSTER_COLUMNS).catch(() => []),
+      this.readDailyFile(resolvedDate, 'daily_batter_zone_profiles.parquet', BATTER_ZONE_COLUMNS).catch(() => []),
+      this.readDailyFile(resolvedDate, 'daily_pitcher_zone_profiles.parquet', PITCHER_ZONE_COLUMNS).catch(() => []),
+    ]);
+
+    const slateLookup = mapSlateTeams(slateRows);
+    const exclusionSet = buildExclusionSet(exclusionRows);
+    const rosterLookup = buildRosterLookup(rosterRows);
+    const rosterIdsByTeam = new Map();
+    for (const row of rosterRows) {
+      const team = normalizeTeam(row.team);
+      const playerId = String(row.player_id ?? '').trim();
+      if (!team || !playerId) {
+        continue;
+      }
+      const bucket = rosterIdsByTeam.get(team) ?? new Set();
+      bucket.add(playerId);
+      rosterIdsByTeam.set(team, bucket);
+    }
+
+    const scoredRows = [];
+    for (const [team, slate] of slateLookup.entries()) {
+      if (!rowMatchesTeamFilter(team, options.team)) {
+        continue;
+      }
+
+      const splitKey = slate.opposingPitcherHand === 'R'
+        ? 'vs_rhp'
+        : slate.opposingPitcherHand === 'L'
+          ? 'vs_lhp'
+          : DEFAULT_SPLIT_KEY;
+      const rosterPlayerIds = rosterIdsByTeam.get(normalizeTeam(team)) ?? null;
+      const teamRows = hitterRows
+        .filter((row) => normalizeTeam(row.team) === normalizeTeam(team))
+        .filter((row) => String(row.split_key ?? '') === splitKey)
+        .filter((row) => String(row.recent_window ?? '') === DEFAULT_RECENT_WINDOW)
+        .filter((row) => String(row.weighted_mode ?? '') === DEFAULT_WEIGHTED_MODE)
+        .filter((row) => !rosterPlayerIds || rosterPlayerIds.has(String(row.batter ?? row.player_id ?? '')))
+        .filter((row) => !exclusionSet.has(String(row.batter ?? row.player_id ?? '')))
+        .map((row) => withDefaults(row, slateLookup, { rosterLookup, playerType: 'hitter' }));
+
+      scoredRows.push(...addHitterMatchupScore(teamRows, batterZoneRows, pitcherZoneRows));
+    }
+
     return {
-      ...result,
-      rows: buildBestMatchupBoardRows(result.rows).slice(0, limitOrDefault(options.limit ?? (options.team ? 3 : 12), 12)),
+      source: 'hosted',
+      resolvedDate,
+      rows: buildBestMatchupBoardRows(scoredRows).slice(0, limitOrDefault(options.limit ?? (options.team ? 3 : 12), 12)),
     };
   }
 
@@ -1132,7 +1456,7 @@ export class MatchupService {
     if (this.hosted?.isConfigured?.()) {
       try {
         const hostedResult = await this.hosted[methodName](options);
-        if (methodName === 'getTopHitters' || methodName === 'getBestMatchups') {
+        if (methodName === 'getTopHitters') {
           return await this.enrichHostedHitters(hostedResult, options, methodName);
         }
         return hostedResult;

test/matchups.test.js

@@ -83,7 +83,8 @@ test('hosted artifact source matches common team aliases against team abbreviati
         team: 'NYY',
         hitter_name: '592450',
         batter: 99,
-        split_key: 'overall',
+        stand: 'R',
+        split_key: 'vs_lhp',
         recent_window: 'season',
         weighted_mode: 'weighted',
         xwoba: 0.455,
@@ -103,6 +104,8 @@ test('hosted artifact source matches common team aliases against team abbreviati
         player_name: 'Aaron Judge',
       },
     ]],
+    ['https://example.test/daily/2026-04-07/daily_batter_zone_profiles.parquet', []],
+    ['https://example.test/daily/2026-04-07/daily_pitcher_zone_profiles.parquet', []],
   ]);
 
   const source = new HostedArtifactSource(
@@ -130,14 +133,100 @@ test('hosted artifact source matches common team aliases against team abbreviati
   assert.equal(result.rows[0].sweet_spot_pct, 36.8);
 });
 
-test('matchup service enriches hosted hitter rows with Cockroach scores and keeps team views to top three', async () => {
+test('hosted best matchups uses pitcher-hand split rows from hosted slate inputs', async () => {
+  const responses = new Map([
+    ['https://example.test/daily/2026-04-07/slate.parquet', [
+      {
+        game_pk: 20,
+        away_team: 'BOS',
+        home_team: 'MIL',
+        away_probable_pitcher_id: 501,
+        home_probable_pitcher_id: 601,
+        away_probable_pitcher: 'Garrett Crochet',
+        home_probable_pitcher: 'Freddy Peralta',
+        away_probable_hand: 'L',
+        home_probable_hand: 'R',
+      },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_hitter_metrics.parquet', [
+      {
+        team: 'MIL',
+        hitter_name: '123',
+        batter: 123,
+        stand: 'R',
+        split_key: 'overall',
+        recent_window: 'season',
+        weighted_mode: 'weighted',
+        xwoba: 0.200,
+        swstr_pct: 0.20,
+        barrel_bbe_pct: 0.01,
+        barrel_bip_pct: 0.01,
+        pulled_barrel_pct: 0.01,
+        sweet_spot_pct: 0.20,
+        fb_pct: 0.20,
+        hard_hit_pct: 0.20,
+        avg_launch_angle: 5,
+      },
+      {
+        team: 'MIL',
+        hitter_name: '123',
+        batter: 123,
+        stand: 'R',
+        split_key: 'vs_lhp',
+        recent_window: 'season',
+        weighted_mode: 'weighted',
+        xwoba: 0.380,
+        swstr_pct: 0.08,
+        barrel_bbe_pct: 0.16,
+        barrel_bip_pct: 0.14,
+        pulled_barrel_pct: 0.11,
+        sweet_spot_pct: 0.39,
+        fb_pct: 0.31,
+        hard_hit_pct: 0.49,
+        avg_launch_angle: 20,
+      },
+    ]],
+    ['https://example.test/daily/2026-04-07/hitter_pitcher_exclusions.parquet', []],
+    ['https://example.test/daily/2026-04-07/rosters.parquet', [
+      { team: 'MIL', player_id: 123, player_name: 'Gary Sanchez' },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_batter_zone_profiles.parquet', []],
+    ['https://example.test/daily/2026-04-07/daily_pitcher_zone_profiles.parquet', []],
+  ]);
+
+  const source = new HostedArtifactSource(
+    {
+      baseUrl: 'https://example.test',
+      cacheTtlMs: 60_000,
+      fallbackDays: 0,
+    },
+    {
+      readParquetImpl: async (url) => {
+        if (!responses.has(url)) {
+          throw new Error(`Missing ${url}`);
+        }
+        return responses.get(url);
+      },
+      logger: { debug() {}, warn() {} },
+    }
+  );
+
+  const result = await source.getBestMatchups({ date: '2026-04-07', team: 'Brewers' });
+
+  assert.equal(result.rows.length, 1);
+  assert.equal(result.rows[0].hitter_name, 'Gary Sanchez');
+  assert.equal(result.rows[0].opposing_pitcher_name, 'Garrett Crochet');
+  assert.equal(result.rows[0].matchup_score > 50, true);
+});
+
+test('matchup service enriches hosted top hitter rows from Cockroach snapshots', async () => {
   const teamArgs = [];
   const service = new MatchupService(
     { databaseUrl: 'postgresql://test', hosted: { baseUrl: 'https://example.test' } },
     {
       hosted: {
         isConfigured: () => true,
-        async getBestMatchups() {
+        async getTopHitters() {
           return {
             source: 'hosted',
             resolvedDate: '2026-04-07',
@@ -172,7 +261,7 @@ test('matchup service enriches hosted hitter rows with Cockroach scores and keep
     }
   );
 
-  const result = await service.getBestMatchups({ date: '2026-04-07', team: 'Yankees' });
+  const result = await service.getTopHitters({ date: '2026-04-07', team: 'Yankees', limit: 3 });
 
   assert.equal(result.rows.length, 3);
   assert.equal(teamArgs[0], 'Yankees');
@@ -181,46 +270,55 @@ test('matchup service enriches hosted hitter rows with Cockroach scores and keep
   assert.equal(result.rows[2].hitter_name, 'Paul Goldschmidt');
 });
 
-test('best matchups keeps only the top three hitters per game before ranking the slate board', async () => {
-  const service = new MatchupService(
-    { databaseUrl: 'postgresql://test', hosted: { baseUrl: 'https://example.test' } },
+test('hosted best matchups keeps only the top three hitters per game before ranking the slate board', async () => {
+  const responses = new Map([
+    ['https://example.test/daily/2026-04-07/slate.parquet', [
+      { game_pk: 1, away_team: 'NYY', home_team: 'ATH', away_probable_pitcher_id: 101, home_probable_pitcher_id: 201, away_probable_pitcher: 'Away One', home_probable_pitcher: 'Home One', away_probable_hand: 'R', home_probable_hand: 'L' },
+      { game_pk: 2, away_team: 'BOS', home_team: 'BAL', away_probable_pitcher_id: 301, home_probable_pitcher_id: 401, away_probable_pitcher: 'Away Two', home_probable_pitcher: 'Home Two', away_probable_hand: 'R', home_probable_hand: 'R' },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_hitter_metrics.parquet', [
+      { team: 'NYY', hitter_name: '11', batter: 11, stand: 'R', split_key: 'vs_lhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.410, swstr_pct: 0.08, barrel_bbe_pct: 0.20, barrel_bip_pct: 0.18, pulled_barrel_pct: 0.13, sweet_spot_pct: 0.40, fb_pct: 0.30, hard_hit_pct: 0.50, avg_launch_angle: 20 },
+      { team: 'ATH', hitter_name: '12', batter: 12, stand: 'R', split_key: 'vs_rhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.380, swstr_pct: 0.09, barrel_bbe_pct: 0.16, barrel_bip_pct: 0.14, pulled_barrel_pct: 0.11, sweet_spot_pct: 0.38, fb_pct: 0.28, hard_hit_pct: 0.47, avg_launch_angle: 19 },
+      { team: 'NYY', hitter_name: '13', batter: 13, stand: 'L', split_key: 'vs_lhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.360, swstr_pct: 0.10, barrel_bbe_pct: 0.14, barrel_bip_pct: 0.12, pulled_barrel_pct: 0.08, sweet_spot_pct: 0.35, fb_pct: 0.25, hard_hit_pct: 0.43, avg_launch_angle: 17 },
+      { team: 'ATH', hitter_name: '14', batter: 14, stand: 'L', split_key: 'vs_rhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.340, swstr_pct: 0.11, barrel_bbe_pct: 0.12, barrel_bip_pct: 0.10, pulled_barrel_pct: 0.07, sweet_spot_pct: 0.32, fb_pct: 0.23, hard_hit_pct: 0.40, avg_launch_angle: 15 },
+      { team: 'BOS', hitter_name: '21', batter: 21, stand: 'R', split_key: 'vs_rhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.405, swstr_pct: 0.08, barrel_bbe_pct: 0.19, barrel_bip_pct: 0.17, pulled_barrel_pct: 0.12, sweet_spot_pct: 0.39, fb_pct: 0.29, hard_hit_pct: 0.49, avg_launch_angle: 20 },
+      { team: 'BAL', hitter_name: '22', batter: 22, stand: 'R', split_key: 'vs_rhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.370, swstr_pct: 0.09, barrel_bbe_pct: 0.15, barrel_bip_pct: 0.13, pulled_barrel_pct: 0.09, sweet_spot_pct: 0.36, fb_pct: 0.27, hard_hit_pct: 0.45, avg_launch_angle: 18 },
+      { team: 'BOS', hitter_name: '23', batter: 23, stand: 'L', split_key: 'vs_rhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.350, swstr_pct: 0.10, barrel_bbe_pct: 0.13, barrel_bip_pct: 0.11, pulled_barrel_pct: 0.07, sweet_spot_pct: 0.33, fb_pct: 0.24, hard_hit_pct: 0.41, avg_launch_angle: 16 },
+      { team: 'BAL', hitter_name: '24', batter: 24, stand: 'L', split_key: 'vs_rhp', recent_window: 'season', weighted_mode: 'weighted', xwoba: 0.330, swstr_pct: 0.11, barrel_bbe_pct: 0.11, barrel_bip_pct: 0.09, pulled_barrel_pct: 0.06, sweet_spot_pct: 0.31, fb_pct: 0.22, hard_hit_pct: 0.39, avg_launch_angle: 14 },
+    ]],
+    ['https://example.test/daily/2026-04-07/hitter_pitcher_exclusions.parquet', []],
+    ['https://example.test/daily/2026-04-07/rosters.parquet', [
+      { team: 'NYY', player_id: 11, player_name: 'Game One A' },
+      { team: 'ATH', player_id: 12, player_name: 'Game One B' },
+      { team: 'NYY', player_id: 13, player_name: 'Game One C' },
+      { team: 'ATH', player_id: 14, player_name: 'Game One D' },
+      { team: 'BOS', player_id: 21, player_name: 'Game Two A' },
+      { team: 'BAL', player_id: 22, player_name: 'Game Two B' },
+      { team: 'BOS', player_id: 23, player_name: 'Game Two C' },
+      { team: 'BAL', player_id: 24, player_name: 'Game Two D' },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_batter_zone_profiles.parquet', []],
+    ['https://example.test/daily/2026-04-07/daily_pitcher_zone_profiles.parquet', []],
+  ]);
+
+  const source = new HostedArtifactSource(
     {
-      hosted: {
-        isConfigured: () => true,
-        async getBestMatchups() {
-          return {
-            source: 'hosted',
-            resolvedDate: '2026-04-07',
-            rows: [
-              { hitter_name: 'Game One A', team: 'NYY', game_pk: 1, matchup_score: 90.0, xwoba: 0.410 },
-              { hitter_name: 'Game One B', team: 'ATH', game_pk: 1, matchup_score: 80.0, xwoba: 0.380 },
-              { hitter_name: 'Game One C', team: 'NYY', game_pk: 1, matchup_score: 70.0, xwoba: 0.360 },
-              { hitter_name: 'Game One D', team: 'ATH', game_pk: 1, matchup_score: 60.0, xwoba: 0.340 },
-              { hitter_name: 'Game Two A', team: 'BOS', game_pk: 2, matchup_score: 88.0, xwoba: 0.405 },
-              { hitter_name: 'Game Two B', team: 'BAL', game_pk: 2, matchup_score: 77.0, xwoba: 0.370 },
-              { hitter_name: 'Game Two C', team: 'BOS', game_pk: 2, matchup_score: 66.0, xwoba: 0.350 },
-              { hitter_name: 'Game Two D', team: 'BAL', game_pk: 2, matchup_score: 55.0, xwoba: 0.330 },
-            ],
-          };
-        },
-        async getHealth() {
-          return { configured: true, latestDate: '2026-04-07' };
-        },
-      },
-      fallback: {
-        async getHitterSnapshotRows() {
-          return [];
-        },
-        async getHealth() {
-          return { configured: true, latestDate: '2026-04-07' };
-        },
-        async close() {},
+      baseUrl: 'https://example.test',
+      cacheTtlMs: 60_000,
+      fallbackDays: 0,
+    },
+    {
+      readParquetImpl: async (url) => {
+        if (!responses.has(url)) {
+          throw new Error(`Missing ${url}`);
+        }
+        return responses.get(url);
       },
-      logger: { warn() {} },
+      logger: { debug() {}, warn() {} },
     }
   );
 
-  const result = await service.getBestMatchups({ date: '2026-04-07' });
+  const result = await source.getBestMatchups({ date: '2026-04-07' });
 
   assert.equal(result.rows.length, 6);
   assert.deepEqual(