Fix hosted pitcher chart resolution

src/matchups.js

@@ -829,6 +829,25 @@ function resolveHostedPlayerName(row, rosterLookup, type = 'hitter') {
   return rawName || rosterName || null;
 }
 
+function firstNonBlankValue(...values) {
+  for (const value of values) {
+    if (value === null || value === undefined) {
+      continue;
+    }
+    if (typeof value === 'string') {
+      const trimmed = value.trim();
+      if (trimmed) {
+        return trimmed;
+      }
+      continue;
+    }
+    if (value !== '') {
+      return value;
+    }
+  }
+  return null;
+}
+
 function withDefaults(row, slateLookup, options = {}) {
   const team = String(row.team ?? '').trim();
   const slate = slateLookup.get(team) ?? {};
@@ -843,11 +862,11 @@ function withDefaults(row, slateLookup, options = {}) {
     pitcher_name: playerType === 'pitcher'
       ? resolveHostedPlayerName(row, rosterLookup, 'pitcher')
       : 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,
+    game_pk: firstNonBlankValue(row.game_pk, slate.gamePk),
+    opponent_team: firstNonBlankValue(row.opponent_team, slate.opponentTeam),
+    opposing_pitcher_id: firstNonBlankValue(row.opposing_pitcher_id, slate.opposingPitcherId),
+    opposing_pitcher_name: firstNonBlankValue(row.opposing_pitcher_name, slate.opposingPitcherName),
+    opposing_pitcher_hand: firstNonBlankValue(row.opposing_pitcher_hand, slate.opposingPitcherHand),
   };
 }
 
@@ -2312,14 +2331,27 @@ export class MatchupService {
         throw new Error(`No hitter matchup profile matched "${options.player}".`);
       }
 
+      const hitterSlate = slateLookup.get(String(hitterMatch.team ?? '').trim()) ?? {};
+      const opposingPitcherId = String(
+        firstNonBlankValue(hitterMatch.opposing_pitcher_id, hitterSlate.opposingPitcherId) ?? ''
+      ).trim();
+      const opposingPitcherName = firstNonBlankValue(
+        hitterMatch.opposing_pitcher_name,
+        hitterSlate.opposingPitcherName,
+      );
+      const opposingPitcherHand = firstNonBlankValue(
+        hitterMatch.opposing_pitcher_hand,
+        hitterSlate.opposingPitcherHand,
+      );
+
       const batterMap = aggregateBatterZoneMap(selectBatterZoneRows(
         batterZoneRows,
         String(hitterMatch.batter ?? hitterMatch.player_id ?? ''),
-        hitterMatch.opposing_pitcher_hand
+        opposingPitcherHand
       ));
       const pitcherMap = aggregatePitcherZoneMap(selectPitcherZoneRows(
         pitcherZoneRows,
-        String(hitterMatch.opposing_pitcher_id ?? ''),
+        opposingPitcherId,
         hitterMatch.stand
       ));
       const overlay = buildZoneOverlayMap(batterMap, pitcherMap);
@@ -2343,8 +2375,8 @@ export class MatchupService {
         resolvedDate,
         playerName: hitterMatch.hitter_name,
         team: hitterMatch.team,
-        opposingPitcherName: hitterMatch.opposing_pitcher_name,
-        opposingPitcherHand: hitterMatch.opposing_pitcher_hand,
+        opposingPitcherName,
+        opposingPitcherHand,
         zone_fit_score: hitterMatch.zone_fit_score ?? overlayZoneFitScore(batterMap, pitcherMap),
         cells,
         bestOverlay: insights.bestOverlay,
@@ -2686,20 +2718,28 @@ export class MatchupService {
     });
 
     const pitcherMatch = findBestPlayerMatch(base, 'pitcher_name', playerName);
