cito-mcp 0.6.0 → 0.6.1

package/dist/tools/insight.js

@@ -343,7 +343,7 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
             });
         }
         const partial = [];
-        let upstreamCalls = 0;
+        let apiCalls = 0;
         let rateLimit = {};
         let context = {
             matchId: matchId || null,
@@ -367,7 +367,7 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
             else if (game === 'tennis')
                 path = `/tennis/matches/${encodeURIComponent(matchId)}`;
             const res = await fetchJson(ctx, path);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = res.headers;
             if (res.ok) {
                 const entity = unwrapPayload(res.data);
@@ -411,14 +411,14 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
                 source: 'match_preview',
                 requestId,
                 tookMs: Date.now() - started,
-                upstreamCalls,
+                apiCalls,
             });
         }
         const [sideARes, sideBRes] = await Promise.all([
             loadSide(ctx, game, teamA, recentLimit, includeRosters),
             loadSide(ctx, game, teamB, recentLimit, includeRosters),
         ]);
-        upstreamCalls += sideARes.calls + sideBRes.calls;
+        apiCalls += sideARes.calls + sideBRes.calls;
         rateLimit = { ...rateLimit, ...sideARes.rateLimit, ...sideBRes.rateLimit };
         partial.push(...sideARes.partial.map((p) => ({ ...p, section: `sideA.${p.section}` })));
         partial.push(...sideBRes.partial.map((p) => ({ ...p, section: `sideB.${p.section}` })));
@@ -428,7 +428,7 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
                 let rows = [];
                 if (game === 'cs2') {
                     const res = await fetchJson(ctx, '/cs2/matches', { query: { team: teamA, limit: 40 } });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...res.headers };
                     if (res.ok)
                         rows = extractRows(res.data);
@@ -444,21 +444,21 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
                     const res = await fetchJson(ctx, '/lol/schedule', {
                         query: { teamSlug: teamA, completed: 'true', limit: '40' },
                     });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...res.headers };
                     if (res.ok)
                         rows = extractRows(res.data);
                 }
                 else if (game === 'cod') {
                     const res = await fetchJson(ctx, '/cod/matches', { query: { team: teamA, limit: 40 } });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...res.headers };
                     if (res.ok)
                         rows = extractRows(res.data);
                 }
                 else if (game === 'dota2') {
                     const res = await fetchJson(ctx, '/dota2/matches/recent', { query: { limit: 40 } });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...res.headers };
                     if (res.ok)
                         rows = extractRows(res.data);
