cito-mcp 0.6.0 → 0.6.1

package/dist/client.js

@@ -1,4 +1,4 @@
-import { MAX_RATE_LIMIT_RETRIES, MAX_UPSTREAM_RETRIES, MAX_WAIT_MS, UPSTREAM_BACKOFF_MS, classify429, getClock, jitterMs, newCallBudget, pacerFor, } from './pacing.js';
+import { MAX_RATE_LIMIT_RETRIES, MAX_SERVER_RETRIES, MAX_WAIT_MS, SERVER_BACKOFF_MS, classify429, getClock, jitterMs, newCallBudget, pacerFor, } from './pacing.js';
 import { PACKAGE_VERSION } from './version.js';
 export const DEFAULT_API_BASE = 'https://api.citoapi.com/api/v1';
 export const DEFAULT_MAX_RESPONSE_BYTES = 100 * 1024;
@@ -87,7 +87,7 @@ export async function fetchJson(ctx, path, opts) {
     const pacer = pacerFor(ctx.apiKey);
     const clock = getClock();
     let rateLimitRetries = 0;
-    let upstreamRetries = 0;
+    let serverRetries = 0;
     for (;;) {
         const gate = await pacer.acquire(budget);
         if (!gate.ok) {
@@ -117,7 +117,7 @@ export async function fetchJson(ctx, path, opts) {
                 text,
                 url,
                 rateLimit: event,
-                retries: rateLimitRetries + upstreamRetries,
+                retries: rateLimitRetries + serverRetries,
             };
         }
         let response;
@@ -162,9 +162,9 @@ export async function fetchJson(ctx, path, opts) {
             }
         }
         else if (response.status === 502 || response.status === 503) {
-            const wait = UPSTREAM_BACKOFF_MS + jitterMs();
-            if (upstreamRetries < MAX_UPSTREAM_RETRIES && clock.now() + wait < budget.deadline) {
-                upstreamRetries += 1;
+            const wait = SERVER_BACKOFF_MS + jitterMs();
+            if (serverRetries < MAX_SERVER_RETRIES && clock.now() + wait < budget.deadline) {
+                serverRetries += 1;
                 budget.retries += 1;
                 budget.waitedMs += wait;
                 log(`${response.status} on ${path}; retry after ${wait} ms`);
@@ -184,8 +184,8 @@ export async function fetchJson(ctx, path, opts) {
         };
         if (limited)
             result.rateLimit = limited;
-        if (rateLimitRetries + upstreamRetries > 0)
-            result.retries = rateLimitRetries + upstreamRetries;
+        if (rateLimitRetries + serverRetries > 0)
+            result.retries = rateLimitRetries + serverRetries;
         return result;
     }
 }

package/dist/envelope.js

@@ -80,8 +80,8 @@ export function successEnvelope(args) {
         meta.requestId = args.requestId;
     if (args.tookMs !== undefined)
         meta.tookMs = args.tookMs;
-    if (args.upstreamCalls !== undefined)
-        meta.apiCalls = args.upstreamCalls;
+    if (args.apiCalls !== undefined)
+        meta.apiCalls = args.apiCalls;
     if (args.rateLimit)
         meta.rateLimit = args.rateLimit;
     if (args.warnings?.length)
@@ -113,8 +113,8 @@ export function errorEnvelope(args) {
         meta.requestId = args.requestId;
     if (args.tookMs !== undefined)
         meta.tookMs = args.tookMs;
-    if (args.upstreamCalls !== undefined)
-        meta.apiCalls = args.upstreamCalls;
+    if (args.apiCalls !== undefined)
+        meta.apiCalls = args.apiCalls;
     if (args.rateLimit)
         meta.rateLimit = args.rateLimit;
     const error = {

package/dist/install.js

@@ -222,21 +222,21 @@ function parseArgs(argv) {
     }
     return out;
 }
-const HELP = `cito-mcp install — configure the Cito MCP server for your editors
-
-Usage:
-  npx cito-mcp install --key cito_xxx
-  npx cito-mcp install --key cito_xxx --client cursor,claude-code
-  npx cito-mcp install --dry-run
-
-Options:
-  --key <key>       Cito API key. Falls back to $CITO_API_KEY.
-  --client <ids>    Comma-separated: claude-code, claude-desktop, cursor, windsurf, codex, grok.
-                    Default: every client detected on this machine.
-  --base <url>      Override API base (staging / self-hosted).
-  --dry-run, -n     Show what would change; write nothing.
-  --help, -h        This message.
-
+const HELP = `cito-mcp install — configure the Cito MCP server for your editors
+
+Usage:
+  npx cito-mcp install --key cito_xxx
+  npx cito-mcp install --key cito_xxx --client cursor,claude-code
+  npx cito-mcp install --dry-run
+
+Options:
+  --key <key>       Cito API key. Falls back to $CITO_API_KEY.
+  --client <ids>    Comma-separated: claude-code, claude-desktop, cursor, windsurf, codex, grok.
+                    Default: every client detected on this machine.
+  --base <url>      Override API base (staging / self-hosted).
+  --dry-run, -n     Show what would change; write nothing.
+  --help, -h        This message.
+
 Get a key at https://citoapi.com/dashboard`;
 export async function runInstall(argv) {
     const args = parseArgs(argv);

package/dist/pacing.js

@@ -3,8 +3,8 @@ export const CONSTRAINED_CONCURRENT_PER_KEY = 2;
 export const CONSTRAINED_WINDOW_MS = 60_000;
 export const MAX_WAIT_MS = 20_000;
 export const MAX_RATE_LIMIT_RETRIES = 2;
-export const MAX_UPSTREAM_RETRIES = 1;
-export const UPSTREAM_BACKOFF_MS = 750;
+export const MAX_SERVER_RETRIES = 1;
+export const SERVER_BACKOFF_MS = 750;
 export const CALL_BUDGET_MS = 45_000;
 const DEFAULT_RETRY_AFTER_MS = 2_000;
 const WINDOW_MS = 60_000;

package/dist/scrub.js

@@ -1,8 +1,8 @@
+import { createHash } from 'node:crypto';
 const INTERNAL_KEYS = new Set([
     'emptyCardHeal',
     'llmValidation',
     'workerHostHint',
-    'scrapeMeta',
     'fetchMeta',
     'cacheKey',
     'failureSteps',
@@ -12,8 +12,6 @@ const INTERNAL_KEYS = new Set([
     'sourceUrl',
     'sourceUrls',
     'sourceIds',
-    'wikiUrl',
-    'wiki_url',
     'jsonLd',
     '_mergeSource',
     '_provenance',
@@ -32,21 +30,17 @@ const INTERNAL_KEYS = new Set([
     'profileImageAttemptedAt',
     'profileImageAttempts',
     'profileImageError',
-    'profileImageSteamAttemptedAt',
     'profileImageWorker',
     'ratingSource',
     'requiredSourceData',
     'rawText',
     'raw_text',
-    'scrapedAt',
-    'scraped_at',
     'sourceSummary',
     'sourceNote',
     'durableStatsTables',
     'lineupSource',
     'mapMediaSource',
     'rosterSource',
-    'upstream',
     'liveCandidateWindowMinutes',
     'rowHash',
     'row_hash',
@@ -73,20 +67,64 @@ const INTERNAL_KEYS = new Set([
     'data_source',
     'date_source',
     'meta_source',
-    'esportsMatchId',
-    'esportsGameId',
-    'esports_match_id',
-    'riotId',
-    'riot_id',
-    'steamId',
-    'steam_id',
-    'oddsKey',
-    'odds_key',
-    'provider',
-    'providers',
 ]);
 const ORIGIN_WORD_KEY = /(^|_)sources?($|_)|[a-z]Sources?($|[A-Z])|^_?sources?[A-Z]/;
-const PROVIDER_PREFIX_KEY = /^_?(hltv|open_?dota|polymarket|fight_?odds|ufc_?stats)/i;
+const DENIED_WORDS = new Set([
+    '007d859ffc608f3a',
+    '017055b00735cdaa',
+    '0991545f91164c02',
+    '0a86e4e8778e5bc4',
+    '211022d4dba1354e',
+    '2273bc83a7916501',
+    '343406fa95fefe9a',
+    '3511b94bd7795e3b',
+    '3fbfbeeeaddc4fe5',
+    '417ccb9b693bc11d',
+    '438338424376242e',
+    '53a828d1313e2f24',
+    '56279b500aeff149',
+    '63919bdfdccc4e03',
+    '68ec9e984bd969e2',
+    '735bda6297e559c5',
+    '7a9040b69cc466a0',
+    '7e25e5e9baf788fe',
+    '827ce7e74edb79b2',
+    '82d2e789811fae32',
+    '93b0c3823ffe6d0b',
+    'a85f3c568720d7da',
+    'aab85fb91587ac06',
+    'aaf4b5714130cfbd',
+    'ac4399e79599c5f9',
+    'b71515611a06c04e',
+    'b769513d718b1bdd',
+    'b8e91b77223e5c17',
+    'c833542aacad261c',
+    'cca8e34d07dda457',
+    'd656bca8c6e48174',
+    'dc2bcd7bbfe8773e',
+    'e08ad232764c86ab',
+    'e3bd135d984a0b44',
+    'e924b9eb04be6af2',
+    'f2b71a5a46b415e3',
+    'f578f53f4c52c9c9',
+    'fb25211c8b74e564',
+]);
+const DENIED_MEMO = new Map();
+function wordHash(word) {
+    return createHash('sha256').update(`cito-mcp-key-v1:${word}`).digest('hex').slice(0, 16);
+}
+function hasDeniedWord(key) {
+    let hit = DENIED_MEMO.get(key);
+    if (hit === undefined) {
+        const words = key.replace(/([a-z0-9])([A-Z])/g, '$1 $2').split(/[\s_-]+/).filter(Boolean).map((w) => w.toLowerCase());
+        const tries = [...words, ...words.slice(1).map((w, i) => `${words[i]}${w}`)];
+        hit = tries.some((w) => DENIED_WORDS.has(wordHash(w)));
+        if (DENIED_MEMO.size > 20_000)
+            DENIED_MEMO.clear();
+        DENIED_MEMO.set(key, hit);
+    }
+    return hit;
+}
 const PORTRAIT_LICENCE_KEY = /^(portrait|image|photo|picture)_?source_?url$/i;
 const STATUS_PARENTS = new Set(['dataAvailability', 'health']);
 const STATUS_KEYS = new Set(['strategy', 'samples']);
@@ -104,7 +142,7 @@ function isInternal(key, parentKey) {
         return false;
     return (INTERNAL_KEYS.has(key) ||
         ORIGIN_WORD_KEY.test(key) ||
-        PROVIDER_PREFIX_KEY.test(key) ||
+        hasDeniedWord(key) ||
         (STATUS_KEYS.has(key) && STATUS_PARENTS.has(parentKey)));
 }
 function scrub(node, parentKey, inError) {

package/dist/tools/combat.js

@@ -82,7 +82,7 @@ function payload(res) {
     const body = asRecord(res.data);
     return body && 'data' in body ? body.data : res.data;
 }
-function upstreamNotes(res) {
+function responseNotes(res) {
     const meta = asRecord(asRecord(res.data)?.meta);
     const out = {};
     if (typeof meta?.note === 'string')
@@ -114,7 +114,7 @@ function archiveGap(d, league, message, recover, calls = 0) {
         source: d.source,
         requestId: d.requestId,
         tookMs: Date.now() - d.started,
-        upstreamCalls: calls,
+        apiCalls: calls,
         retryable: false,
         recover,
     });
@@ -178,21 +178,21 @@ function begin(source) {
 }
 export const combatEvents = {
     name: 'combat_events',
-    description: `RAF wrestling, BKFC bare-knuckle or MMA archive (Bellator, PRIDE, Strikeforce, WEC, DREAM, EliteXC, Affliction) events.
-
-When to use:
-- "When is the next RAF / BKFC card?", "recent BKFC results", "PRIDE results", "Bellator cards from 2015", schedule pages
-- Getting an event slug for combat_card
-
-Each event carries slug, name, date, local start time + timezone, venue/location, status and bout counts.
-The MMA archives (bellator, pride, strikeforce, wec, dream, elitexc, affliction, and mma = all of them, each
-event tagged with its real promotion) are closed: "when" defaults to "recent" (newest card first), and "upcoming"
-returns an empty list with data.note instead of failing.
-
-Prefer over: call_api /{league}/events.
-Do not use when: you already have the event slug and want its bouts (combat_card).
-
-Parallel-safe: yes. API calls: 1.
+    description: `RAF wrestling, BKFC bare-knuckle or MMA archive (Bellator, PRIDE, Strikeforce, WEC, DREAM, EliteXC, Affliction) events.
+
+When to use:
+- "When is the next RAF / BKFC card?", "recent BKFC results", "PRIDE results", "Bellator cards from 2015", schedule pages
+- Getting an event slug for combat_card
+
+Each event carries slug, name, date, local start time + timezone, venue/location, status and bout counts.
+The MMA archives (bellator, pride, strikeforce, wec, dream, elitexc, affliction, and mma = all of them, each
+event tagged with its real promotion) are closed: "when" defaults to "recent" (newest card first), and "upcoming"
+returns an empty list with data.note instead of failing.
+
+Prefer over: call_api /{league}/events.
+Do not use when: you already have the event slug and want its bouts (combat_card).
+
+Parallel-safe: yes. API calls: 1.
 Example: { "league": "bkfc", "when": "upcoming", "limit": 5 }`,
     inputSchema: {
         type: 'object',
@@ -228,7 +228,7 @@ Example: { "league": "bkfc", "when": "upcoming", "limit": 5 }`,
                 source: d.source,
                 requestId: d.requestId,
                 tookMs: Date.now() - d.started,
-                upstreamCalls: 0,
+                apiCalls: 0,
             });
         }
         const res = await fetchJson(ctx, `/${league}/events/${when}`, { query: { limit } });
@@ -236,35 +236,35 @@ Example: { "league": "bkfc", "when": "upcoming", "limit": 5 }`,
             return httpError(d, league, res, `${league} ${when} events`);
         const events = extractRows(res.data).slice(0, limit);
         return successEnvelope({
-            data: { league, leagueName: LEAGUE_NAMES[league], when, count: events.length, events, ...upstreamNotes(res) },
+            data: { league, leagueName: LEAGUE_NAMES[league], when, count: events.length, events, ...responseNotes(res) },
             game: league,
             source: d.source,
             requestId: d.requestId,
             tookMs: Date.now() - d.started,
-            upstreamCalls: 1,
+            apiCalls: 1,
             rateLimit: res.headers,
         });
     },
 };
 export const combatCard = {
     name: 'combat_card',
-    description: `COMPOSITE fight card for one RAF, BKFC or MMA archive event: event identity + bouts in running order with results.
-
-When to use:
-- "RAF 14 card", "BKFC 95 results", "Bellator 142 card", "PRIDE 34", "who won the main event at the last BKFC?"
-- Event pages and results pages
-
-event accepts a slug (e.g. "raf13", "bkfc-95-newark", "bellator-142", "pride-34", "wec-48") or "next" / "last".
-Bouts come main event first; each carries weight class, title stakes, both sides (athletes for RAF, red/blue fighters for BKFC with
-punch totals, red/blue fighters for the MMA archives with UFC-format totals and ufcFighterSlug), and once finished
-the winner and result (RAF: score, takedowns, method; BKFC/MMA archives: method, round, time).
-MMA archives are closed: event defaults to "last" (the most recent card; for mma, across every promotion), and
-"next" is a non-retryable NOT_IMPLEMENTED (there are no upcoming cards).
-
-Prefer over: combat_events + call_api per bout.
-Do not use when: you need one bout's period/round breakdown (combat_bout).
-
-Parallel-safe: yes. API calls: 2–3.
+    description: `COMPOSITE fight card for one RAF, BKFC or MMA archive event: event identity + bouts in running order with results.
+
+When to use:
+- "RAF 14 card", "BKFC 95 results", "Bellator 142 card", "PRIDE 34", "who won the main event at the last BKFC?"
+- Event pages and results pages
+
+event accepts a slug (e.g. "raf13", "bkfc-95-newark", "bellator-142", "pride-34", "wec-48") or "next" / "last".
+Bouts come main event first; each carries weight class, title stakes, both sides (athletes for RAF, red/blue fighters for BKFC with
+punch totals, red/blue fighters for the MMA archives with UFC-format totals and ufcFighterSlug), and once finished
+the winner and result (RAF: score, takedowns, method; BKFC/MMA archives: method, round, time).
+MMA archives are closed: event defaults to "last" (the most recent card; for mma, across every promotion), and
+"next" is a non-retryable NOT_IMPLEMENTED (there are no upcoming cards).
+
+Prefer over: combat_events + call_api per bout.
+Do not use when: you need one bout's period/round breakdown (combat_bout).
+
+Parallel-safe: yes. API calls: 2–3.
 Example: { "league": "raf", "event": "last" }`,
     inputSchema: {
         type: 'object',
@@ -298,7 +298,7 @@ Example: { "league": "raf", "event": "last" }`,
                 return httpError(d, league, list, `${league} ${which} events`);
             const first = asRecord(extractRows(list.data)[0]);
             if (!first?.slug) {
-                const windowed = !!upstreamNotes(list).historyWindow;
+                const windowed = !!responseNotes(list).historyWindow;
                 return errorEnvelope({
                     code: 'NOT_FOUND',
                     message: windowed
@@ -308,8 +308,8 @@ Example: { "league": "raf", "event": "last" }`,
                     source: d.source,
                     requestId: d.requestId,
                     tookMs: Date.now() - d.started,
-                    upstreamCalls: calls,
-                    ...(windowed ? { retryable: false, details: { historyWindow: upstreamNotes(list).historyWindow } } : {}),
+                    apiCalls: calls,
+                    ...(windowed ? { retryable: false, details: { historyWindow: responseNotes(list).historyWindow } } : {}),
                 });
             }
             slug = String(first.slug);
@@ -338,7 +338,7 @@ Example: { "league": "raf", "event": "last" }`,
             source: d.source,
             requestId: d.requestId,
             tookMs: Date.now() - d.started,
-            upstreamCalls: calls,
+            apiCalls: calls,
             rateLimit: bouts.headers ?? ev.headers,
             partial,
             truncated: rows.length > limit
@@ -349,22 +349,22 @@ Example: { "league": "raf", "event": "last" }`,
 };
 export const combatBout = {
     name: 'combat_bout',
-    description: `One RAF, BKFC or MMA archive bout in full, with its scoring breakdown.
-
-RAF: winner, method (decision / tech fall / pin / injury), final score, takedowns, and per-PERIOD scores.
-BKFC: winner, method, round, time, and per-ROUND punch stats for red and blue (landed/thrown, head/body,
-distance/clinch, knockdowns). BKFC round stats need the Starter plan; on Free they come back as a partial note.
-MMA archives (Bellator, PRIDE, Strikeforce, WEC, DREAM, EliteXC, Affliction, mma): winner, method, round, time,
-finish (position / submission), referee, judges' scores, each corner's whole-fight totals, and per-ROUND official
-stats in UFC's format (significantStrikes "13 of 18", totalStrikes, takedowns, head/body/leg, distance/clinch/ground,
-knockdowns, submissionAttempts, reversals, controlTime "1:42"). PRIDE's first round is 10 minutes. The archives are
-older than the Free/Starter history window: on those plans rounds come back as a HISTORY_WINDOW_EXCEEDED partial
-note while the result still returns.
-
-Get boutId from combat_card or combat_athlete (e.g. "raf13--belal-muhammad--colby-covington", "bellator-5600").
-MMA archive bout ids are "<promotion>-<fightId>"; a bare fight id resolves in any MMA archive league.
-
-Parallel-safe: yes. API calls: 1–2.
+    description: `One RAF, BKFC or MMA archive bout in full, with its scoring breakdown.
+
+RAF: winner, method (decision / tech fall / pin / injury), final score, takedowns, and per-PERIOD scores.
+BKFC: winner, method, round, time, and per-ROUND punch stats for red and blue (landed/thrown, head/body,
+distance/clinch, knockdowns). BKFC round stats need the Starter plan; on Free they come back as a partial note.
+MMA archives (Bellator, PRIDE, Strikeforce, WEC, DREAM, EliteXC, Affliction, mma): winner, method, round, time,
+finish (position / submission), referee, judges' scores, each corner's whole-fight totals, and per-ROUND official
+stats in UFC's format (significantStrikes "13 of 18", totalStrikes, takedowns, head/body/leg, distance/clinch/ground,
+knockdowns, submissionAttempts, reversals, controlTime "1:42"). PRIDE's first round is 10 minutes. The archives are
+older than the Free/Starter history window: on those plans rounds come back as a HISTORY_WINDOW_EXCEEDED partial
+note while the result still returns.
+
+Get boutId from combat_card or combat_athlete (e.g. "raf13--belal-muhammad--colby-covington", "bellator-5600").
+MMA archive bout ids are "<promotion>-<fightId>"; a bare fight id resolves in any MMA archive league.
+
+Parallel-safe: yes. API calls: 1–2.
 Example: { "league": "bkfc", "boutId": "bkfc-fight-night-bethlehem--gregoris-cisneros--ryan-petersen" }`,
     inputSchema: {
         type: 'object',
@@ -414,7 +414,7 @@ Example: { "league": "bkfc", "boutId": "bkfc-fight-night-bethlehem--gregoris-cis
             source: d.source,
             requestId: d.requestId,
             tookMs: Date.now() - d.started,
-            upstreamCalls: parts ? 2 : 1,
+            apiCalls: parts ? 2 : 1,
             rateLimit: bout.headers,
             partial,
         });
@@ -422,24 +422,24 @@ Example: { "league": "bkfc", "boutId": "bkfc-fight-night-bethlehem--gregoris-cis
 };
 export const combatAthlete = {
     name: 'combat_athlete',
-    description: `COMPOSITE RAF athlete / BKFC or MMA archive fighter page: profile + recent bouts + career stats.
-
-When to use:
-- "Kyle Snyder's RAF record", "Arlovski BKFC stats", "Tito Ortiz in Bellator", "Fedor's PRIDE record", athlete/fighter profile pages
-
-athlete accepts a slug ("kyle-snyder") or a name ("Andrei Arlovski"); names are resolved through the league's
-search, and several matches return AMBIGUOUS_ENTITY with candidates. Profile carries record, division, nickname,
-country, official headshot (+ its credit — show it with the image). Career stats need the Starter plan; on Free
-they come back as a partial note while profile and history still return.
-MMA archives: profile is bio (DOB, height, reach, stance, hometown) + the record in that promotion's archive (not the
-whole career); stats are career totals in UFC's format. league "mma" covers every archived promotion at once, and
-data.recordByPromotion splits the record ({ pride: {...}, strikeforce: {...} }). A fighter we also hold a UFC record
-for keeps the SAME slug as /ufc/fighters/{slug}: data.ufcFighterSlug is set then (a UFC slug is accepted here too).
-Keep the records apart: archive fights never belong in a UFC answer.
-
-Prefer over: call_api profile + history + stats separately.
-
-Parallel-safe: yes. API calls: 2–4.
+    description: `COMPOSITE RAF athlete / BKFC or MMA archive fighter page: profile + recent bouts + career stats.
+
+When to use:
+- "Kyle Snyder's RAF record", "Arlovski BKFC stats", "Tito Ortiz in Bellator", "Fedor's PRIDE record", athlete/fighter profile pages
+
+athlete accepts a slug ("kyle-snyder") or a name ("Andrei Arlovski"); names are resolved through the league's
+search, and several matches return AMBIGUOUS_ENTITY with candidates. Profile carries record, division, nickname,
+country, official headshot (+ its credit — show it with the image). Career stats need the Starter plan; on Free
+they come back as a partial note while profile and history still return.
+MMA archives: profile is bio (DOB, height, reach, stance, hometown) + the record in that promotion's archive (not the
+whole career); stats are career totals in UFC's format. league "mma" covers every archived promotion at once, and
+data.recordByPromotion splits the record ({ pride: {...}, strikeforce: {...} }). A fighter we also hold a UFC record
+for keeps the SAME slug as /ufc/fighters/{slug}: data.ufcFighterSlug is set then (a UFC slug is accepted here too).
+Keep the records apart: archive fights never belong in a UFC answer.
+
+Prefer over: call_api profile + history + stats separately.
+
+Parallel-safe: yes. API calls: 2–4.
 Example: { "league": "raf", "athlete": "Kyle Snyder", "historyLimit": 5 }`,
     inputSchema: {
         type: 'object',
@@ -502,7 +502,7 @@ Example: { "league": "raf", "athlete": "Kyle Snyder", "historyLimit": 5 }`,
             source: d.source,
             requestId: d.requestId,
             tookMs: Date.now() - d.started,
-            upstreamCalls: 1 + (history ? 1 : 0) + (stats ? 1 : 0),
+            apiCalls: 1 + (history ? 1 : 0) + (stats ? 1 : 0),
             rateLimit: profile.headers,
             partial,
         });
@@ -510,13 +510,13 @@ Example: { "league": "raf", "athlete": "Kyle Snyder", "historyLimit": 5 }`,
 };
 export const combatH2h = {
     name: 'combat_h2h',
-    description: `Head-to-head between two RAF athletes, two BKFC fighters or two MMA archive fighters: record and every meeting.
-
-Accepts slugs or names for both sides (names resolve through the league's search). MMA archive meetings are only
-the ones on that promotion's cards (league "mma": every archived promotion); UFC meetings are a UFC question
-(head_to_head).
-
-Parallel-safe: yes. API calls: 1–3.
+    description: `Head-to-head between two RAF athletes, two BKFC fighters or two MMA archive fighters: record and every meeting.
+
+Accepts slugs or names for both sides (names resolve through the league's search). MMA archive meetings are only
+the ones on that promotion's cards (league "mma": every archived promotion); UFC meetings are a UFC question
+(head_to_head).
+
+Parallel-safe: yes. API calls: 1–3.
 Example: { "league": "bkfc", "athleteA": "ryan-petersen", "athleteB": "gregoris-cisneros" }`,
     inputSchema: {
         type: 'object',
@@ -557,23 +557,23 @@ Example: { "league": "bkfc", "athleteA": "ryan-petersen", "athleteB": "gregoris-
             source: d.source,
             requestId: d.requestId,
             tookMs: Date.now() - d.started,
-            upstreamCalls: 1,
+            apiCalls: 1,
             rateLimit: res.headers,
         });
     },
 };
 export const combatRankings = {
     name: 'combat_rankings',
-    description: `Champions and rankings: RAF title holders per division, BKFC official rankings + champions.
-
-BKFC: omit division for every division's ranked list (champion, interim champion, ranked fighters), or pass one
-(e.g. "heavyweight", "womens-flyweight"). RAF has no ranked lists; it returns every title and its holder, or one
-division's detail when division is given (e.g. "men-heavyweight").
-The MMA archives (bellator, pride, strikeforce, wec, dream, elitexc, affliction, mma) have no rankings: they return a
-non-retryable NOT_IMPLEMENTED.
-Never answer with UFC rankings instead.
-
-Parallel-safe: yes. API calls: 1.
+    description: `Champions and rankings: RAF title holders per division, BKFC official rankings + champions.
+
+BKFC: omit division for every division's ranked list (champion, interim champion, ranked fighters), or pass one
+(e.g. "heavyweight", "womens-flyweight"). RAF has no ranked lists; it returns every title and its holder, or one
+division's detail when division is given (e.g. "men-heavyweight").
+The MMA archives (bellator, pride, strikeforce, wec, dream, elitexc, affliction, mma) have no rankings: they return a
+non-retryable NOT_IMPLEMENTED.
+Never answer with UFC rankings instead.
+
+Parallel-safe: yes. API calls: 1.
 Example: { "league": "bkfc", "division": "heavyweight" }`,
     inputSchema: {
         type: 'object',
@@ -610,7 +610,7 @@ Example: { "league": "bkfc", "division": "heavyweight" }`,
             source: d.source,
             requestId: d.requestId,
             tookMs: Date.now() - d.started,
-            upstreamCalls: 1,
+            apiCalls: 1,
             rateLimit: res.headers,
         });
     },