Add full pitcher chart suite

src/baseball-charts.js

@@ -48,6 +48,13 @@ const K_COLORS = {
   fill: 'rgba(56, 189, 248, 0.18)',
 };
 
+const PITCHER_COLORS = {
+  primary: '#22c55e',
+  secondary: '#38bdf8',
+  tertiary: '#f59e0b',
+  fill: 'rgba(34, 197, 94, 0.18)',
+};
+
 const TEXT = {
   title: '#F7F8FF',
   subtitle: '#D6DDF7',
@@ -211,6 +218,42 @@ export async function createKTrendChartPng(payload = {}) {
   return createTrendChartPng(payload, K_COLORS, 'Pitcher K Trend');
 }
 
+export async function createPitcherTrendChartPng(payload = {}) {
+  if (payload.chartType === 'radar') {
+    return createRadarPng(payload, PITCHER_COLORS, payload.title ?? 'Pitcher Trend');
+  }
+  if (payload.chartType === 'bar') {
+    const labels = payload.labels?.length ? payload.labels : ['No Data'];
+    const datasets = payload.datasets?.length
+      ? payload.datasets.map((dataset, index) => ({
+          label: dataset.label,
+          data: dataset.values ?? [],
+          backgroundColor: dataset.color ?? [PITCHER_COLORS.primary, PITCHER_COLORS.secondary, PITCHER_COLORS.tertiary][index % 3],
+          borderRadius: 8,
+        }))
+      : [{
+          label: 'Value',
+          data: [0],
+          backgroundColor: PITCHER_COLORS.primary,
+          borderRadius: 8,
+        }];
+
+    return renderChart('bar', { labels, datasets }, {
+      title: payload.title ?? 'Pitcher Trend',
+      subtitle: payload.subtitle ?? 'Pitcher baseline view.',
+      showLegend: true,
+      chartOptions: {
+        scales: {
+          y: axisStyle({
+            beginAtZero: true,
+          }),
+        },
+      },
+    });
+  }
+  return createTrendChartPng(payload, PITCHER_COLORS, payload.title ?? 'Pitcher Trend');
+}
+
 async function createTrendChartPng(payload, colors, fallbackTitle) {
   const points = payload.points?.length
     ? payload.points
@@ -565,6 +608,179 @@ export async function createKMatchupCardPng(payload = {}) {
   return buffer;
 }
 
+export async function createPitcherArsenalChartPng(payload = {}) {
+  return createPitcherTableCardPng({
+    accent: PITCHER_COLORS.primary,
+    width: payload.width,
+    height: payload.height ?? 760,
+    title: payload.title ?? 'Pitcher Arsenal',
+    subtitle: payload.subtitle ?? 'Arsenal and pitch-quality view.',
+    playerName: payload.pitcherName ?? 'Unknown Pitcher',
+    teamLine: payload.teamLine ?? '',
+    read: payload.read,
+    columns: payload.columns,
+    rows: payload.rows,
+  });
+}
+
+export async function createPitcherLocationChartPng(payload = {}) {
+  const width = payload.width ?? 1080;
+  const height = payload.height ?? 760;
+  const canvas = new Canvas(width, height);
+  const ctx = canvas.getContext('2d');
+
+  paintCanvasBackground(ctx, width, height, ['#081a1a', '#102432', '#1f2d3f']);
+  drawHeader(
+    ctx,
+    width,
+    payload.title ?? 'Pitcher Location',
+    payload.subtitle ?? 'Pitch distribution by zone bucket.',
+    PITCHER_COLORS.primary
+  );
+
+  const boardX = 46;
+  const boardY = 124;
+  const boardWidth = width - 92;
+  const boardHeight = height - 170;
+  drawPanel(ctx, boardX, boardY, boardWidth, boardHeight);
+
+  ctx.fillStyle = TEXT.title;
+  ctx.font = 'bold 24px sans-serif';
+  ctx.fillText(payload.pitcherName ?? 'Unknown Pitcher', boardX + 26, boardY + 44);
+  ctx.font = '18px sans-serif';
+  ctx.fillStyle = TEXT.subtitle;
+  ctx.fillText(payload.teamLine ?? '', boardX + 26, boardY + 74);
+
+  ctx.font = 'bold 18px sans-serif';
+  ctx.fillStyle = PITCHER_COLORS.primary;
+  ctx.fillText(payload.metricLabel ?? 'Zone pressure', boardX + 26, boardY + 106);
+
+  const zoneX = boardX + 64;
+  const zoneY = boardY + 146;
+  const cellSize = 104;
+  const gap = 8;
+  const zoneEntries = new Map((payload.cells ?? []).map((cell) => [String(cell.zone), cell]));
+
+  [1, 2, 3, 4, 5, 6, 7, 8, 9].forEach((zone, index) => {
+    const row = Math.floor(index / 3);
+    const col = index % 3;
+    const x = zoneX + col * (cellSize + gap);
+    const y = zoneY + row * (cellSize + gap);
+    const cell = zoneEntries.get(String(zone)) ?? {};
+    const intensity = Math.max(0, Math.min(1, numberOrZero(cell.overlayValue) / 100));
+
+    ctx.fillStyle = interpolateColor('#123326', '#22c55e', intensity);
+    roundRect(ctx, x, y, cellSize, cellSize, 16);
+    ctx.fill();
+
+    ctx.strokeStyle = 'rgba(255,255,255,0.15)';
+    ctx.lineWidth = 1;
+    roundRect(ctx, x, y, cellSize, cellSize, 16);
+    ctx.stroke();
+
+    ctx.fillStyle = TEXT.title;
+    ctx.font = 'bold 14px sans-serif';
+    ctx.fillText(`Z${zone}`, x + 12, y + 24);
+    ctx.font = '13px sans-serif';
+    ctx.fillText(`Usage ${(numberOrZero(cell.pitcherValue) * 100).toFixed(0)}%`, x + 12, y + 48);
+    ctx.fillText(`Miss ${(numberOrZero(cell.batterValue) * 100).toFixed(0)}%`, x + 12, y + 68);
+    ctx.fillText(`Value ${numberOrZero(cell.overlayValue).toFixed(0)}`, x + 12, y + 88);
+  });
+
+  const notesX = zoneX + 3 * (cellSize + gap) + 40;
+  const notesWidth = boardX + boardWidth - notesX - 28;
+  drawMiniSummary(ctx, notesX, zoneY, notesWidth, 140, 'Best Pocket', payload.bestOverlay ?? 'No clear hot zone found.');
+  drawMiniSummary(ctx, notesX, zoneY + 162, notesWidth, 140, 'Attack Shape', payload.shapeSummary ?? 'No attack summary available.');
+  drawMiniSummary(ctx, notesX, zoneY + 324, notesWidth, 140, 'Read', payload.read ?? 'The heatmap shows where the pitcher lives in the selected location view.');
+
+  return canvas.toBuffer('png');
+}
+
+export async function createPitcherApproachChartPng(payload = {}) {
+  const labels = payload.labels?.length ? payload.labels : ['No Data'];
+  const datasets = payload.datasets?.length
+    ? payload.datasets.map((dataset, index) => ({
+        label: dataset.label,
+        data: dataset.values,
+        backgroundColor: dataset.color ?? [PITCHER_COLORS.primary, PITCHER_COLORS.secondary, PITCHER_COLORS.tertiary, '#c084fc'][index % 4],
+        borderRadius: 6,
+      }))
+    : [{
+        label: 'Usage',
+        data: [0],
+        backgroundColor: PITCHER_COLORS.primary,
+        borderRadius: 6,
+      }];
+
+  return renderChart('bar', { labels, datasets }, {
+    title: payload.title ?? 'Pitcher Approach',
+    subtitle: payload.subtitle ?? 'Count-state and game-plan view.',
+    showLegend: true,
+    chartOptions: {
+      scales: {
+        y: axisStyle({
+          min: 0,
+          max: 100,
+          ticks: {
+            color: TEXT.axis,
+            callback(value) {
+              return `${Number(value).toFixed(0)}%`;
+            },
+          },
+        }),
+      },
+    },
+  });
+}
+
+export async function createPitcherCompareChartPng(payload = {}) {
+  if (payload.chartType === 'scatter') {
+    const points = payload.points?.length ? payload.points : [{ x: 0, y: 0, label: 'No data' }];
+    return renderChart('scatter', {
+      datasets: [
+        {
+          label: payload.seriesLabel ?? 'Snapshots',
+          data: points.map((point) => ({ x: numberOrZero(point.x), y: numberOrZero(point.y), label: point.label })),
+          pointRadius: 6,
+          pointHoverRadius: 7,
+          pointBackgroundColor: points.map(() => PITCHER_COLORS.primary),
+        },
+      ],
+    }, {
+      title: payload.title ?? 'Pitcher Compare',
+      subtitle: payload.subtitle ?? 'Risk and reward view.',
+      chartOptions: {
+        plugins: {
+          tooltip: {
+            callbacks: {
+              label(context) {
+                const raw = context.raw ?? {};
+                return `${raw.label ?? 'Snapshot'} | X ${Number(raw.x).toFixed(1)} | Y ${Number(raw.y).toFixed(1)}`;
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+
+  return createPitcherTableCardPng({
+    accent: PITCHER_COLORS.secondary,
+    width: payload.width,
+    height: payload.height ?? 720,
+    title: payload.title ?? 'Pitcher Compare',
+    subtitle: payload.subtitle ?? 'Baseline and comparison view.',
+    playerName: payload.pitcherName ?? 'Unknown Pitcher',
+    teamLine: payload.teamLine ?? '',
+    read: payload.read,
+    columns: [
+      { key: 'currentValue', label: payload.compareLabel ?? 'Current' },
+      { key: 'baselineValue', label: payload.baselineLabel ?? 'Baseline' },
+    ],
+    rows: payload.rows,
+  });
+}
+
 function drawMetricList(ctx, x, y, width, metrics, accent) {
   const rows = metrics.length
     ? metrics
@@ -595,6 +811,68 @@ function drawMiniSummary(ctx, x, y, width, height, title, text) {
   wrapText(ctx, String(text ?? ''), x + 18, y + 58, width - 36, 22, 15, TEXT.subtitle);
 }
 
+async function createPitcherTableCardPng(payload = {}) {
+  const width = payload.width ?? 1120;
+  const height = payload.height ?? 760;
+  const canvas = new Canvas(width, height);
+  const ctx = canvas.getContext('2d');
+
+  paintCanvasBackground(ctx, width, height, ['#111827', '#14243d', '#1a2a46']);
+  drawHeader(
+    ctx,
+    width,
+    payload.title ?? 'Pitcher Table',
+    payload.subtitle ?? 'Pitcher data view.',
+    payload.accent ?? PITCHER_COLORS.primary
+  );
+  drawPanel(ctx, 44, 120, width - 88, height - 164);
+
+  ctx.fillStyle = TEXT.title;
+  ctx.font = 'bold 24px sans-serif';
+  ctx.fillText(payload.playerName ?? 'Unknown Pitcher', 76, 164);
+  ctx.fillStyle = TEXT.subtitle;
+  ctx.font = '17px sans-serif';
+  if (payload.teamLine) {
+    ctx.fillText(payload.teamLine, 76, 192);
+  }
+
+  const tableX = 76;
+  const tableY = 238;
+  const tableWidth = width - 152;
+  const columns = payload.columns?.length ? payload.columns : [{ key: 'value', label: 'Value' }];
+  const rows = payload.rows?.length ? payload.rows : [{ label: 'No data', value: 'N/A' }];
+  const labelWidth = 180;
+  const dataWidth = (tableWidth - labelWidth) / Math.max(columns.length, 1);
+
+  ctx.fillStyle = TEXT.muted;
+  ctx.font = 'bold 14px sans-serif';
+  ctx.fillText('Pitch / Row', tableX, tableY);
+  columns.forEach((column, index) => {
+    ctx.fillText(column.label, tableX + labelWidth + index * dataWidth, tableY);
+  });
+
+  rows.slice(0, 8).forEach((row, index) => {
+    const top = tableY + 34 + index * 46;
+    ctx.fillStyle = index % 2 === 0 ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.01)';
+    roundRect(ctx, tableX - 10, top - 22, tableWidth + 20, 34, 10);
+    ctx.fill();
+
+    ctx.fillStyle = TEXT.title;
+    ctx.font = 'bold 15px sans-serif';
+    ctx.fillText(String(row.label ?? 'Row'), tableX, top);
+    ctx.font = '14px sans-serif';
+    columns.forEach((column, columnIndex) => {
+      ctx.fillStyle = columnIndex === 0 ? (payload.accent ?? PITCHER_COLORS.primary) : TEXT.subtitle;
+      const rawValue = row[column.key];
+      const text = formatTableMetric(rawValue, column.type);
+      ctx.fillText(text, tableX + labelWidth + columnIndex * dataWidth, top);
+    });
+  });
+
+  drawMiniSummary(ctx, 76, height - 184, width - 152, 110, 'Read', payload.read ?? 'This card summarizes the selected pitcher view.');
+  return canvas.toBuffer('png');
+}
+
 function drawHeader(ctx, width, title, subtitle, accentColor) {
   ctx.fillStyle = TEXT.title;
   ctx.font = 'bold 34px sans-serif';
@@ -682,6 +960,25 @@ function numberOrZero(value) {
   return Number.isFinite(numeric) ? numeric : 0;
 }
 
+function formatTableMetric(value, type) {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric)) {
+    return String(value ?? 'N/A');
+  }
+  if (type === 'pct') {
+    const scaled = Math.abs(numeric) <= 1 ? numeric * 100 : numeric;
+    return `${scaled.toFixed(1)}%`;
+  }
+  if (type === 'pct_signed') {
+    const scaled = Math.abs(numeric) <= 1 ? numeric * 100 : numeric;
+    return `${scaled >= 0 ? '+' : ''}${scaled.toFixed(1)}%`;
+  }
+  if (type === 'decimal') {
+    return numeric.toFixed(3);
+  }
+  return numeric.toFixed(Math.abs(numeric) < 10 ? 2 : 1);
+}
+
 function truncateLabel(value, maxLength = 24) {
   const text = String(value ?? '');
   return text.length <= maxLength ? text : `${text.slice(0, maxLength - 3)}...`;

src/commands.js

@@ -233,6 +233,68 @@ function addMatchupOptions(command, options = {}) {
 }
 
 const BASEBALL_CHART_BOOK_CHOICES = SPORTSBOOK_BOOK_CHOICES;
+const PITCHER_SUITE_WINDOW_CHOICES = [
+  { name: 'Last 5', value: 'last_5' },
+  { name: 'Last 10', value: 'last_10' },
+  { name: 'Season 2026', value: 'season_2026' },
+  { name: 'Career', value: 'career' },
+];
+const PITCHER_SUITE_SPLIT_CHOICES = [
+  { name: 'Overall', value: 'overall' },
+  { name: 'Vs LHB', value: 'vs_lhb' },
+  { name: 'Vs RHB', value: 'vs_rhb' },
+];
+const PITCHER_TREND_VIEW_CHOICES = [
+  { name: 'Velocity', value: 'velo' },
+  { name: 'Spin', value: 'spin' },
+  { name: 'Release', value: 'release' },
+  { name: 'Form', value: 'form' },
+  { name: 'Results', value: 'results' },
+  { name: 'Baseline', value: 'baseline' },
+];
+const PITCHER_ARSENAL_VIEW_CHOICES = [
+  { name: 'Shape', value: 'shape' },
+  { name: 'Movement', value: 'movement' },
+  { name: 'Usage', value: 'usage' },
+  { name: 'Evolution', value: 'evolution' },
+  { name: 'Outcomes', value: 'outcomes' },
+  { name: 'Platoon', value: 'platoon' },
+];
+const PITCHER_LOCATION_VIEW_CHOICES = [
+  { name: 'Heatmap', value: 'heatmap' },
+  { name: 'By Pitch', value: 'bypitch' },
+  { name: 'Two Strike', value: 'twostrike' },
+  { name: 'Chase', value: 'chase' },
+  { name: 'Damage', value: 'damage' },
+  { name: 'Miss', value: 'miss' },
+];
+const PITCHER_APPROACH_VIEW_CHOICES = [
+  { name: 'Count Usage', value: 'count_usage' },
+  { name: 'Count Whiff', value: 'count_whiff' },
+  { name: 'Ahead / Behind', value: 'ahead_behind' },
+  { name: 'First Pitch', value: 'first_pitch' },
+  { name: 'Putaway', value: 'putaway' },
+];
+const PITCHER_COMPARE_VIEW_CHOICES = [
+  { name: 'Current vs Career', value: 'current_vs_career' },
+  { name: 'Recent vs Baseline', value: 'recent_vs_baseline' },
+  { name: 'Year Over Year', value: 'year_over_year' },
+  { name: 'Risk Reward', value: 'risk_reward' },
+];
+const PITCHER_COMPARE_TO_CHOICES = [
+  { name: 'Season 2026', value: 'season_2026' },
+  { name: 'Career', value: 'career' },
+  { name: 'Prior 5', value: 'prior_5' },
+  { name: 'Prior 10', value: 'prior_10' },
+];
+const PITCHER_COUNT_BUCKET_CHOICES = [
+  { name: 'All', value: 'all' },
+  { name: 'First Pitch', value: 'first_pitch' },
+  { name: 'Ahead', value: 'ahead' },
+  { name: 'Behind', value: 'behind' },
+  { name: 'Putaway', value: 'putaway' },
+  { name: 'Two Strike', value: 'two_strike' },
+];
 
 const DIRECT_ODDS_MARKET_CHOICES = [
   { name: 'Home Runs', value: 'batter_home_runs' },
@@ -286,6 +348,74 @@ function addBaseballChartBookOption(command) {
   );
 }
 
+function addPitcherSuitePitcherOption(command) {
+  return command.addStringOption((option) =>
+    option
+      .setName('pitcher')
+      .setDescription('Pitcher name to chart.')
+      .setRequired(true)
+  );
+}
+
+function addPitcherSuiteViewOption(command, choices) {
+  return command.addStringOption((option) =>
+    option
+      .setName('view')
+      .setDescription('Chart view to render.')
+      .setRequired(true)
+      .addChoices(...choices)
+  );
+}
+
+function addPitcherSuitePitchTypeOption(command) {
+  return command.addStringOption((option) =>
+    option
+      .setName('pitch_type')
+      .setDescription('Optional pitch type filter, for example FF, SL, or CH.')
+      .setRequired(false)
+  );
+}
+
+function addPitcherSuiteWindowOption(command) {
+  return command.addStringOption((option) =>
+    option
+      .setName('window')
+      .setDescription('Optional time window.')
+      .setRequired(false)
+      .addChoices(...PITCHER_SUITE_WINDOW_CHOICES)
+  );
+}
+
+function addPitcherSuiteSplitOption(command) {
+  return command.addStringOption((option) =>
+    option
+      .setName('split')
+      .setDescription('Optional batter-side split.')
+      .setRequired(false)
+      .addChoices(...PITCHER_SUITE_SPLIT_CHOICES)
+  );
+}
+
+function addPitcherSuiteCompareToOption(command) {
+  return command.addStringOption((option) =>
+    option
+      .setName('compare_to')
+      .setDescription('Optional comparison baseline.')
+      .setRequired(false)
+      .addChoices(...PITCHER_COMPARE_TO_CHOICES)
+  );
+}
+
+function addPitcherSuiteCountBucketOption(command) {
+  return command.addStringOption((option) =>
+    option
+      .setName('count_bucket')
+      .setDescription('Optional count bucket filter.')
+      .setRequired(false)
+      .addChoices(...PITCHER_COUNT_BUCKET_CHOICES)
+  );
+}
+
 export const commands = [
   new SlashCommandBuilder()
     .setName('bet')
@@ -858,6 +988,84 @@ export const commands = [
           .setRequired(true)
       )
   ),
+  addBaseballChartDateOption(
+    addPitcherSuiteSplitOption(
+      addPitcherSuiteCompareToOption(
+        addPitcherSuiteWindowOption(
+          addPitcherSuitePitchTypeOption(
+            addPitcherSuiteViewOption(
+              addPitcherSuitePitcherOption(
+                new SlashCommandBuilder()
+                  .setName('pitchertrend')
+                  .setDescription('Render time-based pitcher analysis charts beyond the daily slate.')
+              ),
+              PITCHER_TREND_VIEW_CHOICES
+            )
+          )
+        )
+      )
+    )
+  ),
+  addBaseballChartDateOption(
+    addPitcherSuiteSplitOption(
+      addPitcherSuiteWindowOption(
+        addPitcherSuitePitchTypeOption(
+          addPitcherSuiteViewOption(
+            addPitcherSuitePitcherOption(
+              new SlashCommandBuilder()
+                .setName('pitcherarsenal')
+                .setDescription('Render arsenal, movement, usage, and pitch outcome views for one pitcher.')
+            ),
+            PITCHER_ARSENAL_VIEW_CHOICES
+          )
+        )
+      )
+    )
+  ),
+  addBaseballChartDateOption(
+    addPitcherSuiteCountBucketOption(
+      addPitcherSuiteSplitOption(
+        addPitcherSuitePitchTypeOption(
+          addPitcherSuiteViewOption(
+            addPitcherSuitePitcherOption(
+              new SlashCommandBuilder()
+                .setName('pitcherlocation')
+                .setDescription('Render location, zone, and attack-pattern charts for one pitcher.')
+            ),
+            PITCHER_LOCATION_VIEW_CHOICES
+          )
+        )
+      )
+    )
+  ),
+  addBaseballChartDateOption(
+    addPitcherSuiteSplitOption(
+      addPitcherSuiteWindowOption(
+        addPitcherSuitePitchTypeOption(
+          addPitcherSuiteViewOption(
+            addPitcherSuitePitcherOption(
+              new SlashCommandBuilder()
+                .setName('pitcherapproach')
+                .setDescription('Render count-state and game-plan charts for one pitcher.')
+            ),
+            PITCHER_APPROACH_VIEW_CHOICES
+          )
+        )
+      )
+    )
+  ),
+  addBaseballChartDateOption(
+    addPitcherSuiteWindowOption(
+      addPitcherSuiteViewOption(
+        addPitcherSuitePitcherOption(
+          new SlashCommandBuilder()
+            .setName('pitchercompare')
+            .setDescription('Render baseline, year-over-year, and risk/reward comparison charts for one pitcher.')
+        ),
+        PITCHER_COMPARE_VIEW_CHOICES
+      )
+    )
+  ),
   new SlashCommandBuilder()
     .setName('alerts')
     .setDescription('Post the analyst alert-role embed to the welcome channel.'),

src/embeds.js

@@ -323,7 +323,7 @@ export function buildCommandsEmbed() {
       { name: '/scanreport', value: 'Post the morning scan reports immediately. Admin only.' },
       { name: 'Sharp Market Commands', value: '`/edgeboard`, `/playeredge`, `/marketedge`, `/widthboard`, `/consensusvs`, `/steam`, `/sharpboard`, `/bookscoreboard`, `/markethealth` cover sportsbook comparisons. `/dfsedgeboard`, `/dfsplayeredge`, `/dfsmarketedge`, `/dfswidthboard`, `/dfsconsensusvs` and `/exchangeedgeboard`, `/exchangeplayeredge`, `/exchangemarketedge`, `/exchangewidthboard`, `/exchangeconsensusvs` mirror those views for DFS and exchange lanes.' },
       { name: '/hrodds', value: 'Show live Home Run odds for one player across the supported sportsbook books, including Circa, FanDuel, DraftKings, Caesars, Fanatics, Bally Bet, Hard Rock Bet, and BetMGM when available.' },
-      { name: 'Other Odds Commands', value: '`/hitodds`, `/tbodds`, `/rbiodds`, `/runodds`, `/sbodds`, `/kodds` stay sportsbook-only. `/dfsodds` and `/exchangeodds` show direct prices inside the DFS or exchange lane.' },
+      { name: 'Other Odds Commands', value: '`/hitodds`, `/tbodds`, `/rbiodds`, `/runodds`, `/sbodds`, `/kodds` stay sportsbook-only. `/dfsodds` and `/exchangeodds` show direct prices inside the DFS or exchange lane. Pitcher charts now include `/ktrend`, `/kladder`, `/kprofile`, `/kmatchup`, `/kcount`, plus `/pitchertrend`, `/pitcherarsenal`, `/pitcherlocation`, `/pitcherapproach`, and `/pitchercompare` for deeper pitch-tracking analysis.' },
       { name: '/circatest', value: 'Run a Circa OCR diagnostic preview. Admin only.' },
       { name: 'Circa Market Commands', value: '`/circamarket`, `/circahr`, `/circahits`, `/circatb`, `/circarbis`, `/circaruns`, `/circasb`, `/circahrri`, `/circak` post the latest parsed Circa markets in the channel where you run them.' },
       { name: '/alerts', value: 'Post the public analyst alert-role panel to the welcome channel. Only for jew_olympics.' },
@@ -1148,7 +1148,7 @@ export function buildMatchupHealthEmbed(result) {
     ));
 }
 
-function buildBaseballChartEmbed({ title, description, fileName, color = PALETTE.primary, read, source, resolvedDate, player, team, opponent, book }) {
+function buildBaseballChartEmbed({ title, description, fileName, color = PALETTE.primary, read, source, resolvedDate, player, team, opponent, book, view, window, split, pitchType, compareTo, countBucket }) {
   const details = [
     description ?? null,
     source ? `Source: **${String(source).toUpperCase()}**` : null,
@@ -1156,6 +1156,12 @@ function buildBaseballChartEmbed({ title, description, fileName, color = PALETTE
     player ? `Player: **${player}**` : null,
     team ? `Team: **${team}**` : null,
     opponent ? `Opponent: **${opponent}**` : null,
+    view ? `View: **${view}**` : null,
+    window ? `Window: **${window}**` : null,
+    split && split !== 'overall' ? `Split: **${split}**` : null,
+    pitchType ? `Pitch: **${pitchType}**` : null,
+    compareTo ? `Compare To: **${compareTo}**` : null,
+    countBucket && countBucket !== 'all' ? `Count Bucket: **${countBucket}**` : null,
     book ? `Book: **${book}**` : null,
     read ? `Read: ${read}` : null,
   ].filter(Boolean);
@@ -1315,6 +1321,100 @@ export function buildKCountEmbed(result, fileName = 'k-count-chart.png') {
   });
 }
 
+export function buildPitcherTrendEmbed(result, fileName = 'pitcher-trend-chart.png') {
+  return buildBaseballChartEmbed({
+    title: 'Pitcher Trend Suite',
+    description: 'Time-based pitcher analysis using Cockroach pitch tracking.',
+    fileName,
+    color: PALETTE.success,
+    read: result.read,
+    source: result.source,
+    resolvedDate: result.resolvedDate,
+    player: result.pitcherName,
+    team: result.team,
+    opponent: result.opponentTeam,
+    view: result.view,
+    window: result.window,
+    split: result.split,
+    pitchType: result.pitchType,
+    compareTo: result.compareTo,
+  });
+}
+
+export function buildPitcherArsenalEmbed(result, fileName = 'pitcher-arsenal-chart.png') {
+  return buildBaseballChartEmbed({
+    title: 'Pitcher Arsenal Suite',
+    description: 'Pitch shape, movement, usage, and outcome view for the selected pitcher.',
+    fileName,
+    color: PALETTE.success,
+    read: result.read,
+    source: result.source,
+    resolvedDate: result.resolvedDate,
+    player: result.pitcherName,
+    team: result.team,
+    opponent: result.opponentTeam,
+    view: result.view,
+    window: result.window,
+    split: result.split,
+    pitchType: result.pitchType,
+  });
+}
+
+export function buildPitcherLocationEmbed(result, fileName = 'pitcher-location-chart.png') {
+  return buildBaseballChartEmbed({
+    title: 'Pitcher Location Suite',
+    description: 'Attack pattern and zone distribution for the selected pitcher.',
+    fileName,
+    color: PALETTE.success,
+    read: result.read,
+    source: result.source,
+    resolvedDate: result.resolvedDate,
+    player: result.pitcherName,
+    team: result.team,
+    opponent: result.opponentTeam,
+    view: result.view,
+    split: result.split,
+    pitchType: result.pitchType,
+    countBucket: result.countBucket,
+  });
+}
+
+export function buildPitcherApproachEmbed(result, fileName = 'pitcher-approach-chart.png') {
+  return buildBaseballChartEmbed({
+    title: 'Pitcher Approach Suite',
+    description: 'Count-state and sequencing view for the selected pitcher.',
+    fileName,
+    color: PALETTE.success,
+    read: result.read,
+    source: result.source,
+    resolvedDate: result.resolvedDate,
+    player: result.pitcherName,
+    team: result.team,
+    opponent: result.opponentTeam,
+    view: result.view,
+    window: result.window,
+    split: result.split,
+    pitchType: result.pitchType,
+  });
+}
+
+export function buildPitcherCompareEmbed(result, fileName = 'pitcher-compare-chart.png') {
+  return buildBaseballChartEmbed({
+    title: 'Pitcher Compare Suite',
+    description: 'Baseline, year-over-year, and risk/reward comparison for the selected pitcher.',
+    fileName,
+    color: PALETTE.success,
+    read: result.read,
+    source: result.source,
+    resolvedDate: result.resolvedDate,
+    player: result.pitcherName,
+    team: result.team,
+    opponent: result.opponentTeam,
+    view: result.view,
+    window: result.window,
+  });
+}
+
 function escapeCsv(value) {
   const stringValue = String(value);
   if (stringValue.includes(',') || stringValue.includes('"') || stringValue.includes('\n')) {

src/index.js

@@ -66,6 +66,11 @@ import {
   buildKMatchupEmbed,
   buildKProfileEmbed,
   buildKTrendEmbed,
+  buildPitcherApproachEmbed,
+  buildPitcherArsenalEmbed,
+  buildPitcherCompareEmbed,
+  buildPitcherLocationEmbed,
+  buildPitcherTrendEmbed,
   buildExportAttachment,
   buildMatchupHealthEmbed,
   buildMatchupHittersEmbed,
@@ -99,6 +104,11 @@ import {
   createKMatchupCardPng,
   createKProfileRadarPng,
   createKTrendChartPng,
+  createPitcherApproachChartPng,
+  createPitcherArsenalChartPng,
+  createPitcherCompareChartPng,
+  createPitcherLocationChartPng,
+  createPitcherTrendChartPng,
 } from './baseball-charts.js';
 
 const BET_MODAL_PREFIX = 'bet-entry-modal';
@@ -580,6 +590,11 @@ async function handleChatInput(interaction, store, config) {
     'kprofile',
     'kmatchup',
     'kcount',
+    'pitchertrend',
+    'pitcherarsenal',
+    'pitcherlocation',
+    'pitcherapproach',
+    'pitchercompare',
   ].includes(commandName)) {
     await handleBaseballChartCommand(interaction, config, commandName);
     return;
@@ -638,8 +653,13 @@ function getBaseballChartFilters(interaction) {
     pitcher: interaction.options.getString('pitcher') ?? undefined,
     date: interaction.options.getString('date') ?? undefined,
     limit: interaction.options.getInteger('limit') ?? undefined,
-    window: interaction.options.getInteger('window') ?? undefined,
+    window: interaction.options.getString('window') ?? interaction.options.getInteger('window') ?? undefined,
     book: interaction.options.getString('book') ?? undefined,
+    view: interaction.options.getString('view') ?? undefined,
+    pitchType: interaction.options.getString('pitch_type') ?? undefined,
+    split: interaction.options.getString('split') ?? undefined,
+    compareTo: interaction.options.getString('compare_to') ?? undefined,
+    countBucket: interaction.options.getString('count_bucket') ?? undefined,
   };
 }
 
@@ -1790,6 +1810,105 @@ async function handleBaseballChartCommand(interaction, config, commandName) {
       return;
     }
 
+    if (commandName === 'pitchertrend') {
+      const result = await matchupService.getPitcherTrendChartData(filters);
+      const png = await createPitcherTrendChartPng({
+        chartType: result.chartType,
+        title: result.title,
+        subtitle: result.subtitle,
+        points: result.points,
+        primaryLabel: result.primaryLabel,
+        overlays: result.overlays,
+        labels: result.labels,
+        values: result.values,
+        datasets: result.datasets,
+      });
+      const fileName = 'pitcher-trend-chart.png';
+      await finalizeDeferredInteraction(interaction, {
+        embeds: [buildPitcherTrendEmbed(result, fileName)],
+        files: [buildBaseballChartAttachment(png, fileName)],
+      });
+      return;
+    }
+
+    if (commandName === 'pitcherarsenal') {
+      const result = await matchupService.getPitcherArsenalChartData(filters);
+      const png = await createPitcherArsenalChartPng({
+        title: result.title,
+        subtitle: result.subtitle,
+        pitcherName: result.pitcherName,
+        teamLine: `${result.team ?? 'N/A'}${result.opponentTeam ? ` vs ${result.opponentTeam}` : ''}`,
+        columns: result.columns,
+        rows: result.rows,
+        read: result.read,
+      });
+      const fileName = 'pitcher-arsenal-chart.png';
+      await finalizeDeferredInteraction(interaction, {
+        embeds: [buildPitcherArsenalEmbed(result, fileName)],
+        files: [buildBaseballChartAttachment(png, fileName)],
+      });
+      return;
+    }
+
+    if (commandName === 'pitcherlocation') {
+      const result = await matchupService.getPitcherLocationChartData(filters);
+      const png = await createPitcherLocationChartPng({
+        title: result.title,
+        subtitle: result.subtitle,
+        pitcherName: result.pitcherName,
+        teamLine: `${result.team ?? 'N/A'}${result.opponentTeam ? ` vs ${result.opponentTeam}` : ''}`,
+        metricLabel: result.view,
+        cells: result.cells,
+        bestOverlay: result.bestOverlay,
+        shapeSummary: result.shapeSummary,
+        read: result.read,
+      });
+      const fileName = 'pitcher-location-chart.png';
+      await finalizeDeferredInteraction(interaction, {
+        embeds: [buildPitcherLocationEmbed(result, fileName)],
+        files: [buildBaseballChartAttachment(png, fileName)],
+      });
+      return;
+    }
+
+    if (commandName === 'pitcherapproach') {
+      const result = await matchupService.getPitcherApproachChartData(filters);
+      const png = await createPitcherApproachChartPng({
+        title: result.title,
+        subtitle: result.subtitle,
+        labels: result.labels,
+        datasets: result.datasets,
+      });
+      const fileName = 'pitcher-approach-chart.png';
+      await finalizeDeferredInteraction(interaction, {
+        embeds: [buildPitcherApproachEmbed(result, fileName)],
+        files: [buildBaseballChartAttachment(png, fileName)],
+      });
+      return;
+    }
+
+    if (commandName === 'pitchercompare') {
+      const result = await matchupService.getPitcherCompareChartData(filters);
+      const png = await createPitcherCompareChartPng({
+        chartType: result.chartType,
+        title: result.title,
+        subtitle: result.subtitle,
+        pitcherName: result.pitcherName,
+        teamLine: `${result.team ?? 'N/A'}${result.opponentTeam ? ` vs ${result.opponentTeam}` : ''}`,
+        points: result.points,
+        rows: result.rows,
+        compareLabel: result.compareLabel,
+        baselineLabel: result.baselineLabel,
+        read: result.read,
+      });
+      const fileName = 'pitcher-compare-chart.png';
+      await finalizeDeferredInteraction(interaction, {
+        embeds: [buildPitcherCompareEmbed(result, fileName)],
+        files: [buildBaseballChartAttachment(png, fileName)],
+      });
+      return;
+    }
+
     await finalizeDeferredInteraction(interaction, {
       embeds: [buildErrorEmbed('Command unavailable', 'That baseball chart command is not wired up yet.')],
     });
@@ -1845,6 +1964,11 @@ function shouldDeferImmediately(commandName) {
     'kprofile',
     'kmatchup',
     'kcount',
+    'pitchertrend',
+    'pitcherarsenal',
+    'pitcherlocation',
+    'pitcherapproach',
+    'pitchercompare',
   ].includes(commandName);
 }
 

src/matchups.js

@@ -1254,6 +1254,379 @@ function formatMetricValue(value, type = 'number') {
   return numeric.toFixed(1);
 }
 
+function getPitcherWindowPointLimit(window) {
+  switch (String(window ?? 'last_5')) {
+    case 'last_10':
+      return 10;
+    case 'season_2026':
+      return 15;
+    case 'career':
+      return 6;
+    default:
+      return 5;
+  }
+}
+
+function windowLabel(window) {
+  switch (String(window ?? 'last_5')) {
+    case 'last_10':
+      return 'last 10';
+    case 'season_2026':
+      return 'season 2026';
+    case 'career':
+      return 'career';
+    default:
+      return 'last 5';
+  }
+}
+
+function splitLabel(split) {
+  switch (String(split ?? 'overall')) {
+    case 'vs_lhb':
+      return 'vs LHB';
+    case 'vs_rhb':
+      return 'vs RHB';
+    default:
+      return 'overall';
+  }
+}
+
+function countBucketLabel(bucket) {
+  switch (String(bucket ?? 'all')) {
+    case 'first_pitch':
+      return 'first pitch';
+    case 'ahead':
+      return 'ahead';
+    case 'behind':
+      return 'behind';
+    case 'putaway':
+      return 'putaway';
+    case 'two_strike':
+      return 'two strike';
+    default:
+      return 'all counts';
+  }
+}
+
+function labelForCompareTarget(compareTo) {
+  switch (String(compareTo ?? 'career')) {
+    case 'season_2026':
+      return 'Season 2026';
+    case 'prior_5':
+      return 'Prior 5';
+    case 'prior_10':
+      return 'Prior 10';
+    default:
+      return 'Career';
+  }
+}
+
+function pitcherTrendTitle(view) {
+  switch (view) {
+    case 'velo':
+      return 'Velocity Trend';
+    case 'spin':
+      return 'Spin Trend';
+    case 'release':
+      return 'Release Trend';
+    default:
+      return 'Pitcher Trend';
+  }
+}
+
+function pitcherTrendPrimaryLabel(view) {
+  switch (view) {
+    case 'velo':
+      return 'Release Speed';
+    case 'spin':
+      return 'Spin Rate';
+    case 'release':
+      return 'Extension';
+    default:
+      return 'Pitcher Trend';
+  }
+}
+
+function pitcherTrendOverlayLabel(view, index) {
+  if (view === 'velo') {
+    return index === 0 ? 'Effective Speed' : 'Move Z';
+  }
+  if (view === 'spin') {
+    return index === 0 ? 'Spin Efficiency Proxy' : 'Spin Axis';
+  }
+  return index === 0 ? 'Release X' : 'Release Z';
+}
+
+function formatTrendOverlayValue(view, index, value) {
+  const numeric = numberOrNull(value) ?? 0;
+  if (view === 'spin' && index === 0) {
+    return numeric * 100;
+  }
+  return numeric;
+}
+
+function pitcherTrendRead(view, points, pitchType) {
+  const latest = points[points.length - 1];
+  if (view === 'velo') {
+    return `${pitchType ? `${pitchType} ` : ''}velocity most recently checked in at ${formatMetricValue(latest?.value)}.`;
+  }
+  if (view === 'spin') {
+    return `${pitchType ? `${pitchType} ` : ''}spin most recently checked in at ${formatMetricValue(latest?.value)}.`;
+  }
+  return `${pitchType ? `${pitchType} ` : ''}release metrics track extension with position overlays across the selected window.`;
+}
+
+function pitcherArsenalTitle(view) {
+  switch (view) {
+    case 'shape':
+      return 'Pitch Shape Card';
+    case 'movement':
+      return 'Movement Cluster';
+    case 'usage':
+      return 'Pitch Mix Usage';
+    case 'evolution':
+      return 'Arsenal Evolution';
+    case 'outcomes':
+      return 'Pitch Outcomes';
+    case 'platoon':
+      return 'Platoon Arsenal';
+    default:
+      return 'Pitcher Arsenal';
+  }
+}
+
+function pitcherLocationTitle(view) {
+  switch (view) {
+    case 'bypitch':
+      return 'Location by Pitch';
+    case 'twostrike':
+      return 'Two Strike Location';
+    case 'chase':
+      return 'Chase Attack Map';
+    case 'damage':
+      return 'Damage Allowed Map';
+    case 'miss':
+      return 'Miss Location Map';
+    default:
+      return 'Location Heatmap';
+  }
+}
+
+function pitcherLocationRead(view) {
+  switch (view) {
+    case 'damage':
+      return 'Hotter cells flag where contact quality has done the most damage.';
+    case 'miss':
+      return 'Hotter cells flag where swings and misses show up most often.';
+    case 'chase':
+      return 'Hotter cells flag where the pitcher attacks for chase or edge pressure.';
+    default:
+      return 'Hotter cells show where the pitcher lives most often in the selected view.';
+  }
+}
+
+function pitcherApproachTitle(view) {
+  switch (view) {
+    case 'count_whiff':
+      return 'Whiff by Count';
+    case 'ahead_behind':
+      return 'Ahead vs Behind';
+    case 'first_pitch':
+      return 'First Pitch Usage';
+    case 'putaway':
+      return 'Putaway Distribution';
+    default:
+      return 'Pitch Usage by Count';
+  }
+}
+
+function pitcherCompareTitle(view) {
+  switch (view) {
+    case 'recent_vs_baseline':
+      return 'Recent vs Baseline';
+    case 'year_over_year':
+      return 'Year Over Year';
+    default:
+      return 'Current vs Career';
+  }
+}
+
+function buildPitchTypeSqlFilter(pitchTypeColumn, pitchNameColumn, parameterIndex) {
+  const pitchTypeExpr = pitchTypeColumn === 'NULL'
+    ? 'NULL'
+    : `UPPER(COALESCE(NULLIF(${pitchTypeColumn}, ''), NULLIF(${pitchNameColumn}, '')))`;
+  const pitchNameExpr = `UPPER(COALESCE(NULLIF(${pitchNameColumn}, ''), NULLIF(${pitchTypeColumn}, '')))`;
+  return `AND ($${parameterIndex}::text IS NULL OR ${pitchTypeExpr} = UPPER($${parameterIndex}) OR ${pitchNameExpr} = UPPER($${parameterIndex}))`;
+}
+
+function buildSplitSqlFilter(columnExpression, parameterIndex) {
+  return `AND ($${parameterIndex}::text IS NULL OR $${parameterIndex}::text = 'overall' OR LOWER(${columnExpression}) = CASE WHEN $${parameterIndex}::text = 'vs_lhb' THEN 'l' WHEN $${parameterIndex}::text = 'vs_rhb' THEN 'r' ELSE LOWER(${columnExpression}) END)`;
+}
+
+function deriveCountBucket(row) {
+  const balls = numberOrNull(row.balls) ?? 0;
+  const strikes = numberOrNull(row.strikes) ?? 0;
+  if (balls === 0 && strikes === 0) {
+    return 'first_pitch';
+  }
+  if (strikes >= 2) {
+    return 'putaway';
+  }
+  if (strikes > balls) {
+    return 'ahead';
+  }
+  if (balls > strikes) {
+    return 'behind';
+  }
+  return 'even';
+}
+
+function matchesCountBucket(row, countBucket) {
+  if (!countBucket || countBucket === 'all') {
+    return true;
+  }
+  if (countBucket === 'two_strike') {
+    return (numberOrNull(row.strikes) ?? 0) >= 2;
+  }
+  return deriveCountBucket(row) === countBucket;
+}
+
+function bucketPlateCell(plateX, plateZ) {
+  const x = numberOrNull(plateX) ?? 0;
+  const z = numberOrNull(plateZ) ?? 2.8;
+  const col = x < -0.28 ? 0 : x > 0.28 ? 2 : 1;
+  const row = z > 3.3 ? 0 : z < 2.5 ? 2 : 1;
+  return row * 3 + col + 1;
+}
+
+function isWhiffDescription(description) {
+  const normalized = normalizeText(description);
+  return ['swinging strike', 'swinging strike blocked', 'foul tip'].some((token) => normalized.includes(token));
+}
+
+function isChaseLikeLocation(plateX, plateZ) {
+  const x = Math.abs(numberOrNull(plateX) ?? 0);
+  const z = numberOrNull(plateZ) ?? 2.8;
+  return x > 0.85 || z < 1.7 || z > 3.9;
+}
+
+function buildPitcherLocationCells(rows, view) {
+  const buckets = new Map();
+  const totalRows = rows.length || 1;
+  for (const row of rows) {
+    const zone = bucketPlateCell(row.plate_x, row.plate_z);
+    const entry = buckets.get(zone) ?? { zone, pitches: 0, whiffs: 0, xwobaTotal: 0, xwobaCount: 0, chasePressure: 0 };
+    entry.pitches += 1;
+    if (isWhiffDescription(row.description)) {
+      entry.whiffs += 1;
+    }
+    const xwoba = numberOrNull(row.estimated_woba_using_speedangle);
+    if (xwoba !== null) {
+      entry.xwobaTotal += xwoba;
+      entry.xwobaCount += 1;
+    }
+    if (isChaseLikeLocation(row.plate_x, row.plate_z)) {
+      entry.chasePressure += 1;
+    }
+    buckets.set(zone, entry);
+  }
+
+  return [1, 2, 3, 4, 5, 6, 7, 8, 9].map((zone) => {
+    const entry = buckets.get(zone) ?? { zone, pitches: 0, whiffs: 0, xwobaTotal: 0, xwobaCount: 0, chasePressure: 0 };
+    const usage = entry.pitches / totalRows;
+    const whiffRate = entry.pitches > 0 ? entry.whiffs / entry.pitches : 0;
+    const damage = entry.xwobaCount > 0 ? entry.xwobaTotal / entry.xwobaCount : 0;
+    const chaseRate = entry.pitches > 0 ? entry.chasePressure / entry.pitches : 0;
+    let overlayValue = usage * 100;
+    if (view === 'miss') {
+      overlayValue = whiffRate * 100;
+    } else if (view === 'damage') {
+      overlayValue = damage * 100;
+    } else if (view === 'chase') {
+      overlayValue = chaseRate * 100;
+    }
+    return {
+      zone,
+      batterValue: whiffRate,
+      pitcherValue: usage,
+      overlayValue,
+    };
+  });
+}
+
+function buildPitcherLocationSummary(cells, view) {
+  const ranked = [...cells].sort((left, right) => compareNullableDescending(left.overlayValue, right.overlayValue)).slice(0, 3);
+  const zones = ranked.map((cell) => `Z${cell.zone}`).join(', ');
+  if (!zones) {
+    return 'No location summary available.';
+  }
+  if (view === 'damage') {
+    return `Most dangerous contact pockets sit in ${zones}.`;
+  }
+  if (view === 'miss') {
+    return `Best miss pockets sit in ${zones}.`;
+  }
+  return `Most frequent attack lanes sit in ${zones}.`;
+}
+
+function locationMetricSuffix(view) {
+  if (view === 'damage') {
+    return 'xwOBA';
+  }
+  return '%';
+}
+
+function buildPitcherApproachDatasets(rows, view) {
+  const buckets = view === 'ahead_behind'
+    ? ['ahead', 'even', 'behind']
+    : view === 'first_pitch'
+      ? ['first_pitch']
+      : view === 'putaway'
+        ? ['putaway']
+        : ['first_pitch', 'ahead', 'even', 'behind', 'putaway'];
+
+  const pitchUsage = new Map();
+  const pitchWhiffs = new Map();
+  const topCounts = new Map();
+
+  for (const row of rows) {
+    const bucket = deriveCountBucket(row);
+    const pitch = firstNonBlankValue(row.pitch_name, row.pitch_type, 'Unknown');
+    const key = `${pitch}|${bucket}`;
+    pitchUsage.set(key, (pitchUsage.get(key) ?? 0) + 1);
+    if (isWhiffDescription(row.description)) {
+      pitchWhiffs.set(key, (pitchWhiffs.get(key) ?? 0) + 1);
+    }
+    topCounts.set(pitch, (topCounts.get(pitch) ?? 0) + 1);
+  }
+
+  const topPitches = [...topCounts.entries()]
+    .sort((left, right) => right[1] - left[1])
+    .slice(0, 4)
+    .map(([pitch]) => pitch);
+
+  const datasets = topPitches.map((pitch) => ({
+    label: pitch,
+    values: buckets.map((bucket) => {
+      const key = `${pitch}|${bucket}`;
+      const usage = pitchUsage.get(key) ?? 0;
+      if (view === 'count_whiff') {
+        return usage > 0 ? ((pitchWhiffs.get(key) ?? 0) / usage) * 100 : 0;
+      }
+      const bucketTotal = [...topPitches].reduce((sum, name) => sum + (pitchUsage.get(`${name}|${bucket}`) ?? 0), 0);
+      return bucketTotal > 0 ? (usage / bucketTotal) * 100 : 0;
+    }),
+  })).filter((dataset) => dataset.values.some((value) => value > 0));
+
+  return {
+    labels: buckets.map((bucket) => countBucketLabel(bucket)),
+    datasets,
+    read: view === 'count_whiff'
+      ? 'Higher bars show where each pitch shape generates the most swing-and-miss pressure.'
+      : 'Higher bars show which pitch shapes own the selected count states most often.',
+  };
+}
+
 function findBestPlayerMatch(rows, key, playerName) {
   const normalizedNeedle = normalizeText(playerName);
   const exact = rows.find((row) => normalizeText(row[key]) === normalizedNeedle);
@@ -2522,6 +2895,714 @@ export class MatchupService {
     });
   }
 
+  async queryCockroachRows(text, values = []) {
+    if (typeof this.fallback?.query !== 'function') {
+      throw new Error('Cockroach query access is required for this pitcher chart.');
+    }
+    const result = await this.fallback.query(text, values);
+    return result?.rows ?? [];
+  }
+
+  async resolvePitcherSuiteContext(playerName, options = {}) {
+    return this.getCachedChartValue(this.buildChartCacheKey('pitcher-suite-context', {
+      pitcher: playerName,
+      date: options.date,
+    }), async () => {
+      const candidates = await this.queryCockroachRows(
+        `
+          WITH candidates AS (
+            SELECT
+              pitcher_name AS pitcher_name,
+              pitcher_id::text AS pitcher_id,
+              team,
+              opponent_team,
+              p_throws AS pitcher_hand,
+              slate_date::date AS latest_date,
+              1 AS source_rank
+            FROM public.pitcher_model_snapshots
+            WHERE LOWER(pitcher_name) LIKE LOWER($1)
+
+            UNION ALL
+
+            SELECT
+              pitcher_name AS pitcher_name,
+              pitcher_id::text AS pitcher_id,
+              team,
+              NULL::text AS opponent_team,
+              NULL::text AS pitcher_hand,
+              slate_date::date AS latest_date,
+              2 AS source_rank
+            FROM public.pitcher_game_outcomes
+            WHERE LOWER(pitcher_name) LIKE LOWER($1)
+
+            UNION ALL
+
+            SELECT
+              player_name AS pitcher_name,
+              pitcher::text AS pitcher_id,
+              NULL::text AS team,
+              NULL::text AS opponent_team,
+              p_throws AS pitcher_hand,
+              game_date::date AS latest_date,
+              3 AS source_rank
+            FROM public.live_pitch_mix_2026
+            WHERE LOWER(player_name) LIKE LOWER($1)
+
+            UNION ALL
+
+            SELECT
+              player_name AS pitcher_name,
+              pitcher::text AS pitcher_id,
+              NULL::text AS team,
+              NULL::text AS opponent_team,
+              COALESCE(pitcher_hand, p_throws) AS pitcher_hand,
+              game_date::date AS latest_date,
+              4 AS source_rank
+            FROM public.shared_pitcher_baseline_event_rows
+            WHERE LOWER(player_name) LIKE LOWER($1)
+          )
+          SELECT pitcher_name, pitcher_id, team, opponent_team, pitcher_hand, latest_date
+          FROM candidates
+          ORDER BY
+            CASE WHEN LOWER(pitcher_name) = LOWER($2) THEN 0 ELSE 1 END,
+            source_rank,
+            latest_date DESC NULLS LAST
+          LIMIT 1
+        `,
+        [`%${playerName}%`, playerName]
+      );
+
+      const identity = candidates[0];
+      if (!identity) {
+        throw new Error(`No pitcher chart profile matched "${playerName}".`);
+      }
+
+      const overviewRows = await this.queryCockroachRows(
+        `
+          SELECT
+            slate_date::date AS slate_date,
+            team,
+            opponent_team,
+            pitcher_name,
+            p_throws,
+            pitcher_score,
+            strikeout_score,
+            pitcher_matchup_adjustment,
+            strikeout_matchup_adjustment,
+            opponent_lineup_quality,
+            opponent_contact_threat,
+            opponent_whiff_tendency,
+            xwoba,
+            csw_pct,
+            swstr_pct,
+            putaway_pct,
+            ball_pct,
+            siera,
+            gb_pct,
+            gb_fb_ratio,
+            barrel_bip_pct,
+            hard_hit_pct
+          FROM public.pitcher_model_snapshots
+          WHERE LOWER(pitcher_name) = LOWER($1)
+            AND ($2::date IS NULL OR slate_date::date = $2::date)
+            AND split_key = $3
+            AND recent_window = $4
+            AND weighted_mode = $5
+          ORDER BY slate_date::date DESC
+          LIMIT 1
+        `,
+        [identity.pitcher_name, options.date ?? null, DEFAULT_SPLIT_KEY, DEFAULT_RECENT_WINDOW, DEFAULT_WEIGHTED_MODE]
+      );
+
+      let continuityContext = null;
+      try {
+        continuityContext = await this.getFastPitcherChartContext(identity.pitcher_name, options);
+      } catch {
+        continuityContext = null;
+      }
+
+      const overview = overviewRows[0] ?? continuityContext?.overview ?? {};
+
+      return {
+        source: 'cockroach',
+        resolvedDate: continuityContext?.resolvedDate ?? identity.latest_date ?? overview.slate_date ?? null,
+        pitcherName: continuityContext?.name ?? identity.pitcher_name,
+        pitcherId: String(identity.pitcher_id ?? '').trim() || null,
+        team: continuityContext?.team ?? identity.team ?? overview.team ?? null,
+        opponentTeam: continuityContext?.opponentTeam ?? identity.opponent_team ?? overview.opponent_team ?? null,
+        hand: continuityContext?.hand ?? identity.pitcher_hand ?? overview.p_throws ?? null,
+        overview,
+      };
+    });
+  }
+
+  async getPitcherTrendChartData(options = {}) {
+    return this.getCachedChartValue(this.buildChartCacheKey('pitcher-trend-suite', options), async () => {
+      const context = await this.resolvePitcherSuiteContext(options.pitcher, options);
+      const view = String(options.view ?? 'velo');
+      const window = String(options.window ?? 'last_5');
+      const split = String(options.split ?? 'overall');
+      const pitchType = options.pitchType ?? options.pitch_type ?? null;
+
+      if (view === 'results') {
+        const rows = await this.queryCockroachRows(
+          `
+            SELECT slate_date::date AS point_date, strikeouts, walks, hits_allowed, home_runs_allowed, outs_recorded
+            FROM public.pitcher_game_outcomes
+            WHERE LOWER(pitcher_name) = LOWER($1)
+            ORDER BY slate_date::date DESC
+            LIMIT $2
+          `,
+          [context.pitcherName, getPitcherWindowPointLimit(window)]
+        );
+        if (!rows.length) {
+          throw new Error(`No game outcome trend was available for ${context.pitcherName}.`);
+        }
+        const ordered = [...rows].reverse();
+        return {
+          ...context,
+          chartType: 'line',
+          view,
+          window,
+          title: `Pitcher Results - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | ${windowLabel(window)}`,
+          points: ordered.map((row) => ({ label: formatDateLabel(row.point_date), value: numberOrNull(row.strikeouts) ?? 0 })),
+          primaryLabel: 'Strikeouts',
+          overlays: [
+            { label: 'Walks', values: ordered.map((row) => numberOrNull(row.walks) ?? 0), color: '#f59e0b' },
+            { label: 'Hits Allowed', values: ordered.map((row) => numberOrNull(row.hits_allowed) ?? 0), color: '#f87171' },
+          ],
+          read: `Recent results show ${context.pitcherName} averaging ${averageOrNull(rows.map((row) => numberOrNull(row.strikeouts)))?.toFixed(1) ?? 'N/A'} strikeouts across the selected window.`,
+        };
+      }
+
+      if (view === 'form') {
+        const rows = await this.queryCockroachRows(
+          `
+            SELECT *
+            FROM public.shared_pitcher_rolling_summary
+            WHERE LOWER(player_name) = LOWER($1)
+            LIMIT 1
+          `,
+          [context.pitcherName]
+        );
+        const row = rows[0];
+        if (!row) {
+          throw new Error(`No rolling form summary was available for ${context.pitcherName}.`);
+        }
+        return {
+          ...context,
+          chartType: 'radar',
+          view,
+          window,
+          title: `Pitcher Form - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | rolling dashboard`,
+          labels: ['Velo 5G', 'Spin 5G', 'EV Allowed', 'HH Allowed', 'Barrel Allowed', 'HR Allowed'],
+          values: [
+            normalizeToRadarScore(row.pitcher_avg_release_speed_5g, { min: 88, max: 100 }),
+            normalizeToRadarScore(row.pitcher_avg_release_spin_rate_5g, { min: 1800, max: 2800 }),
+            normalizeToRadarScore(row.pitcher_ev_allowed_5g, { min: 80, max: 95, inverse: true }),
+            normalizeToRadarScore(row.pitcher_hard_hit_rate_allowed_5g, { min: 20, max: 50, inverse: true }),
+            normalizeToRadarScore(row.pitcher_barrel_rate_allowed_5g, { min: 2, max: 14, inverse: true }),
+            normalizeToRadarScore(row.pitcher_hr_allowed_rate_5g, { min: 0.005, max: 0.08, inverse: true }),
+          ],
+          read: `Recent form confidence is ${formatMetricValue(row.pitcher_rolling_confidence)} with ${numberOrNull(row.pitcher_games_in_window_5g) ?? 0} games in the five-game window.`,
+        };
+      }
+
+      if (view === 'baseline') {
+        const currentRows = await this.queryCockroachRows(
+          `
+            SELECT
+              AVG(release_speed) AS avg_release_speed,
+              AVG(release_spin_rate) AS avg_release_spin_rate,
+              AVG(release_extension) AS avg_release_extension,
+              AVG(pfx_x) AS avg_pfx_x,
+              AVG(pfx_z) AS avg_pfx_z
+            FROM public.live_pitch_mix_2026
+            WHERE LOWER(player_name) = LOWER($1)
+              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
+              ${buildSplitSqlFilter('stand', 3)}
+          `,
+          [context.pitcherName, pitchType, split]
+        );
+        const baselineRows = await this.queryCockroachRows(
+          `
+            SELECT
+              AVG(release_speed) AS avg_release_speed,
+              AVG(release_spin_rate) AS avg_release_spin_rate,
+              AVG(release_extension) AS avg_release_extension,
+              AVG(pfx_x) AS avg_pfx_x,
+              AVG(pfx_z) AS avg_pfx_z
+            FROM public.shared_pitcher_baseline_event_rows
+            WHERE LOWER(player_name) = LOWER($1)
+              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
+              ${buildSplitSqlFilter('COALESCE(batter_stand, stand)', 3)}
+          `,
+          [context.pitcherName, pitchType, split]
+        );
+        const current = currentRows[0] ?? {};
+        const baseline = baselineRows[0] ?? {};
+        return {
+          ...context,
+          chartType: 'bar',
+          view,
+          window,
+          title: `Pitcher Baseline - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | current vs baseline`,
+          labels: ['Velocity', 'Spin', 'Extension', 'Move X', 'Move Z'],
+          datasets: [
+            {
+              label: 'Season 2026',
+              values: [
+                numberOrNull(current.avg_release_speed) ?? 0,
+                (numberOrNull(current.avg_release_spin_rate) ?? 0) / 100,
+                (numberOrNull(current.avg_release_extension) ?? 0) * 10,
+                (numberOrNull(current.avg_pfx_x) ?? 0) * 10,
+                (numberOrNull(current.avg_pfx_z) ?? 0) * 10,
+              ],
+            },
+            {
+              label: labelForCompareTarget(options.compareTo ?? 'career'),
+              values: [
+                numberOrNull(baseline.avg_release_speed) ?? 0,
+                (numberOrNull(baseline.avg_release_spin_rate) ?? 0) / 100,
+                (numberOrNull(baseline.avg_release_extension) ?? 0) * 10,
+                (numberOrNull(baseline.avg_pfx_x) ?? 0) * 10,
+                (numberOrNull(baseline.avg_pfx_z) ?? 0) * 10,
+              ],
+            },
+          ],
+          read: `This view compares the current-season pitch shape and release baseline against ${labelForCompareTarget(options.compareTo ?? 'career').toLowerCase()}.`,
+        };
+      }
+
+      const tableName = window === 'career' ? 'public.shared_pitcher_baseline_event_rows' : 'public.live_pitch_mix_2026';
+      const dateExpr = window === 'career' ? 'source_season::text' : 'game_date::date';
+      const splitExpr = window === 'career' ? 'COALESCE(batter_stand, stand)' : 'stand';
+      const primaryExpr = view === 'velo'
+        ? 'AVG(release_speed)'
+        : view === 'spin'
+          ? 'AVG(release_spin_rate)'
+          : 'AVG(release_extension)';
+      const overlayAExpr = view === 'velo'
+        ? 'AVG(effective_speed)'
+        : view === 'spin'
+          ? 'AVG(spin_efficiency_proxy)'
+          : 'AVG(release_pos_x)';
+      const overlayBExpr = view === 'velo'
+        ? 'AVG(pfx_z)'
+        : view === 'spin'
+          ? 'AVG(spin_axis)'
+          : 'AVG(release_pos_z)';
+      const rows = await this.queryCockroachRows(
+        `
+          WITH grouped AS (
+            SELECT
+              ${dateExpr} AS point_key,
+              ${primaryExpr} AS primary_value,
+              ${overlayAExpr} AS overlay_a,
+              ${overlayBExpr} AS overlay_b
+            FROM ${tableName}
+            WHERE LOWER(player_name) = LOWER($1)
+              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
+              ${buildSplitSqlFilter(splitExpr, 3)}
+            GROUP BY point_key
+          )
+          SELECT point_key, primary_value, overlay_a, overlay_b
+          FROM grouped
+          ORDER BY point_key DESC
+          LIMIT $4
+        `,
+        [context.pitcherName, pitchType, split, getPitcherWindowPointLimit(window)]
+      );
+      if (!rows.length) {
+        throw new Error(`No ${view} trend points were available for ${context.pitcherName}.`);
+      }
+      const ordered = [...rows].reverse();
+      return {
+        ...context,
+        chartType: 'line',
+        view,
+        window,
+        pitchType,
+        split,
+        title: `${pitcherTrendTitle(view)} - ${context.pitcherName}`,
+        subtitle: `${context.team ?? 'N/A'} | ${windowLabel(window)}${pitchType ? ` | ${pitchType}` : ''}${split !== 'overall' ? ` | ${splitLabel(split)}` : ''}`,
+        points: ordered.map((row) => ({ label: String(row.point_key), value: numberOrNull(row.primary_value) ?? 0 })),
+        primaryLabel: pitcherTrendPrimaryLabel(view),
+        overlays: [
+          { label: pitcherTrendOverlayLabel(view, 0), values: ordered.map((row) => formatTrendOverlayValue(view, 0, row.overlay_a)), color: '#93c5fd' },
+          { label: pitcherTrendOverlayLabel(view, 1), values: ordered.map((row) => formatTrendOverlayValue(view, 1, row.overlay_b)), color: '#c084fc' },
+        ],
+        read: pitcherTrendRead(view, ordered, pitchType),
+      };
+    });
+  }
+
+  async getPitcherArsenalChartData(options = {}) {
+    return this.getCachedChartValue(this.buildChartCacheKey('pitcher-arsenal-suite', options), async () => {
+      const context = await this.resolvePitcherSuiteContext(options.pitcher, options);
+      const view = String(options.view ?? 'shape');
+      const window = String(options.window ?? 'last_5');
+      const split = String(options.split ?? 'overall');
+      const pitchType = options.pitchType ?? options.pitch_type ?? null;
+
+      if (['shape', 'movement'].includes(view)) {
+        const rows = await this.queryCockroachRows(
+          `
+            SELECT pitch_type, usage_rate, avg_velocity, avg_spin_rate, avg_extension, avg_pfx_x, avg_pfx_z, avg_spin_axis
+            FROM public.pitcher_arsenal_profiles
+            WHERE pitcher::text = $1
+              AND ($2::text IS NULL OR UPPER(pitch_type) = UPPER($2))
+            ORDER BY usage_rate DESC NULLS LAST, sample_size DESC NULLS LAST
+            LIMIT 6
+          `,
+          [context.pitcherId, pitchType]
+        );
+        if (!rows.length) {
+          throw new Error(`No arsenal shape profile was available for ${context.pitcherName}.`);
+        }
+        return {
+          ...context,
+          view,
+          window,
+          pitchType,
+          title: `${pitcherArsenalTitle(view)} - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | ${windowLabel(window)}`,
+          columns: view === 'shape'
+            ? [
+                { key: 'usage_rate', label: 'Usage', type: 'pct' },
+                { key: 'avg_velocity', label: 'Velo' },
+                { key: 'avg_spin_rate', label: 'Spin' },
+                { key: 'avg_pfx_z', label: 'Move Z' },
+                { key: 'avg_pfx_x', label: 'Move X' },
+              ]
+            : [
+                { key: 'usage_rate', label: 'Usage', type: 'pct' },
+                { key: 'avg_extension', label: 'Ext' },
+                { key: 'avg_pfx_x', label: 'Move X' },
+                { key: 'avg_pfx_z', label: 'Move Z' },
+                { key: 'avg_spin_axis', label: 'Axis' },
+              ],
+          rows: rows.map((row) => ({ label: row.pitch_type, ...row })),
+          read: `The arsenal card highlights ${rows[0]?.pitch_type ?? 'the primary pitch'} as the backbone of ${context.pitcherName}'s current shape profile.`,
+        };
+      }
+
+      const rows = await this.queryCockroachRows(
+        `
+          WITH latest_date AS (
+            SELECT MAX(slate_date)::date AS slate_date
+            FROM public.pitcher_arsenal_snapshots
+            WHERE LOWER(pitcher_name) = LOWER($1)
+          )
+          SELECT slate_date::date AS slate_date, pitch_name, batter_side_key, usage_pct, swstr_pct, hard_hit_pct, avg_release_speed, avg_spin_rate, xwoba_con
+          FROM public.pitcher_arsenal_snapshots
+          WHERE LOWER(pitcher_name) = LOWER($1)
+            AND slate_date::date = (SELECT slate_date FROM latest_date)
+            AND ($2::text IS NULL OR LOWER(batter_side_key) = LOWER($2))
+            AND ($3::text IS NULL OR UPPER(pitch_name) = UPPER($3))
+          ORDER BY usage_pct DESC NULLS LAST
+        `,
+        [context.pitcherName, split === 'overall' ? null : split, pitchType]
+      );
+      if (!rows.length) {
+        throw new Error(`No arsenal snapshot rows were available for ${context.pitcherName}.`);
+      }
+
+      if (view === 'evolution') {
+        const evolutionRows = await this.queryCockroachRows(
+          `
+            SELECT
+              pitch_name,
+              MIN(slate_date::date) AS first_date,
+              MAX(slate_date::date) AS last_date,
+              AVG(CASE WHEN slate_date::date = (SELECT MIN(slate_date::date) FROM public.pitcher_arsenal_snapshots WHERE LOWER(pitcher_name) = LOWER($1)) THEN usage_pct END) AS early_usage_pct,
+              AVG(CASE WHEN slate_date::date = (SELECT MAX(slate_date::date) FROM public.pitcher_arsenal_snapshots WHERE LOWER(pitcher_name) = LOWER($1)) THEN usage_pct END) AS latest_usage_pct,
+              AVG(CASE WHEN slate_date::date = (SELECT MAX(slate_date::date) FROM public.pitcher_arsenal_snapshots WHERE LOWER(pitcher_name) = LOWER($1)) THEN avg_spin_rate END) AS latest_spin_rate
+            FROM public.pitcher_arsenal_snapshots
+            WHERE LOWER(pitcher_name) = LOWER($1)
+            GROUP BY pitch_name
+            ORDER BY latest_usage_pct DESC NULLS LAST
+            LIMIT 6
+          `,
+          [context.pitcherName]
+        );
+        return {
+          ...context,
+          view,
+          window,
+          title: `${pitcherArsenalTitle(view)} - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | season evolution`,
+          columns: [
+            { key: 'early_usage_pct', label: 'Early', type: 'pct' },
+            { key: 'latest_usage_pct', label: 'Latest', type: 'pct' },
+            { key: 'usage_delta', label: 'Delta', type: 'pct_signed' },
+            { key: 'latest_spin_rate', label: 'Spin' },
+          ],
+          rows: evolutionRows.map((row) => ({
+            label: row.pitch_name,
+            ...row,
+            usage_delta: (numberOrNull(row.latest_usage_pct) ?? 0) - (numberOrNull(row.early_usage_pct) ?? 0),
+          })),
+          read: `${context.pitcherName}'s pitch mix evolution shows where usage has moved most since the start of 2026.`,
+        };
+      }
+
+      if (view === 'platoon') {
+        const platoonRows = await this.queryCockroachRows(
+          `
+            SELECT
+              pitch_name,
+              AVG(CASE WHEN LOWER(batter_side_key) = 'vs_lhb' THEN usage_pct END) AS usage_vs_lhb,
+              AVG(CASE WHEN LOWER(batter_side_key) = 'vs_rhb' THEN usage_pct END) AS usage_vs_rhb,
+              AVG(CASE WHEN LOWER(batter_side_key) = 'vs_lhb' THEN swstr_pct END) AS swstr_vs_lhb,
+              AVG(CASE WHEN LOWER(batter_side_key) = 'vs_rhb' THEN swstr_pct END) AS swstr_vs_rhb
+            FROM public.pitcher_arsenal_snapshots
+            WHERE LOWER(pitcher_name) = LOWER($1)
+            GROUP BY pitch_name
+            ORDER BY GREATEST(COALESCE(AVG(usage_pct), 0), COALESCE(AVG(swstr_pct), 0)) DESC
+            LIMIT 6
+          `,
+          [context.pitcherName]
+        );
+        return {
+          ...context,
+          view,
+          window,
+          title: `${pitcherArsenalTitle(view)} - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | platoon split`,
+          columns: [
+            { key: 'usage_vs_lhb', label: 'Vs LHB', type: 'pct' },
+            { key: 'usage_vs_rhb', label: 'Vs RHB', type: 'pct' },
+            { key: 'swstr_vs_lhb', label: 'Whiff L', type: 'pct' },
+            { key: 'swstr_vs_rhb', label: 'Whiff R', type: 'pct' },
+          ],
+          rows: platoonRows.map((row) => ({ label: row.pitch_name, ...row })),
+          read: `The platoon view shows how ${context.pitcherName} changes usage and whiff shape by hitter handedness.`,
+        };
+      }
+
+      return {
+        ...context,
+        view,
+        window,
+        split,
+        pitchType,
+        title: `${pitcherArsenalTitle(view)} - ${context.pitcherName}`,
+        subtitle: `${context.team ?? 'N/A'} | ${splitLabel(split)}${pitchType ? ` | ${pitchType}` : ''}`,
+        columns: view === 'usage'
+          ? [
+              { key: 'usage_pct', label: 'Usage', type: 'pct' },
+              { key: 'avg_release_speed', label: 'Velo' },
+              { key: 'swstr_pct', label: 'Whiff', type: 'pct' },
+              { key: 'hard_hit_pct', label: 'HH', type: 'pct' },
+            ]
+          : [
+              { key: 'usage_pct', label: 'Usage', type: 'pct' },
+              { key: 'swstr_pct', label: 'Whiff', type: 'pct' },
+              { key: 'hard_hit_pct', label: 'HH', type: 'pct' },
+              { key: 'xwoba_con', label: 'xwOBAcon', type: 'decimal' },
+            ],
+        rows: rows.slice(0, 6).map((row) => ({ label: row.pitch_name, ...row })),
+        read: `${context.pitcherName}'s ${view === 'usage' ? 'usage tree' : 'pitch outcomes'} are led by ${rows[0]?.pitch_name ?? 'the primary offering'}.`,
+      };
+    });
+  }
+
+  async getPitcherLocationChartData(options = {}) {
+    return this.getCachedChartValue(this.buildChartCacheKey('pitcher-location-suite', options), async () => {
+      const context = await this.resolvePitcherSuiteContext(options.pitcher, options);
+      const view = String(options.view ?? 'heatmap');
+      const split = String(options.split ?? 'overall');
+      const pitchType = options.pitchType ?? options.pitch_type ?? null;
+      const countBucket = String(options.countBucket ?? options.count_bucket ?? 'all');
+      const rows = await this.queryCockroachRows(
+        `
+          SELECT plate_x, plate_z, zone, pitch_type, pitch_name, stand, balls, strikes, description, events, estimated_woba_using_speedangle
+          FROM public.live_pitch_mix_2026
+          WHERE LOWER(player_name) = LOWER($1)
+            ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
+            ${buildSplitSqlFilter('stand', 3)}
+          ORDER BY game_date::date DESC, pitch_number DESC
+          LIMIT 4000
+        `,
+        [context.pitcherName, pitchType, split]
+      );
+      if (!rows.length) {
+        throw new Error(`No location rows were available for ${context.pitcherName}.`);
+      }
+      const filtered = rows.filter((row) => matchesCountBucket(row, countBucket));
+      if (!filtered.length) {
+        throw new Error(`No location rows matched the ${countBucketLabel(countBucket).toLowerCase()} filter for ${context.pitcherName}.`);
+      }
+      const cells = buildPitcherLocationCells(filtered, view);
+      const bestCell = [...cells].sort((left, right) => compareNullableDescending(left.overlayValue, right.overlayValue))[0];
+      return {
+        ...context,
+        view,
+        split,
+        pitchType,
+        countBucket,
+        title: `${pitcherLocationTitle(view)} - ${context.pitcherName}`,
+        subtitle: `${context.team ?? 'N/A'} | ${splitLabel(split)} | ${countBucketLabel(countBucket)}${pitchType ? ` | ${pitchType}` : ''}`,
+        cells,
+        bestOverlay: bestCell ? `Zone ${bestCell.zone} at ${(numberOrNull(bestCell.overlayValue) ?? 0).toFixed(0)} ${locationMetricSuffix(view)}` : 'No clear hot zone',
+        shapeSummary: buildPitcherLocationSummary(cells, view),
+        read: pitcherLocationRead(view),
+      };
+    });
+  }
+
+  async getPitcherApproachChartData(options = {}) {
+    return this.getCachedChartValue(this.buildChartCacheKey('pitcher-approach-suite', options), async () => {
+      const context = await this.resolvePitcherSuiteContext(options.pitcher, options);
+      const view = String(options.view ?? 'count_usage');
+      const split = String(options.split ?? 'overall');
+      const pitchType = options.pitchType ?? options.pitch_type ?? null;
+      const rows = await this.queryCockroachRows(
+        `
+          SELECT pitch_name, balls, strikes, description, stand
+          FROM public.live_pitch_mix_2026
+          WHERE LOWER(player_name) = LOWER($1)
+            ${buildPitchTypeSqlFilter('NULL', 'pitch_name', 2)}
+            ${buildSplitSqlFilter('stand', 3)}
+          ORDER BY game_date::date DESC, pitch_number DESC
+          LIMIT 4000
+        `,
+        [context.pitcherName, pitchType, split]
+      );
+      if (!rows.length) {
+        throw new Error(`No approach rows were available for ${context.pitcherName}.`);
+      }
+
+      const grouped = buildPitcherApproachDatasets(rows, view);
+      if (!grouped.datasets.length) {
+        throw new Error(`No ${view.replaceAll('_', ' ')} rows were available for ${context.pitcherName}.`);
+      }
+      return {
+        ...context,
+        view,
+        split,
+        pitchType,
+        title: `${pitcherApproachTitle(view)} - ${context.pitcherName}`,
+        subtitle: `${context.team ?? 'N/A'} | ${splitLabel(split)}${pitchType ? ` | ${pitchType}` : ''}`,
+        labels: grouped.labels,
+        datasets: grouped.datasets,
+        read: grouped.read,
+      };
+    });
+  }
+
+  async getPitcherCompareChartData(options = {}) {
+    return this.getCachedChartValue(this.buildChartCacheKey('pitcher-compare-suite', options), async () => {
+      const context = await this.resolvePitcherSuiteContext(options.pitcher, options);
+      const view = String(options.view ?? 'current_vs_career');
+      const window = String(options.window ?? 'last_5');
+
+      if (view === 'risk_reward') {
+        const rows = await this.queryCockroachRows(
+          `
+            SELECT slate_date::date AS point_date, strikeout_score, hard_hit_pct, xwoba, pitcher_score
+            FROM public.pitcher_model_snapshots
+            WHERE LOWER(pitcher_name) = LOWER($1)
+            ORDER BY slate_date::date DESC
+            LIMIT $2
+          `,
+          [context.pitcherName, getPitcherWindowPointLimit(window)]
+        );
+        if (!rows.length) {
+          throw new Error(`No risk/reward snapshot points were available for ${context.pitcherName}.`);
+        }
+        return {
+          ...context,
+          chartType: 'scatter',
+          view,
+          window,
+          title: `Risk Reward - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | ${windowLabel(window)}`,
+          points: rows.map((row) => ({
+            x: numberOrNull(row.hard_hit_pct) ?? 0,
+            y: numberOrNull(row.strikeout_score) ?? 0,
+            label: formatDateLabel(row.point_date),
+            highlight: false,
+          })),
+          read: `Upper-left points pair stronger strikeout upside with lower hard-hit risk across recent snapshot dates.`,
+        };
+      }
+
+      const currentRows = await this.queryCockroachRows(
+        `
+          SELECT AVG(release_speed) AS avg_release_speed, AVG(release_spin_rate) AS avg_release_spin_rate, AVG(release_extension) AS avg_release_extension, AVG(pfx_x) AS avg_pfx_x, AVG(pfx_z) AS avg_pfx_z
+          FROM public.live_pitch_mix_2026
+          WHERE LOWER(player_name) = LOWER($1)
+        `,
+        [context.pitcherName]
+      );
+      const baselineRows = await this.queryCockroachRows(
+        `
+          SELECT AVG(release_speed) AS avg_release_speed, AVG(release_spin_rate) AS avg_release_spin_rate, AVG(release_extension) AS avg_release_extension, AVG(pfx_x) AS avg_pfx_x, AVG(pfx_z) AS avg_pfx_z
+          FROM public.shared_pitcher_baseline_event_rows
+          WHERE LOWER(player_name) = LOWER($1)
+        `,
+        [context.pitcherName]
+      );
+      const current = currentRows[0] ?? {};
+      const baseline = baselineRows[0] ?? {};
+
+      if (view === 'year_over_year') {
+        const seasonRows = await this.queryCockroachRows(
+          `
+            SELECT source_season::text AS season_label, AVG(release_speed) AS avg_release_speed, AVG(release_spin_rate) AS avg_release_spin_rate, AVG(release_extension) AS avg_release_extension
+            FROM public.shared_pitcher_baseline_event_rows
+            WHERE LOWER(player_name) = LOWER($1)
+            GROUP BY source_season
+            ORDER BY source_season DESC
+            LIMIT 6
+          `,
+          [context.pitcherName]
+        );
+        return {
+          ...context,
+          chartType: 'compare',
+          view,
+          window,
+          title: `Year Over Year - ${context.pitcherName}`,
+          subtitle: `${context.team ?? 'N/A'} | arsenal evolution`,
+          compareLabel: 'Season',
+          baselineLabel: 'Metrics',
+          rows: seasonRows.map((row) => ({
+            label: row.season_label,
+            currentValue: formatMetricValue(row.avg_release_speed),
+            baselineValue: `${formatMetricValue(row.avg_release_spin_rate)} spin | ${formatMetricValue(row.avg_release_extension)} ext`,
+          })),
+          read: `${context.pitcherName}'s year-over-year card shows how velocity, spin, and extension have changed season to season.`,
+        };
+      }
+
+      const baselineLabel = view === 'recent_vs_baseline' ? 'Baseline' : 'Career';
+      return {
+        ...context,
+        chartType: 'compare',
+        view,
+        window,
+        title: `${pitcherCompareTitle(view)} - ${context.pitcherName}`,
+        subtitle: `${context.team ?? 'N/A'} | ${windowLabel(window)}`,
+        compareLabel: 'Current',
+        baselineLabel,
+        rows: [
+          { label: 'Velocity', currentValue: formatMetricValue(current.avg_release_speed), baselineValue: formatMetricValue(baseline.avg_release_speed) },
+          { label: 'Spin', currentValue: formatMetricValue(current.avg_release_spin_rate), baselineValue: formatMetricValue(baseline.avg_release_spin_rate) },
+          { label: 'Extension', currentValue: formatMetricValue(current.avg_release_extension), baselineValue: formatMetricValue(baseline.avg_release_extension) },
+          { label: 'Move X', currentValue: formatMetricValue(current.avg_pfx_x), baselineValue: formatMetricValue(baseline.avg_pfx_x) },
+          { label: 'Move Z', currentValue: formatMetricValue(current.avg_pfx_z), baselineValue: formatMetricValue(baseline.avg_pfx_z) },
+        ],
+        read: `This compare card shows where ${context.pitcherName}'s current pitch traits sit versus ${baselineLabel.toLowerCase()}.`,
+      };
+    });
+  }
+
   async buildHostedTrendPoints({ date, window, kind, playerName }) {
     const requestedWindow = Math.max(3, Math.min(14, Number(window ?? 7)));
     if (!this.hosted?.isConfigured?.()) {

test/baseball-charts.test.js

@@ -9,6 +9,11 @@ import {
   createKMatchupCardPng,
   createKProfileRadarPng,
   createKTrendChartPng,
+  createPitcherApproachChartPng,
+  createPitcherArsenalChartPng,
+  createPitcherCompareChartPng,
+  createPitcherLocationChartPng,
+  createPitcherTrendChartPng,
 } from '../src/baseball-charts.js';
 
 test('baseball chart renderers return png buffers', async () => {
@@ -48,6 +53,22 @@ test('baseball chart renderers return png buffers', async () => {
         { label: 'Slider', values: [20, 28, 46] },
       ],
     }),
+    createPitcherTrendChartPng({
+      title: 'Velocity Trend - Paul Skenes',
+      points: [
+        { label: '03-29', value: 98.2 },
+        { label: '04-01', value: 98.5 },
+        { label: '04-04', value: 98.8 },
+      ],
+      overlays: [{ label: 'Effective Speed', values: [96.4, 96.6, 96.9] }],
+    }),
+    createPitcherApproachChartPng({
+      labels: ['first pitch', 'ahead', 'behind'],
+      datasets: [
+        { label: 'Four-Seam', values: [52, 34, 19] },
+        { label: 'Slider', values: [18, 29, 36] },
+      ],
+    }),
   ]);
 
   for (const buffer of buffers) {
@@ -58,7 +79,7 @@ test('baseball chart renderers return png buffers', async () => {
 });
 
 test('custom baseball cards render png buffers', async () => {
-  const [zoneBuffer, matchupBuffer] = await Promise.all([
+  const [zoneBuffer, matchupBuffer, arsenalBuffer, locationBuffer, compareBuffer] = await Promise.all([
     createHrZoneOverlayCardPng({
       playerName: 'Yordan Alvarez',
       team: 'HOU',
@@ -86,9 +107,48 @@ test('custom baseball cards render png buffers', async () => {
       ],
       read: 'Whiff traits remain strong against a mid-pack strikeout lineup.',
     }),
+    createPitcherArsenalChartPng({
+      title: 'Pitch Shape Card - Paul Skenes',
+      pitcherName: 'Paul Skenes',
+      teamLine: 'PIT vs CHC',
+      columns: [
+        { key: 'usage_rate', label: 'Usage', type: 'pct' },
+        { key: 'avg_velocity', label: 'Velo' },
+        { key: 'avg_spin_rate', label: 'Spin' },
+      ],
+      rows: [
+        { label: 'FF', usage_rate: 0.42, avg_velocity: 99.1, avg_spin_rate: 2412 },
+        { label: 'SL', usage_rate: 0.31, avg_velocity: 87.4, avg_spin_rate: 2699 },
+      ],
+      read: 'The fastball-slider core drives the shape profile.',
+    }),
+    createPitcherLocationChartPng({
+      title: 'Location Heatmap - Paul Skenes',
+      pitcherName: 'Paul Skenes',
+      teamLine: 'PIT vs CHC',
+      cells: [
+        { zone: 1, batterValue: 0.14, pitcherValue: 0.08, overlayValue: 12 },
+        { zone: 5, batterValue: 0.28, pitcherValue: 0.22, overlayValue: 25 },
+      ],
+      bestOverlay: 'Zone 5 at 25 %',
+      shapeSummary: 'Center pocket usage dominates.',
+      read: 'Hotter cells show the main attack lanes.',
+    }),
+    createPitcherCompareChartPng({
+      title: 'Current vs Career - Paul Skenes',
+      pitcherName: 'Paul Skenes',
+      teamLine: 'PIT vs CHC',
+      compareLabel: 'Current',
+      baselineLabel: 'Career',
+      rows: [
+        { label: 'Velocity', currentValue: 98.6, baselineValue: 97.9 },
+        { label: 'Spin', currentValue: 2412, baselineValue: 2368 },
+      ],
+      read: 'Current stuff is slightly firmer than baseline.',
+    }),
   ]);
 
-  for (const buffer of [zoneBuffer, matchupBuffer]) {
+  for (const buffer of [zoneBuffer, matchupBuffer, arsenalBuffer, locationBuffer, compareBuffer]) {
     assert.ok(Buffer.isBuffer(buffer));
     assert.ok(buffer.length > 1000);
     assert.equal(buffer.subarray(0, 8).toString('hex'), '89504e470d0a1a0a');

test/matchups.test.js

@@ -631,6 +631,155 @@ test('commands include new matchup commands', () => {
   assert.ok(names.includes('kprofile'));
   assert.ok(names.includes('kmatchup'));
   assert.ok(names.includes('kcount'));
+  assert.ok(names.includes('pitchertrend'));
+  assert.ok(names.includes('pitcherarsenal'));
+  assert.ok(names.includes('pitcherlocation'));
+  assert.ok(names.includes('pitcherapproach'));
+  assert.ok(names.includes('pitchercompare'));
+});
+
+test('pitcher suite chart methods build cockroach-backed payloads from query access', async () => {
+  const service = new MatchupService(
+    { databaseUrl: 'postgresql://test', hosted: { baseUrl: 'https://example.test' } },
+    {
+      hosted: {
+        isConfigured: () => false,
+        async getHealth() {
+          return { configured: false, latestDate: null };
+        },
+      },
+      fallback: {
+        async query(text) {
+          if (text.includes('WITH candidates')) {
+            return {
+              rows: [{
+                pitcher_name: 'Paul Skenes',
+                pitcher_id: '301',
+                team: 'PIT',
+                opponent_team: 'CHC',
+                pitcher_hand: 'R',
+                latest_date: '2026-04-07',
+              }],
+            };
+          }
+          if (text.includes('FROM public.pitcher_model_snapshots') && text.includes('pitcher_score')) {
+            return {
+              rows: [{
+                slate_date: '2026-04-07',
+                team: 'PIT',
+                opponent_team: 'CHC',
+                pitcher_name: 'Paul Skenes',
+                p_throws: 'R',
+                pitcher_score: 92.1,
+                strikeout_score: 88.7,
+                pitcher_matchup_adjustment: 4.2,
+                strikeout_matchup_adjustment: 6.1,
+                opponent_lineup_quality: 87.2,
+                opponent_contact_threat: 82.4,
+                opponent_whiff_tendency: 27.8,
+                xwoba: 0.262,
+                csw_pct: 0.311,
+                swstr_pct: 0.178,
+                putaway_pct: 0.274,
+                ball_pct: 0.319,
+                siera: 2.94,
+                gb_pct: 0.44,
+                gb_fb_ratio: 1.23,
+                barrel_bip_pct: 0.051,
+                hard_hit_pct: 0.311,
+              }],
+            };
+          }
+          if (text.includes('FROM public.live_pitch_mix_2026') && text.includes('GROUP BY point_key')) {
+            return {
+              rows: [
+                { point_key: '2026-04-01', primary_value: 98.2, overlay_a: 96.4, overlay_b: 15.1 },
+                { point_key: '2026-04-04', primary_value: 98.8, overlay_a: 96.9, overlay_b: 15.5 },
+              ],
+            };
+          }
+          if (text.includes('FROM public.pitcher_arsenal_profiles')) {
+            return {
+              rows: [
+                { pitch_type: 'FF', usage_rate: 0.42, avg_velocity: 99.1, avg_spin_rate: 2412, avg_extension: 6.7, avg_pfx_x: -0.4, avg_pfx_z: 1.8, avg_spin_axis: 212 },
+                { pitch_type: 'SL', usage_rate: 0.31, avg_velocity: 87.4, avg_spin_rate: 2699, avg_extension: 6.3, avg_pfx_x: 0.9, avg_pfx_z: -0.2, avg_spin_axis: 101 },
+              ],
+            };
+          }
+          if (text.includes('SELECT plate_x, plate_z, zone')) {
+            return {
+              rows: [
+                { plate_x: -0.3, plate_z: 3.5, zone: 1, pitch_name: 'FF', pitch_type: 'FF', stand: 'L', balls: 0, strikes: 0, description: 'called_strike', events: null, estimated_woba_using_speedangle: null },
+                { plate_x: 0.0, plate_z: 2.9, zone: 5, pitch_name: 'SL', pitch_type: 'SL', stand: 'R', balls: 1, strikes: 2, description: 'swinging_strike', events: null, estimated_woba_using_speedangle: 0.18 },
+                { plate_x: 0.2, plate_z: 2.6, zone: 6, pitch_name: 'FF', pitch_type: 'FF', stand: 'R', balls: 1, strikes: 2, description: 'foul_tip', events: null, estimated_woba_using_speedangle: 0.11 },
+              ],
+            };
+          }
+          if (text.includes('SELECT pitch_name, balls, strikes, description, stand')) {
+            return {
+              rows: [
+                { pitch_name: 'FF', balls: 0, strikes: 0, description: 'called_strike', stand: 'L' },
+                { pitch_name: 'FF', balls: 1, strikes: 2, description: 'swinging_strike', stand: 'R' },
+                { pitch_name: 'SL', balls: 1, strikes: 2, description: 'swinging_strike', stand: 'R' },
+                { pitch_name: 'SL', balls: 2, strikes: 1, description: 'ball', stand: 'R' },
+              ],
+            };
+          }
+          if (text.includes('SELECT AVG(release_speed) AS avg_release_speed') && text.includes('public.shared_pitcher_baseline_event_rows')) {
+            return {
+              rows: [{
+                avg_release_speed: 97.9,
+                avg_release_spin_rate: 2368,
+                avg_release_extension: 6.5,
+                avg_pfx_x: -0.3,
+                avg_pfx_z: 1.6,
+              }],
+            };
+          }
+          if (text.includes('SELECT AVG(release_speed) AS avg_release_speed') && text.includes('public.live_pitch_mix_2026')) {
+            return {
+              rows: [{
+                avg_release_speed: 98.6,
+                avg_release_spin_rate: 2412,
+                avg_release_extension: 6.7,
+                avg_pfx_x: -0.4,
+                avg_pfx_z: 1.8,
+              }],
+            };
+          }
+          if (text.includes('SELECT slate_date::date AS point_date, strikeout_score, hard_hit_pct')) {
+            return {
+              rows: [
+                { point_date: '2026-04-01', strikeout_score: 84.2, hard_hit_pct: 28.1, xwoba: 0.252, pitcher_score: 88.4 },
+                { point_date: '2026-04-04', strikeout_score: 88.7, hard_hit_pct: 24.9, xwoba: 0.241, pitcher_score: 92.1 },
+              ],
+            };
+          }
+          return { rows: [] };
+        },
+        async getPlayerContext() {
+          throw new Error('not used');
+        },
+        async close() {},
+      },
+      logger: { debug() {}, warn() {} },
+    }
+  );
+
+  const [trend, arsenal, location, approach, compare] = await Promise.all([
+    service.getPitcherTrendChartData({ pitcher: 'paul skenes', view: 'velo', window: 'last_5' }),
+    service.getPitcherArsenalChartData({ pitcher: 'paul skenes', view: 'shape' }),
+    service.getPitcherLocationChartData({ pitcher: 'paul skenes', view: 'miss' }),
+    service.getPitcherApproachChartData({ pitcher: 'paul skenes', view: 'count_usage' }),
+    service.getPitcherCompareChartData({ pitcher: 'paul skenes', view: 'risk_reward', window: 'last_5' }),
+  ]);
+
+  assert.equal(trend.pitcherName, 'Paul Skenes');
+  assert.equal(trend.points.length, 2);
+  assert.equal(arsenal.rows[0].label, 'FF');
+  assert.equal(location.cells.length, 9);
+  assert.ok(approach.datasets.length > 0);
+  assert.equal(compare.chartType, 'scatter');
 });
 
 test('matchup embeds render core matchup data clearly', () => {