-    if (!pitcherMatch) {
-      throw new Error(`No pitcher matchup profile matched "${playerName}".`);
+    if (pitcherMatch) {
+      return {
+        source: 'hosted',
+        resolvedDate,
+        playerType: 'pitcher',
+        name: pitcherMatch.pitcher_name,
+        team: pitcherMatch.team ?? null,
+        opponentTeam: pitcherMatch.opponent_team ?? null,
+        hand: pitcherMatch.p_throws ?? null,
+        overview: pitcherMatch,
+      };
     }
 
-    return {
-      source: 'hosted',
-      resolvedDate,
+    const broaderContext = await this.getPlayerContext({
+      ...options,
+      player: playerName,
       playerType: 'pitcher',
-      name: pitcherMatch.pitcher_name,
-      team: pitcherMatch.team ?? null,
-      opponentTeam: pitcherMatch.opponent_team ?? null,
-      hand: pitcherMatch.p_throws ?? null,
-      overview: pitcherMatch,
-    };
+    });
+    if (broaderContext.playerType !== 'pitcher') {
+      throw new Error(`No pitcher matchup profile matched "${playerName}".`);
+    }
+    return broaderContext;
   }
 
   async enrichHostedHitters(result, options = {}, methodName = 'getTopHitters') {

test/matchups.test.js

@@ -333,6 +333,185 @@ test('matchup service enriches hosted top hitter rows from Cockroach snapshots',
   assert.equal(result.rows[2].hitter_name, 'Paul Goldschmidt');
 });
 