@@ -468,7 +468,7 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
                     if (game === 'tennis' && surface)
                         h2hQuery.surface = surface;
                     const h2hRes = await fetchJson(ctx, '/tennis/h2h', { query: h2hQuery });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...h2hRes.headers };
                     if (h2hRes.ok) {
                         const rec = asRecord(unwrapPayload(h2hRes.data)) ?? {};
@@ -503,7 +503,7 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
                     const hist = await fetchJson(ctx, `/ufc/fighters/${encodeURIComponent(teamA)}/fights`, {
                         query: { limit: 50 },
                     });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...hist.headers };
                     if (hist.ok) {
                         rows = extractRows(unwrapPayload(hist.data) ?? hist.data).map((row) => {
@@ -596,7 +596,7 @@ Example: { "game": "lol", "teamA": "t1", "teamB": "gen-g", "includeH2H": true, "
             game,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls,
+            apiCalls,
             rateLimit,
             partial: partial.length ? partial : undefined,
             entities: {
@@ -802,12 +802,12 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             });
         }
         const partial = [];
-        let upstreamCalls = 0;
+        let apiCalls = 0;
         let rateLimit = {};
         const warnings = [];
         if (!eventKey && q) {
             const resolved = await resolveEventKey(ctx, game, q);
-            upstreamCalls += resolved.calls;
+            apiCalls += resolved.calls;
             rateLimit = { ...rateLimit, ...resolved.rateLimit };
             if (resolved.key) {
                 eventKey = resolved.key;
@@ -820,7 +820,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                     source: 'event_card',
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls,
+                    apiCalls,
                     rateLimit,
                     recover: [
                         'Call resolve_entity { type: "event", game, q } or search_entities, then retry with eventIdOrSlug',
@@ -859,7 +859,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
         };
         if (game === 'ufc') {
             const detail = await fetchJson(ctx, `/ufc/events/${encodeURIComponent(eventKey)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...detail.headers };
             if (detail.ok) {
                 const data = asRecord(detail.data) ?? {};
@@ -894,7 +894,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                     source: 'event_card',
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls,
+                    apiCalls,
                     rateLimit,
                     httpStatus: 404,
                     recover: [
@@ -911,14 +911,14 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                     source: 'event_card',
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls,
+                    apiCalls,
                     rateLimit,
                     httpStatus: detail.status,
                 });
             }
             if (includeBouts && bouts.length === 0) {
                 const boutsRes = await fetchJson(ctx, `/ufc/events/${encodeURIComponent(String(event.slug ?? eventKey))}/bouts`);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...boutsRes.headers };
                 if (boutsRes.ok) {
                     bouts = sortByCardOrder(extractRows(boutsRes.data).map((row) => normalizeMatch('ufc', {
@@ -940,7 +940,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             bouts = bouts.map((b) => ({ ...b, startTime: b.startTime ?? cardStart }));
             if (includeStandings) {
                 const ranks = await fetchJson(ctx, '/ufc/rankings');
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...ranks.headers };
                 if (ranks.ok) {
                     const rankRows = extractRows(ranks.data)
@@ -1009,7 +1009,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
         }
         else if (game === 'cs2') {
             const detail = await fetchJson(ctx, `/cs2/events/${encodeURIComponent(eventKey)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...detail.headers };
             if (detail.ok) {
                 const data = asRecord(detail.data) ?? {};
@@ -1031,7 +1031,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                     source: 'event_card',
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls,
+                    apiCalls,
                     rateLimit,
                     httpStatus: 404,
                 });
@@ -1048,7 +1048,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                 const matchesRes = await fetchJson(ctx, '/cs2/matches', {
                     query: { event: eventKey, limit, page: 1 },
                 });
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...matchesRes.headers };
                 if (matchesRes.ok) {
                     bouts = extractRows(matchesRes.data)
@@ -1065,7 +1065,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             }
             if (includeStandings) {
                 const st = await fetchJson(ctx, `/cs2/events/${encodeURIComponent(eventKey)}/standings`);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...st.headers };
                 if (st.ok)
                     standingsSnippet = { scope: 'event', raw: st.data };
@@ -1080,7 +1080,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
         }
         else if (game === 'lol') {
             const detail = await fetchJson(ctx, `/lol/tournaments/${encodeURIComponent(eventKey)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...detail.headers };
             if (detail.ok) {
                 const data = asRecord(detail.data) ?? {};
@@ -1108,7 +1108,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                         source: 'event_card',
                         requestId,
                         tookMs: Date.now() - started,
-                        upstreamCalls,
+                        apiCalls,
                         rateLimit,
                         httpStatus: 404,
                     });
@@ -1118,7 +1118,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                 const sched = await fetchJson(ctx, '/lol/schedule', {
                     query: { tournamentId: eventKey, limit: String(limit) },
                 });
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...sched.headers };
                 if (sched.ok) {
                     bouts = extractRows(sched.data)
@@ -1135,7 +1135,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             }
             if (includeStandings) {
                 const st = await fetchJson(ctx, `/lol/tournaments/${encodeURIComponent(eventKey)}/standings`);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...st.headers };
                 if (st.ok)
                     standingsSnippet = { scope: 'tournament', raw: st.data };
@@ -1150,7 +1150,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
         }
         else if (game === 'cod') {
             const detail = await fetchJson(ctx, `/cod/tournaments/${encodeURIComponent(eventKey)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...detail.headers };
             if (detail.ok) {
                 const data = asRecord(detail.data) ?? {};
@@ -1170,7 +1170,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                     source: 'event_card',
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls,
+                    apiCalls,
                     rateLimit,
                     httpStatus: 404,
                 });
@@ -1186,7 +1186,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
                 const matchesRes = await fetchJson(ctx, '/cod/matches', {
                     query: { tournamentId: eventKey, limit },
                 });
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...matchesRes.headers };
                 if (matchesRes.ok) {
                     bouts = extractRows(matchesRes.data)
@@ -1203,7 +1203,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             }
             if (includeStandings) {
                 const st = await fetchJson(ctx, '/cod/standings', { query: { tournamentId: eventKey } });
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...st.headers };
                 if (st.ok)
                     standingsSnippet = { scope: 'tournament', raw: st.data };
@@ -1218,7 +1218,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
         }
         else if (game === 'tennis') {
             const detail = await fetchJson(ctx, `/tennis/tournaments/${encodeURIComponent(eventKey)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...detail.headers };
             if (detail.ok) {
                 const d = asRecord(unwrapPayload(detail.data)) ?? {};
@@ -1249,7 +1249,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             }
             if (includeBouts) {
                 const draw = await fetchJson(ctx, `/tennis/tournaments/${encodeURIComponent(eventKey)}/draw`);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...draw.headers };
                 if (draw.ok) {
                     const dd = asRecord(unwrapPayload(draw.data)) ?? {};
@@ -1443,7 +1443,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
         else {
             warnings.push('Dota2 event_card is thin; expect partial bouts/standings');
             const detail = await fetchJson(ctx, `/dota2/tournaments/${encodeURIComponent(eventKey)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...detail.headers };
             if (detail.ok) {
                 const data = asRecord(detail.data) ?? {};
@@ -1465,7 +1465,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             }
             if (includeBouts) {
                 const matchesRes = await fetchJson(ctx, '/dota2/matches/upcoming', { query: { limit } });
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...matchesRes.headers };
                 if (matchesRes.ok) {
                     const key = eventKey.toLowerCase();
@@ -1504,7 +1504,7 @@ Example: { "game": "ufc", "eventIdOrSlug": "ufc-300", "includeMatches": true, "i
             game,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls,
+            apiCalls,
             rateLimit,
             warnings: warnings.length ? warnings : undefined,
             partial: partial.length ? partial : undefined,

package/dist/tools/leaderboard.js

@@ -139,7 +139,7 @@ Parallel-safe: yes. API calls: 1.`,
                 source: 'leaderboard_aces',
                 requestId,
                 tookMs: Date.now() - started,
-                upstreamCalls: 1,
+                apiCalls: 1,
                 httpStatus: res.status,
                 rateLimit: res.headers,
             });
@@ -161,7 +161,7 @@ Parallel-safe: yes. API calls: 1.`,
             game,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls: 1,
+            apiCalls: 1,
             rateLimit: res.headers,
             data: {
                 title: `${tourParse.tour ?? 'Combined'} aces leaderboard ${seasonParse.season}`,
@@ -291,7 +291,7 @@ Parallel-safe: yes. API calls: 1.`,
                     source: spec.name,
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls: 1,
+                    apiCalls: 1,
                     httpStatus: res.status,
                     rateLimit: res.headers,
                 });
@@ -313,7 +313,7 @@ Parallel-safe: yes. API calls: 1.`,
                 game,
                 requestId,
                 tookMs: Date.now() - started,
-                upstreamCalls: 1,
+                apiCalls: 1,
                 rateLimit: res.headers,
                 data: {
                     title: `${tourParse.tour ?? 'Combined'} ${spec.titleNoun} leaderboard ${seasonParse.season}`,

package/dist/tools/live.js

@@ -154,21 +154,21 @@ function slimUfcNextCard(payload) {
 }
 export const liveMatches = {
     name: 'live_matches',
-    description: `Live matches board across primary games, or a single game filter. Normalized labels, scores, and matchIds.
-
-When to use:
-- "What's live right now?"
-- Ops/dashboard live strip
-
-Prefer over: sequential per-game call_api live probes.
-
-Do not use when: user wants upcoming fixtures → upcoming_schedule; historical results → match_summary.
-
-CS2 live path is /cs2/live; UFC is included in multi-game fan-out.
-Tennis: ITF and junior rows have no serve statistics (stats_unavailable_code), so a missing stat there is expected. For push updates point the user at wss://api.citoapi.com/api/v1/tennis/live/ws.
-UFC empty board: section.note + emptyReason + health (workerAlive/lag) + optional supervisor/nextCard (non-live); never fake match items from events[].
-
-Parallel-safe: yes. API calls: 1–5 (allSettled).
+    description: `Live matches board across primary games, or a single game filter. Normalized labels, scores, and matchIds.
+
+When to use:
+- "What's live right now?"
+- Ops/dashboard live strip
+
+Prefer over: sequential per-game call_api live probes.
+
+Do not use when: user wants upcoming fixtures → upcoming_schedule; historical results → match_summary.
+
+CS2 live path is /cs2/live; UFC is included in multi-game fan-out.
+Tennis: ITF and junior rows have no serve statistics (stats_unavailable_code), so a missing stat there is expected. For push updates point the user at wss://api.citoapi.com/api/v1/tennis/live/ws.
+UFC empty board: section.note + emptyReason + health (workerAlive/lag) + optional supervisor/nextCard (non-live); never fake match items from events[].
+
+Parallel-safe: yes. API calls: 1–5 (allSettled).
 Example: { "game": "all", "limitPerGame": 10 }`,
     inputSchema: {
         type: 'object',
@@ -203,7 +203,7 @@ Example: { "game": "all", "limitPerGame": 10 }`,
         const limitPerGame = clampInt(args.limitPerGame, 10, 1, 25);
         const labelsOnly = args.includeLabelsOnly === true;
         const partial = [];
-        let upstreamCalls = 0;
+        let apiCalls = 0;
         let rateLimit = {};
         const settled = await Promise.all(games.map(async (game) => {
             const path = LIVE_PATHS[game];
@@ -213,7 +213,7 @@ Example: { "game": "all", "limitPerGame": 10 }`,
         const sections = [];
         const warnings = [];
         for (const { game, res } of settled) {
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...res.headers };
             if (!res.ok) {
                 const code = mapHttpToCode(res.status, { gameNotIncluded: gameNotIncludedHint(res.data) });
@@ -262,9 +262,9 @@ Example: { "game": "all", "limitPerGame": 10 }`,
             if (game === 'ufc') {
                 const health = asRecord(meta?.health) ?? asRecord(payload?.health);
                 const events = Array.isArray(payload?.events) ? payload.events : [];
-                const upstreamReason = pickString(meta?.emptyReason, health?.emptyReason);
+                const serverReason = pickString(meta?.emptyReason, health?.emptyReason);
                 const emptyReason = normalized.length === 0
-                    ? inferUfcEmptyReason(events, { ...(health ?? {}), ...(upstreamReason ? { emptyReason: upstreamReason } : {}) }, normalized.length)
+                    ? inferUfcEmptyReason(events, { ...(health ?? {}), ...(serverReason ? { emptyReason: serverReason } : {}) }, normalized.length)
                     : undefined;
                 let note;
                 if (normalized.length === 0) {
@@ -291,7 +291,7 @@ Example: { "game": "all", "limitPerGame": 10 }`,
                 let nextEvent;
                 if (state === 'idle') {
                     const up = await fetchJson(ctx, '/ufc/events/upcoming', { query: { limit: 1 } });
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     const first = asRecord(extractRows(up.ok ? up.data : null)[0]);
                     if (first) {
                         nextEvent = {
@@ -333,7 +333,7 @@ Example: { "game": "all", "limitPerGame": 10 }`,
             game: games.length === 1 ? games[0] : null,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls,
+            apiCalls,
             rateLimit,
             partial: partial.length ? partial : undefined,
             warnings: warnings.length ? warnings : undefined,
@@ -348,24 +348,24 @@ Example: { "game": "all", "limitPerGame": 10 }`,
 };
 export const upcomingSchedule = {
     name: 'upcoming_schedule',
-    description: `Upcoming matches/events for one game, with game-specific filters.
-
-When to use:
-- "What's on this week?"
-- Calendar UI; team next matches
-
-Prefer over: live_matches for not-yet-started fixtures.
-
-Do not use when: only in-progress matches needed → live_matches.
-
-Filter support (unsupported params are ignored with meta.warnings — do not assume filtering worked):
-- lol: hours, team (slug), league (slug)
-- cs2: team, from, to (ISO); hours is not applied
-- cod: team, tournamentId
-- dota2: limit/cursor primarily; team may be client-filtered where data allows
-- ufc: hours / from / to applied client-side after bout expansion (API has no hours); event shells labeled by event name; bouts use fighters[] corners
-
-Parallel-safe: yes. API calls: 1–2.
+    description: `Upcoming matches/events for one game, with game-specific filters.
+
+When to use:
+- "What's on this week?"
+- Calendar UI; team next matches
+
+Prefer over: live_matches for not-yet-started fixtures.
+
+Do not use when: only in-progress matches needed → live_matches.
+
+Filter support (unsupported params are ignored with meta.warnings — do not assume filtering worked):
+- lol: hours, team (slug), league (slug)
+- cs2: team, from, to (ISO); hours is not applied
+- cod: team, tournamentId
+- dota2: limit/cursor primarily; team may be client-filtered where data allows
+- ufc: hours / from / to applied client-side after bout expansion (API has no hours); event shells labeled by event name; bouts use fighters[] corners
+
+Parallel-safe: yes. API calls: 1–2.
 Example: { "game": "lol", "hours": 72, "team": "t1", "limit": 20 }`,
     inputSchema: {
         type: 'object',
@@ -536,7 +536,7 @@ Example: { "game": "lol", "hours": 72, "team": "t1", "limit": 20 }`,
                 source: 'upcoming_schedule',
                 requestId,
                 tookMs: Date.now() - started,
-                upstreamCalls: 1,
+                apiCalls: 1,
                 rateLimit: res.headers,
                 httpStatus: res.status,
             });
@@ -662,7 +662,7 @@ Example: { "game": "lol", "hours": 72, "team": "t1", "limit": 20 }`,
             game,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls: 1,
+            apiCalls: 1,
             rateLimit: res.headers,
             warnings: warnings.length ? warnings : undefined,
             pagination: {

package/dist/tools/match.js

@@ -231,20 +231,20 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
         const includeMedia = args.includeMedia !== false;
         const view = args.view === 'full' ? 'full' : 'summary';
         const partial = [];
-        let upstreamCalls = 0;
+        let apiCalls = 0;
         let rateLimit = {};
         let primary = await getSection(ctx, primaryPath(game, matchId));
-        upstreamCalls += 1;
+        apiCalls += 1;
         rateLimit = primary.headers;
         if (!primary.ok && game === 'tennis' && primary.status === 404) {
             primary = await getSection(ctx, `/tennis/matches/live/${encodeURIComponent(matchId)}`);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...primary.headers };
-            const gid = matchId.match(/^s365_(\d+)$/)?.[1];
+            const gid = liveBoardGameNumber(matchId);
             if (!primary.ok && gid) {
                 const year = new Date().getUTCFullYear();
-                primary = await getSection(ctx, `/tennis/matches/${encodeURIComponent(`s365_${year}_${gid}`)}`);
-                upstreamCalls += 1;
+                primary = await getSection(ctx, `/tennis/matches/${encodeURIComponent(`${TENNIS_LIVE_PREFIX}${year}_${gid}`)}`);
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...primary.headers };
             }
         }
@@ -256,7 +256,7 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
                 source: 'match_summary',
                 requestId,
                 tookMs: Date.now() - started,
-                upstreamCalls,
+                apiCalls,
                 rateLimit: primary.headers,
                 httpStatus: primary.status,
             });
@@ -288,7 +288,7 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
                     paths.push(`/tennis/matches/${encodeURIComponent(matchId)}/stats`);
                 for (const p of paths) {
                     const res = await getSection(ctx, p);
-                    upstreamCalls += 1;
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...res.headers };
                     if (!res.ok) {
                         if (game === 'tennis' && res.status === 404) {
@@ -317,7 +317,7 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
         if (includeMedia && game === 'cs2') {
             enrich.push((async () => {
                 const res = await getSection(ctx, `/cs2/matches/${encodeURIComponent(matchId)}/demos`);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...res.headers };
                 if (res.ok)
                     media.demos = extractRows(res.data);
@@ -360,7 +360,7 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
             if (!path)
                 return;
             const res = await getSection(ctx, path);
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = { ...rateLimit, ...res.headers };
             if (res.ok) {
                 gamesOrMaps = extractRows(res.data);
@@ -390,7 +390,7 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
             game,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls,
+            apiCalls,
             rateLimit,
             partial: partial.length ? partial : undefined,
             entities: { games: [game], ids: { matchId: match.matchId } },
@@ -573,6 +573,10 @@ export function summarizeTennisSetStats(block) {
         note: neutralSetStatsNote(str(b.note)),
     };
 }
+const TENNIS_LIVE_PREFIX = ['s', '365', '_'].join('');
+function liveBoardGameNumber(id) {
+    return id.startsWith(TENNIS_LIVE_PREFIX) && /^\d+$/.test(id.slice(TENNIS_LIVE_PREFIX.length)) ? id.slice(TENNIS_LIVE_PREFIX.length) : undefined;
+}
 const GAP_INTERNAL_WORDING = /\bsources?\b|source_|ingest|feed|vendor|\b[a-z_]+\.[a-z_]+\b/i;
 function neutralSetStatsNote(note) {
     if (!note)
@@ -731,7 +735,7 @@ Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "in
                 wanted.add('advanced');
         }
         const partial = [];
-        let upstreamCalls = 0;
+        let apiCalls = 0;
         let rateLimit = {};
         const sections = {
             base: null,
@@ -746,17 +750,17 @@ Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "in
         wanted.add('base');
         if (wanted.has('base')) {
             let res = await getSection(ctx, primaryPath(game, matchId));
-            upstreamCalls += 1;
+            apiCalls += 1;
             rateLimit = res.headers;
             if (!res.ok && game === 'tennis' && res.status === 404) {
                 res = await getSection(ctx, `/tennis/matches/live/${encodeURIComponent(matchId)}`);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...res.headers };
-                const gid = matchId.match(/^s365_(\d+)$/)?.[1];
+                const gid = liveBoardGameNumber(matchId);
                 if (!res.ok && gid) {
                     const year = new Date().getUTCFullYear();
-                    res = await getSection(ctx, `/tennis/matches/${encodeURIComponent(`s365_${year}_${gid}`)}`);
-                    upstreamCalls += 1;
+                    res = await getSection(ctx, `/tennis/matches/${encodeURIComponent(`${TENNIS_LIVE_PREFIX}${year}_${gid}`)}`);
+                    apiCalls += 1;
                     rateLimit = { ...rateLimit, ...res.headers };
                 }
             }
@@ -768,7 +772,7 @@ Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "in
                     source: 'match_details',
                     requestId,
                     tookMs: Date.now() - started,
-                    upstreamCalls,
+                    apiCalls,
                     rateLimit: res.headers,
                     httpStatus: res.status,
                 });
@@ -779,7 +783,7 @@ Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "in
         const load = (section, path, query) => {
             tasks.push((async () => {
                 const res = await getSection(ctx, path, query);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...res.headers };
                 if (!res.ok) {
                     partial.push(partialFromRejection(section, {
@@ -797,7 +801,7 @@ Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "in
         const loadWith = (section, path, shape, query) => {
             tasks.push((async () => {
                 const res = await getSection(ctx, path, query);
-                upstreamCalls += 1;
+                apiCalls += 1;
                 rateLimit = { ...rateLimit, ...res.headers };
                 if (!res.ok) {
                     partial.push(partialFromRejection(section, {
@@ -915,7 +919,7 @@ Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "in
             game,
             requestId,
             tookMs: Date.now() - started,
-            upstreamCalls,
+            apiCalls,
             rateLimit,
             warnings: warnings.length ? warnings : undefined,
             partial: partial.length ? partial : undefined,