Fix hitter chart profile scoring

src/matchups.js

@@ -2565,15 +2565,20 @@ export class MatchupService {
       throw new Error('No hosted hitter slate was available in the fallback window.');
     }
 
-    const cacheKey = this.buildChartCacheKey('hitter-chart-base', { date: resolvedDate });
+    const cacheKey = this.buildChartCacheKey('hitter-chart-base', { date: resolvedDate, player: playerName });
     const base = await this.getCachedChartValue(cacheKey, async () => {
-      const [slateRows, hitterRows, pitcherRows, rosterRows] = await Promise.all([
+      const [slateRows, hitterRows, pitcherRows, exclusionRows, rosterRows, batterZoneRows, pitcherZoneRows] = await Promise.all([
         this.hosted.readDailyFile(resolvedDate, 'slate.parquet', SLATE_COLUMNS),
         this.hosted.readDailyFile(resolvedDate, 'daily_hitter_metrics.parquet', HITTER_COLUMNS),
         this.hosted.readDailyFile(resolvedDate, 'daily_pitcher_metrics.parquet', PITCHER_COLUMNS),
+        this.hosted.readDailyFile(resolvedDate, 'hitter_pitcher_exclusions.parquet', EXCLUSION_COLUMNS).catch(() => []),
         this.hosted.readDailyFile(resolvedDate, 'rosters.parquet', ROSTER_COLUMNS).catch(() => []),
+        this.hosted.readDailyFile(resolvedDate, 'daily_batter_zone_profiles.parquet', BATTER_ZONE_COLUMNS).catch(() => []),
+        this.hosted.readDailyFile(resolvedDate, 'daily_pitcher_zone_profiles.parquet', PITCHER_ZONE_COLUMNS).catch(() => []),
       ]);
       const rosterLookup = buildRosterLookup(rosterRows);
+      const rosterIdsByTeam = buildRosterIdsByTeam(rosterRows);
+      const exclusionSet = buildExclusionSet(exclusionRows);
       const pitcherLookup = new Map(
         pitcherRows
           .filter((row) => keepRowForDefaults(row))
@@ -2586,12 +2591,50 @@ export class MatchupService {
           slateLookup.set(team, { ...slate, opposingPitcherHand: pitcher.p_throws });
         }
       }
-      return hitterRows
+
+      const preparedRows = hitterRows
         .filter((row) => keepRowForDefaults(row))
         .map((row) => withDefaults(row, slateLookup, { rosterLookup, playerType: 'hitter' }));
+
+      const matchedPlayer = findBestPlayerMatch(preparedRows, 'hitter_name', playerName);
+      if (!matchedPlayer) {
+        return {
+          resolvedDate,
+          rows: [],
+          scoredRows: [],
+          batterZoneRows,
+          pitcherZoneRows,
+        };
+      }
+
+      const normalizedTeam = normalizeTeam(matchedPlayer.team);
+      const effectiveSplit = matchedPlayer.opposing_pitcher_hand === 'R'
+        ? 'vs_rhp'
+        : matchedPlayer.opposing_pitcher_hand === 'L'
+          ? 'vs_lhp'
+          : DEFAULT_SPLIT_KEY;
+
+      const teamRows = hitterRows
+        .filter((row) => normalizeTeam(row.team) === normalizedTeam)
+        .filter((row) => String(row.split_key ?? DEFAULT_SPLIT_KEY) === effectiveSplit)
+        .filter((row) => String(row.recent_window ?? DEFAULT_RECENT_WINDOW) === DEFAULT_RECENT_WINDOW)
+        .filter((row) => String(row.weighted_mode ?? DEFAULT_WEIGHTED_MODE) === DEFAULT_WEIGHTED_MODE)
+        .filter((row) => {
+          const rosterPlayerIds = rosterIdsByTeam.get(normalizedTeam) ?? null;
+          return !rosterPlayerIds || rosterPlayerIds.has(String(row.batter ?? row.player_id ?? '').trim());
+        })
+        .filter((row) => !exclusionSet.has(String(row.batter ?? row.player_id ?? '').trim()))
+        .map((row) => withDefaults(row, slateLookup, { rosterLookup, playerType: 'hitter' }));
+
+      return {
+        resolvedDate,
+        rows: preparedRows,
+        scoredRows: addHitterMatchupScore(teamRows, batterZoneRows, pitcherZoneRows),
+      };
     });
 
-    const hitterMatch = findBestPlayerMatch(base, 'hitter_name', playerName);
+    const hitterMatch = findBestPlayerMatch(base.scoredRows ?? [], 'hitter_name', playerName)
+      ?? findBestPlayerMatch(base.rows ?? [], 'hitter_name', playerName);
     if (!hitterMatch) {
       throw new Error(`No hitter matchup profile matched "${playerName}".`);
     }