+test('hr zone data falls back to the slate probable pitcher when hitter rows leave the pitcher name blank', async () => {
+  const responses = new Map([
+    ['https://example.test/daily/2026-04-07/slate.parquet', [
+      {
+        game_pk: 20,
+        away_team: 'LAA',
+        home_team: 'SEA',
+        away_probable_pitcher_id: 501,
+        home_probable_pitcher_id: 601,
+        away_probable_pitcher: 'Jose Soriano',
+        home_probable_pitcher: 'Bryan Woo',
+        away_probable_hand: 'R',
+        home_probable_hand: 'R',
+      },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_hitter_metrics.parquet', [
+      {
+        game_pk: 20,
+        team: 'LAA',
+        hitter_name: '142',
+        batter: 142,
+        stand: 'R',
+        split_key: 'overall',
+        recent_window: 'season',
+        weighted_mode: 'weighted',
+        opposing_pitcher_id: '',
+        opposing_pitcher_name: '',
+        opposing_pitcher_hand: 'R',
+        zone_fit_score: 0.057,
+        xwoba: 0.355,
+        swstr_pct: 0.11,
+        barrel_bbe_pct: 0.12,
+        barrel_bip_pct: 0.10,
+        pulled_barrel_pct: 0.08,
+        sweet_spot_pct: 0.31,
+        fb_pct: 0.27,
+        hard_hit_pct: 0.44,
+        avg_launch_angle: 16.1,
+      },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_pitcher_metrics.parquet', [
+      { pitcher_id: 601, pitcher_name: 'Bryan Woo', p_throws: 'R', split_key: 'overall', recent_window: 'season', weighted_mode: 'weighted' },
+    ]],
+    ['https://example.test/daily/2026-04-07/rosters.parquet', [
+      { team: 'LAA', player_id: 142, player_name: 'Jorge Soler' },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_batter_zone_profiles.parquet', [
+      { batter_id: 142, pitcher_hand_key: 'vs_rhp', zone: 5, hit_rate: 0.22, hr_rate: 0.09, sample_size: 40 },
+      { batter_id: 142, pitcher_hand_key: 'vs_rhp', zone: 8, hit_rate: 0.18, hr_rate: 0.05, sample_size: 20 },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_pitcher_zone_profiles.parquet', [
+      { pitcher_id: 601, batter_side_key: 'vs_rhb', zone: 5, usage_rate: 0.25, sample_size: 60 },
+      { pitcher_id: 601, batter_side_key: 'vs_rhb', zone: 8, usage_rate: 0.11, sample_size: 30 },
+    ]],
+  ]);
+
+  const hosted = 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);
+      },
+      fetchTextImpl: async () => '',
+      logger: { debug() {}, warn() {} },
+    }
+  );
+
+  const service = new MatchupService(
+    { databaseUrl: 'postgresql://test', hosted: { baseUrl: 'https://example.test' } },
+    {
+      hosted,
+      fallback: { async close() {} },
+      logger: { debug() {}, warn() {} },
+    }
+  );
+
+  const result = await service.getHrZoneData({ date: '2026-04-07', player: 'jorge soler' });
+
+  assert.equal(result.playerName, 'Jorge Soler');
+  assert.equal(result.opposingPitcherName, 'Bryan Woo');
+  assert.equal(result.opposingPitcherHand, 'R');
+});
+
+test('k profile falls back to broader hosted pitcher context when the daily chart slice misses the pitcher', async () => {
+  const responses = new Map([
+    ['https://example.test/daily/2026-04-07/slate.parquet', [
+      {
+        game_pk: 40,
+        away_team: 'PIT',
+        home_team: 'CHC',
+        away_probable_pitcher_id: 301,
+        home_probable_pitcher_id: 401,
+        away_probable_pitcher: 'Paul Skenes',
+        home_probable_pitcher: 'Jameson Taillon',
+        away_probable_hand: 'R',
+        home_probable_hand: 'R',
+      },
+    ]],
+    ['https://example.test/daily/2026-04-07/daily_hitter_metrics.parquet', []],
+    ['https://example.test/daily/2026-04-07/daily_pitcher_metrics.parquet', [
+      { pitcher_id: 401, pitcher_name: 'Jameson Taillon', team: 'CHC', opponent_team: 'PIT', p_throws: 'R', split_key: 'overall', recent_window: 'season', weighted_mode: 'weighted' },
+    ]],
+    ['https://example.test/daily/2026-04-07/rosters.parquet', [
+      { team: 'PIT', player_id: 301, player_name: 'Paul Skenes' },
+      { team: 'CHC', player_id: 401, player_name: 'Jameson Taillon' },
+    ]],
+    ['https://example.test/reusable/hitter_metrics.parquet', []],
+    ['https://example.test/reusable/pitcher_metrics.parquet', [
+      {
+        pitcher_id: 301,
+        player_id: 301,
+        pitcher_name: '301',
+        team: 'PIT',
+        opponent_team: 'CHC',
+        p_throws: 'R',
+        split_key: 'overall',
+        recent_window: 'season',
+        weighted_mode: 'weighted',
+        pitcher_score: 92.2,
+        strikeout_score: 89.5,
+        pitcher_matchup_adjustment: 6.3,
+        strikeout_matchup_adjustment: 7.1,
+        csw_pct: 0.312,
+        swstr_pct: 0.176,
+        putaway_pct: 0.281,
+        opponent_whiff_tendency: 27.4,
+      },
+    ]],
+    ['https://example.test/reusable/hitter_rolling.parquet', []],
+    ['https://example.test/reusable/pitcher_rolling.parquet', []],
+    ['https://example.test/reusable/batter_zone_profiles.parquet', []],
+    ['https://example.test/reusable/pitcher_zone_profiles.parquet', []],
+    ['https://example.test/reusable/pitcher_arsenal.parquet', []],
+    ['https://example.test/reusable/pitcher_usage_by_count.parquet', []],
+  ]);
+
+  const hosted = 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);
+      },
+      fetchTextImpl: async () => '',
+      logger: { debug() {}, warn() {} },
+    }
+  );
+
+  const service = new MatchupService(
+    { databaseUrl: 'postgresql://test', hosted: { baseUrl: 'https://example.test' } },
+    {
+      hosted,
+      fallback: { async close() {} },
+      logger: { debug() {}, warn() {} },
+    }
+  );
+
+  const result = await service.getKProfileData({ date: '2026-04-07', pitcher: 'paul skenes' });
+
+  assert.equal(result.pitcherName, 'Paul Skenes');
+  assert.equal(result.team, 'PIT');
+  assert.equal(result.opponentTeam, 'CHC');
+  assert.equal(result.pitcher_score, 92.2);
+  assert.equal(result.strikeout_score, 89.5);
+});
+
 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', [