cito-mcp 0.2.3 → 0.2.5

package/dist/tools/match.js

@@ -1,7 +1,7 @@
 /**
  * match_summary + match_details
  */
-import { extractRows, fetchJson, gameNotIncludedHint, asRecord, pickString, } from '../client.js';
+import { extractRows, fetchJson, gameNotIncludedHint, asRecord, pickString, unwrapPayload, } from '../client.js';
 import { errorEnvelope, mapHttpToCode, newRequestId, partialFromRejection, successEnvelope, } from '../envelope.js';
 import { normalizeMatch } from './normalize.js';
 import { boolSchema, gameSchema, isPrimaryGame, parseGame, stringSchema, } from './types.js';
@@ -9,8 +9,14 @@ async function getSection(ctx, path, query) {
     return fetchJson(ctx, path, { query });
 }
 function matchCore(game, matchId, raw) {
-    const m = normalizeMatch(game, raw);
-    const r = asRecord(raw) ?? {};
+    const entity = unwrapPayload(raw);
+    const m = normalizeMatch(game, entity);
+    const r = asRecord(entity) ?? {};
+    const s1 = m.team1?.score ?? null;
+    const s2 = m.team2?.score ?? null;
+    const scoreline = m.team1 || m.team2
+        ? `${m.team1?.name ?? '?'} ${s1 ?? '-'} : ${s2 ?? '-'} ${m.team2?.name ?? '?'}`
+        : null;
     return {
         matchId: m.matchId !== 'unknown' ? m.matchId : matchId,
         game,
@@ -18,14 +24,66 @@ function matchCore(game, matchId, raw) {
         startTime: m.startTime,
         endTime: pickString(r.endTime, r.endedAt, r.finishedAt) ?? null,
         bestOf: r.bestOf ?? r.bo ?? null,
+        label: m.label,
+        scoreline,
         score: {
-            team1: m.team1?.score ?? null,
-            team2: m.team2?.score ?? null,
+            team1: s1,
+            team2: s2,
         },
         team1: m.team1,
         team2: m.team2,
         event: m.event,
         league: m.league,
+        method: pickString(r.method, r.resultMethod) ?? null,
+        winner: (() => {
+            // UFC rows carry an explicit winner slug/fighter ref.
+            const explicit = pickString(r.winnerFighterSlug, r.winnerSlug, r.winner);
+            if (explicit)
+                return explicit;
+            if (game === 'ufc')
+                return null;
+            // CS2 rows expose winnerTeamId instead; map it to a side, else fall back to scores.
+            const sideLabel = (side) => side ? pickString(side.slug, side.id, side.name) ?? null : null;
+            const winnerTeamId = pickString(r.winnerTeamId, r.winner_team_id);
+            if (winnerTeamId) {
+                const t1Ids = [m.team1?.id, m.team1?.slug, pickString(r.team1Id, r.team1_id)].filter(Boolean).map(String);
+                const t2Ids = [m.team2?.id, m.team2?.slug, pickString(r.team2Id, r.team2_id)].filter(Boolean).map(String);
+                if (t1Ids.includes(winnerTeamId))
+                    return sideLabel(m.team1);
+                if (t2Ids.includes(winnerTeamId))
+                    return sideLabel(m.team2);
+            }
+            if (s1 != null && s2 != null && s1 !== s2)
+                return sideLabel(s1 > s2 ? m.team1 : m.team2);
+            return null;
+        })(),
+        weightClass: pickString(r.weightClass, r.division) ?? null,
+        referee: (() => {
+            const nested = asRecord(r.referee);
+            if (nested) {
+                const joined = [nested.firstName, nested.lastName].filter(Boolean).join(' ').trim();
+                const name = pickString(nested.name, joined || undefined) ?? null;
+                const id = pickString(nested.id, nested.refereeId) ?? null;
+                if (name || id) {
+                    return {
+                        id,
+                        name,
+                        firstName: pickString(nested.firstName) ?? null,
+                        lastName: pickString(nested.lastName) ?? null,
+                    };
+                }
+            }
+            const name = pickString(r.refereeName) ?? null;
+            const id = pickString(r.refereeId) ?? null;
+            if (!name && !id)
+                return null;
+            return {
+                id,
+                name,
+                firstName: pickString(r.refereeFirstName) ?? null,
+                lastName: pickString(r.refereeLastName) ?? null,
+            };
+        })(),
         rawStatus: pickString(r.status, r.state) ?? null,
     };
 }
@@ -45,18 +103,18 @@ function primaryPath(game, matchId) {
 }
 export const matchSummary = {
     name: 'match_summary',
-    description: `COMPOSITE match card: scoreline, key context, player performances, and VOD/demo links when available.
-
-When to use:
-- Match recap / default match UI
-- After user selects a live or completed matchId
-
-Prefer over match_details for chat answers and default UIs.
-Prefer match_details for timelines, full map trees, live state, advanced packages.
-
-Do not use when: no matchId yet (resolve from live/schedule); pure pre-match → match_preview.
-
-Parallel-safe: yes. Upstream cost: 2–5.
+    description: `COMPOSITE match card: scoreline, key context, player performances, and VOD/demo links when available.
+
+When to use:
+- Match recap / default match UI
+- After user selects a live or completed matchId
+
+Prefer over match_details for chat answers and default UIs.
+Prefer match_details for timelines, full map trees, live state, advanced packages.
+
+Do not use when: no matchId yet (resolve from live/schedule); pure pre-match → match_preview.
+
+Parallel-safe: yes. Upstream cost: 2–5.
 Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includePlayerStats": true }`,
     inputSchema: {
         type: 'object',
@@ -240,22 +298,22 @@ Example: { "game": "cs2", "matchId": "cs2-match-123", "view": "summary", "includ
 };
 export const matchDetails = {
     name: 'match_details',
-    description: `Deep match package: optional timelines, advanced stats, live state/snapshots, full map/game tree, media inventory.
-
-When to use:
-- Analyst deep dive
-- Live in-game window (LoL/CS2/UFC)
-- Full demo list
-
-Prefer over match_summary only when summary is insufficient.
-Prefer match_summary for short answers and default cards.
-
-Do not use when: first-pass live board (use live_matches + match_summary).
-
-Section selection: pass includeTimeline / includeLiveState / includeAdvanced booleans, OR an explicit sections[] list.
-If sections[] is non-empty it wins (booleans are ignored). LoL liveState/advanced require gameId.
-
-Parallel-safe: yes. Upstream cost: 1–8 (section-gated).
+    description: `Deep match package: optional timelines, advanced stats, live state/snapshots, full map/game tree, media inventory.
+
+When to use:
+- Analyst deep dive
+- Live in-game window (LoL/CS2/UFC)
+- Full demo list
+
+Prefer over match_summary only when summary is insufficient.
+Prefer match_summary for short answers and default cards.
+
+Do not use when: first-pass live board (use live_matches + match_summary).
+
+Section selection: pass includeTimeline / includeLiveState / includeAdvanced booleans, OR an explicit sections[] list.
+If sections[] is non-empty it wins (booleans are ignored). LoL liveState/advanced require gameId.
+
+Parallel-safe: yes. Upstream cost: 1–8 (section-gated).
 Example: { "game": "lol", "matchId": "lol-match-1", "includeTimeline": true, "includeLiveState": false }`,
     inputSchema: {
         type: 'object',

package/dist/tools/meta.js

@@ -4,7 +4,7 @@
 import { extractRows, fetchJson, gameNotIncludedHint, present } from '../client.js';
 import { errorEnvelope, mapHttpToCode, newRequestId, successEnvelope, } from '../envelope.js';
 import { boolSchema, gameSchema, parseGame, PRIMARY_GAMES, stringSchema, } from './types.js';
-const CATALOG_VERSION = '0.2.3';
+import { PACKAGE_VERSION as CATALOG_VERSION } from '../version.js';
 const TOOL_CATALOG = [
     {
         name: 'list_capabilities',

package/dist/tools/normalize.js

@@ -1,7 +1,7 @@
 /**
  * Cross-game row normalization for live/schedule boards and entity cards.
  */
-import { asRecord, pickString } from '../client.js';
+import { asRecord, pickString, unwrapPayload } from '../client.js';
 function sideFrom(name, id, slug, score) {
     if (!name && !id && !slug)
         return null;
@@ -39,12 +39,25 @@ function scoreNum(v) {
     return null;
 }
 export function normalizeMatch(game, row, forcedStatus) {
-    const r = asRecord(row) ?? {};
-    const matchId = pickString(r.matchId, r.boutId, r.id, r.gameId, r.match_id, r.dataId, r.fightMetricId) ?? 'unknown';
+    // Always peel { success, data } so UFC bout fighters[] / status are visible.
+    const r = asRecord(unwrapPayload(row)) ?? asRecord(row) ?? {};
+    const matchId = pickString(r.matchId, r.boutId, r.id, r.gameId, r.match_id, r.dataId, r.fightMetricId, r.ufcFightId) ?? 'unknown';
     let team1 = nestedSide(r.team1) ??
         sideFrom(pickString(r.team1Name, r.team_a_name, r.redName, r.fighter1Name, r.homeName), pickString(r.team1Id, r.team1_id, r.redId, r.fighter1Id), pickString(r.team1Slug, r.redSlug, r.fighter1Slug), scoreNum(r.team1Score ?? r.score1 ?? r.team1Maps ?? r.redScore));
     let team2 = nestedSide(r.team2) ??
         sideFrom(pickString(r.team2Name, r.team_b_name, r.blueName, r.fighter2Name, r.awayName), pickString(r.team2Id, r.team2_id, r.blueId, r.fighter2Id), pickString(r.team2Slug, r.blueSlug, r.fighter2Slug), scoreNum(r.team2Score ?? r.score2 ?? r.team2Maps ?? r.blueScore));
+    // CS2 rows nest team1/team2 objects that lack a score; a nested side must not
+    // shadow the flat score fields (team1Score/score1/team1Maps) with score:null.
+    if (team1 && team1.score == null) {
+        const s = scoreNum(r.team1Score ?? r.score1 ?? r.team1Maps ?? r.redScore);
+        if (s != null)
+            team1 = { ...team1, score: s };
+    }
+    if (team2 && team2.score == null) {
+        const s = scoreNum(r.team2Score ?? r.score2 ?? r.team2Maps ?? r.blueScore);
+        if (s != null)
+            team2 = { ...team2, score: s };
+    }
     // UFC / live corners: red/blue objects, corner arrays, or fighters[] with corner field.
     // Public API serializeBout uses fighters:[{ corner, fighterName, fighterSlug, profile:{name,slug} }].
     // Live tracking uses red/blue + fighters[] (not team1/team2).
@@ -96,30 +109,66 @@ export function normalizeMatch(game, row, forcedStatus) {
         team1 = team1 ?? nestedSide(r.teams[0]);
         team2 = team2 ?? nestedSide(r.teams[1]);
     }
-    const startTime = pickString(r.startTime, r.scheduledAt, r.startsAt, r.date, r.startDate, r.beginAt) ?? null;
-    const statusRaw = pickString(r.status, r.state, r.matchStatus)?.toLowerCase() ?? '';
+    const startTime = pickString(r.startTime, r.scheduledAt, r.startsAt, r.date, r.startDate, r.beginAt, asRecord(r.event)?.startsAt, asRecord(r.event)?.startTime, asRecord(r.event)?.date) ?? null;
+    const statusRaw = pickString(r.status, r.state, r.matchStatus, r.boutStatus)?.toLowerCase() ?? '';
     let status = forcedStatus ?? 'unknown';
     if (!forcedStatus) {
-        if (/live|running|in_?progress|ongoing|started/.test(statusRaw))
+        const hasResult = Boolean(pickString(r.winnerFighterSlug, r.winnerSlug, r.winner, r.method, r.result)) ||
+            r.resultRound != null ||
+            r.isComplete === true ||
+            r.completed === true;
+        if (/live|running|in_?progress|ongoing|started|watching/.test(statusRaw))
             status = 'live';
-        else if (/upcoming|scheduled|not_started|pending|soon/.test(statusRaw))
-            status = 'upcoming';
-        else if (/complete|finished|ended|final|closed|done/.test(statusRaw))
+        else if (/complete|finished|ended|final|closed|done|official|result/.test(statusRaw) || hasResult) {
             status = 'completed';
-        else if (forcedStatus)
-            status = forcedStatus;
+        }
+        else if (/upcoming|scheduled|not_started|pending|soon|booked|confirmed|announced/.test(statusRaw) ||
+            (game === 'ufc' && !hasResult && (startTime || statusRaw === '' || statusRaw === 'unknown'))) {
+            // UFC bouts often omit status or use sparse values; default upcoming when no result yet.
+            if (hasResult)
+                status = 'completed';
+            else if (startTime) {
+                const t = Date.parse(startTime);
+                status = Number.isFinite(t) && t < Date.now() - 3 * 3600_000 ? 'completed' : 'upcoming';
+            }
+            else {
+                status = 'upcoming';
+            }
+        }
+        else if (hasResult)
+            status = 'completed';
+    }
+    // Winner → score 1-0 for UFC card display when numeric scores absent
+    if (game === 'ufc' && team1 && team2 && team1.score == null && team2.score == null) {
+        const winner = pickString(r.winnerFighterSlug, r.winnerSlug, r.winner)?.toLowerCase();
+        if (winner) {
+            const t1hit = [team1.slug, team1.id, team1.name].some((x) => x && (String(x).toLowerCase() === winner || String(x).toLowerCase().includes(winner) || winner.includes(String(x).toLowerCase())));
+            const t2hit = [team2.slug, team2.id, team2.name].some((x) => x && (String(x).toLowerCase() === winner || String(x).toLowerCase().includes(winner) || winner.includes(String(x).toLowerCase())));
+            if (t1hit && !t2hit) {
+                team1 = { ...team1, score: 1 };
+                team2 = { ...team2, score: 0 };
+            }
+            else if (t2hit && !t1hit) {
+                team1 = { ...team1, score: 0 };
+                team2 = { ...team2, score: 1 };
+            }
+        }
     }
-    const eventName = pickString(asRecord(r.event)?.name, r.eventName, r.event, asRecord(r.tournament)?.name, r.tournamentName);
-    const eventId = pickString(asRecord(r.event)?.id, r.eventId, asRecord(r.tournament)?.id, r.tournamentId);
-    const eventSlug = pickString(asRecord(r.event)?.slug, r.eventSlug, asRecord(r.tournament)?.slug);
+    const ev = asRecord(r.event);
+    const eventName = pickString(ev?.name, ev?.title, r.eventName, typeof r.event === 'string' ? r.event : undefined, asRecord(r.tournament)?.name, asRecord(r.tournament)?.title, r.tournamentName);
+    const eventId = pickString(ev?.id, r.eventId, asRecord(r.tournament)?.id, r.tournamentId);
+    const eventSlug = pickString(ev?.slug, r.eventSlug, asRecord(r.tournament)?.slug);
     const leagueName = pickString(asRecord(r.league)?.name, r.leagueName, r.league, r.leagueSlug);
     const leagueId = pickString(asRecord(r.league)?.id, r.leagueId);
     const leagueSlug = pickString(asRecord(r.league)?.slug, r.leagueSlug);
     // Prefer explicit title/label when present, but never keep the placeholder
     // "? vs ?" once fighter/team names were resolved (UFC fighters[] / red-blue).
+    // When both sides lack names, prefer event / weight / bout id over opaque "? vs ?"
+    // so agent boards (live_matches, upcoming_schedule, event_card) stay legible.
     const vsLabel = `${team1?.name ?? '?'} vs ${team2?.name ?? '?'}`;
     const explicit = pickString(r.label, r.title, r.name);
     const explicitIsPlaceholder = explicit != null && /^\?\s*vs\s*\?$/i.test(explicit.trim());
+    const weightOrClass = pickString(r.weightClass, r.division, r.weight_class, r.boutClass);
     let label;
     if (explicit && !explicitIsPlaceholder) {
         label = explicit;
@@ -128,7 +177,11 @@ export function normalizeMatch(game, row, forcedStatus) {
         label = vsLabel;
     }
     else {
-        label = explicit ?? vsLabel;
+        // Identity fallbacks — never invent fighter names, but avoid bare "? vs ?"
+        label =
+            pickString(eventName, eventSlug, weightOrClass) ??
+                (matchId && matchId !== 'unknown' ? `Bout ${matchId}` : null) ??
+                vsLabel;
     }
     return {
         game,
@@ -148,7 +201,8 @@ export function entityRef(row, type, game) {
         pickString(r.slug) ??
         'unknown';
     const slug = pickString(r.slug, r.orgSlug, r.teamSlug);
-    const name = pickString(r.name, r.nickname, r.displayName, r.tag, r.code, r.title, slug, id) ?? id;
+    // Events often use `title` not `name` (UFC)
+    const name = pickString(r.name, r.title, r.nickname, r.displayName, r.tag, r.code, slug, id) ?? id;
     const nickname = pickString(r.nickname, asRecord(r.profile)?.nickname);
     return {
         game,

package/dist/tools/player.js

@@ -1,7 +1,7 @@
 /**
  * player_profile
  */
-import { clampInt, extractRows, fetchJson, gameNotIncludedHint, asRecord, pickString, } from '../client.js';
+import { clampInt, extractRows, fetchJson, gameNotIncludedHint, asRecord, pickString, unwrapPayload, } from '../client.js';
 import { errorEnvelope, mapHttpToCode, newRequestId, partialFromRejection, successEnvelope, } from '../envelope.js';
 import { normalizeMatch } from './normalize.js';
 import { boolSchema, gameSchema, isPrimaryGame, limitSchema, parseGame, stringSchema, } from './types.js';
@@ -165,12 +165,7 @@ Example: { "game": "cs2", "playerId": "cs2-player-1", "recentLimit": 10, "includ
                     httpStatus: res.status,
                 });
             }
-            playerRaw = res.data;
-            // some APIs wrap in data
-            const obj = asRecord(res.data);
-            if (obj?.data && typeof obj.data === 'object' && !Array.isArray(obj.data)) {
-                playerRaw = obj.data;
-            }
+            playerRaw = unwrapPayload(res.data);
         }
         const player = identityFrom(game, playerRaw, playerId || undefined, slug || undefined);
         let currentTeam = player.team;
@@ -306,13 +301,15 @@ Example: { "game": "cs2", "playerId": "cs2-player-1", "recentLimit": 10, "includ
             })());
         }
         if (game === 'ufc') {
+            const fighterKey = slug || idOrSlug;
             tasks.push((async () => {
-                const res = await fetchJson(ctx, `/ufc/fighters/${encodeURIComponent(slug || idOrSlug)}/stats`);
+                const res = await fetchJson(ctx, `/ufc/fighters/${encodeURIComponent(fighterKey)}/stats`);
                 upstreamCalls += 1;
                 rateLimit = { ...rateLimit, ...res.headers };
                 if (res.ok) {
-                    form = { summary: 'UFC fighter stats', trend: null, window: null, metrics: res.data };
-                    seasonStats = res.data;
+                    const metrics = unwrapPayload(res.data);
+                    form = { summary: 'UFC fighter stats', trend: null, window: null, metrics };
+                    seasonStats = metrics;
                 }
                 else {
                     partial.push(partialFromRejection('form', {
@@ -322,6 +319,53 @@ Example: { "game": "cs2", "playerId": "cs2-player-1", "recentLimit": 10, "includ
                     }));
                 }
             })());
+            tasks.push((async () => {
+                // Fight-by-fight history — /fights and /history are aliases on the API
+                const res = await fetchJson(ctx, `/ufc/fighters/${encodeURIComponent(fighterKey)}/fights`, {
+                    query: { limit: recentLimit },
+                });
+                upstreamCalls += 1;
+                rateLimit = { ...rateLimit, ...res.headers };
+                if (res.ok) {
+                    recentMatches = extractRows(res.data)
+                        .slice(0, recentLimit)
+                        .map((row) => {
+                        const r = asRecord(row) ?? {};
+                        const bout = asRecord(r.bout) ?? row;
+                        const m = normalizeMatch('ufc', bout, 'completed');
+                        return {
+                            ...m,
+                            result: pickString(r.result, r.outcome, asRecord(bout)?.result) ?? null,
+                            opponent: pickString(r.opponentName, asRecord(r.opponent)?.name) ?? null,
+                            method: pickString(asRecord(bout)?.method, r.method) ?? null,
+                        };
+                    });
+                }
+                else {
+                    // fallback history path
+                    const hist = await fetchJson(ctx, `/ufc/fighters/${encodeURIComponent(fighterKey)}/history`, {
+                        query: { limit: recentLimit },
+                    });
+                    upstreamCalls += 1;
+                    rateLimit = { ...rateLimit, ...hist.headers };
+                    if (hist.ok) {
+                        recentMatches = extractRows(hist.data)
+                            .slice(0, recentLimit)
+                            .map((row) => {
+                            const r = asRecord(row) ?? {};
+                            const bout = asRecord(r.bout) ?? row;
+                            return normalizeMatch('ufc', bout, 'completed');
+                        });
+                    }
+                    else {
+                        partial.push(partialFromRejection('recentMatches', {
+                            code: mapHttpToCode(res.status),
+                            message: `fighter fights HTTP ${res.status}`,
+                            httpStatus: res.status,
+                        }));
+                    }
+                }
+            })());
         }
         await Promise.all(tasks);
         if (view === 'summary' && recentMatches.length > recentLimit) {