@gotza02/sequential-thinking 10000.1.6 → 10000.1.7

package/dist/tools/sports/tools/match.js

@@ -211,6 +211,153 @@ function optimizeQueries(coverage, baseQueries) {
         }
     });
 }
+/**
+ * Build search queries for match analysis
+ */
+function buildSearchQueries(homeTeam, awayTeam, league, context) {
+    const leagueStr = league ? `${league} ` : '';
+    const baseQuery = `${leagueStr}${homeTeam} vs ${awayTeam}`;
+    const dateQuery = getDateContext();
+    const queries = [
+        { type: 'general', query: `${baseQuery} match prediction stats${dateQuery}`, title: 'General & Prediction' },
+        { type: 'h2h', query: `${baseQuery} head to head history`, title: 'Head to Head' },
+        { type: 'form', query: `${homeTeam} ${awayTeam} recent form last 5 matches${dateQuery}`, title: 'Recent Form' },
+        { type: 'news', query: `${baseQuery} team news injuries lineups${dateQuery}`, title: 'Team News & Lineups' },
+        { type: 'stats', query: `${baseQuery} xG expected goals stats${dateQuery}`, title: 'Advanced Metrics' },
+        { type: 'odds', query: `${baseQuery} Asian Handicap odds prediction today${dateQuery}`, title: 'Latest Handicap Odds' },
+        { type: 'fatigue', query: `${homeTeam} ${awayTeam} days rest fixture congestion${dateQuery}`, title: 'Fatigue & Schedule' },
+        { type: 'setpieces', query: `${baseQuery} set pieces corners aerial duels${dateQuery}`, title: 'Set Pieces' },
+    ];
+    if (context) {
+        queries.push({ type: 'general', query: `${baseQuery} ${context}${dateQuery}`, title: 'Specific Context' });
+    }
+    return queries;
+}
+/**
+ * Format H2H data for display
+ */
+function formatH2HData(h2h, homeTeam, awayTeam) {
+    return `### Head-to-Head Record\n` +
+        `- Total Matches: ${h2h.totalMatches}\n` +
+        `- ${homeTeam} Wins: ${h2h.homeWins}\n` +
+        `- Draws: ${h2h.draws}\n` +
+        `- ${awayTeam} Wins: ${h2h.awayWins}\n` +
+        `- Goals: ${h2h.homeGoals}-${h2h.awayGoals}\n\n`;
+}
+/**
+ * Get match result character (W/D/L) for a team
+ */
+function getMatchResultChar(match, teamName) {
+    const isHome = match.homeTeam.name.includes(teamName);
+    const homeScore = match.score?.home ?? 0;
+    const awayScore = match.score?.away ?? 0;
+    if (isHome) {
+        return homeScore > awayScore ? 'W' : homeScore === awayScore ? 'D' : 'L';
+    }
+    else {
+        return awayScore > homeScore ? 'W' : homeScore === awayScore ? 'D' : 'L';
+    }
+}
+/**
+ * Format team form data for display
+ */
+function formatTeamForm(form, teamName, isHomeTeam) {
+    const label = isHomeTeam ? 'Home' : 'Away';
+    let output = `### ${teamName} Recent Form (Last ${form.length})\n`;
+    output += form.map(m => {
+        const opponent = isHomeTeam ? m.awayTeam.name : m.homeTeam.name;
+        const score = m.score ? `${m.score.home}-${m.score.away}` : '?';
+        const result = getMatchResultChar(m, teamName);
+        return `- ${result} vs ${opponent} (${score})`;
+    }).join('\n');
+    return output + '\n\n';
+}
+/**
+ * Format API data section for output
+ */
+function formatAPIData(apiData, homeTeam, awayTeam) {
+    let output = '--- API DATA (Reliable Source) ---\n\n';
+    if (apiData.h2h) {
+        output += formatH2HData(apiData.h2h, homeTeam, awayTeam);
+    }
+    if (apiData.homeForm?.length) {
+        output += formatTeamForm(apiData.homeForm, homeTeam, true);
+    }
+    if (apiData.awayForm?.length) {
+        output += formatTeamForm(apiData.awayForm, awayTeam, false);
+    }
+    if (apiData.odds) {
+        output += `### Current Odds (from API)\n`;
+        output += `- Home Win: ${apiData.odds.homeWin.toFixed(2)}\n`;
+        output += `- Draw: ${apiData.odds.draw.toFixed(2)}\n`;
+        output += `- Away Win: ${apiData.odds.awayWin.toFixed(2)}\n`;
+        if (apiData.odds.asianHandicap) {
+            output += `- Asian Handicap: ${apiData.odds.asianHandicap.line}\n`;
+        }
+        output += '\n';
+    }
+    return output + '--- END API DATA ---\n\n';
+}
+/**
+ * Execute search queries in batches
+ */
+async function executeSearches(queries, searchProvider, candidateUrls) {
+    const BATCH_SIZE = 4;
+    let output = '';
+    for (let i = 0; i < queries.length; i += BATCH_SIZE) {
+        const batch = queries.slice(i, i + BATCH_SIZE);
+        const batchPromises = batch.map(async (q) => {
+            try {
+                const results = await searchProvider.search(q.query, undefined, 4);
+                results.forEach(r => candidateUrls.push(r.url));
+                const items = results.map(r => `- [${r.title}](${r.url}): ${r.snippet}`).join('\n');
+                return `### ${q.title}\n${items}\n`;
+            }
+            catch (error) {
+                return `### ${q.title} (Failed)\nError: ${error instanceof Error ? error.message : String(error)}\n`;
+            }
+        });
+        const batchResults = await Promise.all(batchPromises);
+        output += batchResults.join('\n');
+    }
+    return output;
+}
+/**
+ * Scrape content from URL with error handling
+ */
+async function scrapeContentWithErrorHandling(url, type) {
+    try {
+        const scrapedContent = await scrapeMatchContent(url);
+        if (scrapedContent.success) {
+            if (type === 'news' && scrapedContent.data) {
+                // Truncate news to avoid blowing up context
+                const content = scrapedContent.data.substring(0, 3000);
+                return content + (scrapedContent.data.length > 3000 ? '\n...(truncated)' : '');
+            }
+            return scrapedContent.data || '';
+        }
+        else {
+            return `(${type} scrape failed: ${scrapedContent.error})`;
+        }
+    }
+    catch (scrapeError) {
+        const errorMsg = scrapeError instanceof Error ? scrapeError.message : String(scrapeError);
+        return `(${type} scrape failed: ${errorMsg})`;
+    }
+}
+/**
+ * Get analysis framework instructions
+ */
+function getAnalysisInstructions() {
+    return `INSTRUCTIONS: Act as a World-Class Football Analysis Panel. Provide a deep, non-obvious analysis using this framework:\n\n` +
+        `1. 📊 THE DATA SCIENTIST (Quantitative):\n   - Analyze xG trends & Possession stats.\n   - Assess Home/Away variance.\n\n` +
+        `2. 🧠 THE TACTICAL SCOUT (Qualitative):\n   - Stylistic Matchup (Press vs Block).\n   - Key Battles.\n\n` +
+        `3. 🚑 THE PHYSIO (Physical Condition):\n   - FATIGUE CHECK: Days rest? Travel distance?\n   - Squad Depth: Who has the better bench?\n\n` +
+        `4. 🎯 SET PIECE ANALYST:\n   - Corners/Free Kicks: Strong vs Weak?\n   - Who is most likely to score from a header?\n\n` +
+        `5. 💎 THE INSIDER (External Factors):\n   - Market Movements (Odds dropping?).\n   - Referee & Weather impact.\n\n` +
+        `6. 🕵️ THE SKEPTIC & SCENARIOS:\n   - Why might the favorite LOSE?\n   - Game Script: "If Team A scores first..."\n\n` +
+        `🏆 FINAL VERDICT:\n   - Asian Handicap Leans\n   - Goal Line (Over/Under)\n   - The "Value Pick"`;
+}
 /**
  * Calculate adaptive TTL based on data type and match timing
  */
@@ -261,162 +408,63 @@ function calculateAdaptiveTTL(dataType, matchDate) {
  * Perform comprehensive match analysis using web search
  */
 export async function performMatchAnalysis(homeTeam, awayTeam, league, context) {
-    const leagueStr = league ? `${league} ` : '';
-    const baseQuery = `${leagueStr}${homeTeam} vs ${awayTeam}`;
-    const dateQuery = getDateContext();
-    const searchProvider = getSearchProvider();
-    const queries = [
-        { type: 'general', query: `${baseQuery} match prediction stats${dateQuery}`, title: 'General & Prediction' },
-        { type: 'h2h', query: `${baseQuery} head to head history`, title: 'Head to Head' },
-        { type: 'form', query: `${homeTeam} ${awayTeam} recent form last 5 matches${dateQuery}`, title: 'Recent Form' },
-        { type: 'news', query: `${baseQuery} team news injuries lineups${dateQuery}`, title: 'Team News & Lineups' },
-        { type: 'stats', query: `${baseQuery} xG expected goals stats${dateQuery}`, title: 'Advanced Metrics' },
-        { type: 'odds', query: `${baseQuery} Asian Handicap odds prediction today${dateQuery}`, title: 'Latest Handicap Odds' },
-        { type: 'fatigue', query: `${homeTeam} ${awayTeam} days rest fixture congestion${dateQuery}`, title: 'Fatigue & Schedule' },
-        { type: 'setpieces', query: `${baseQuery} set pieces corners aerial duels${dateQuery}`, title: 'Set Pieces' },
-    ];
-    if (context) {
-        queries.push({ type: 'general', query: `${baseQuery} ${context}${dateQuery}`, title: 'Specific Context' });
-    }
-    // Try to get API data first
+    // Step 1: Build search queries
+    const queries = buildSearchQueries(homeTeam, awayTeam, league, context);
+    // Step 2: Fetch API data
     const api = createAPIProvider();
     const matchId = await findMatchId(homeTeam, awayTeam, league);
-    let apiData = null;
-    if (matchId) {
-        apiData = await fetchAPIMatchData(api, matchId, homeTeam, awayTeam);
-    }
-    // Assess data coverage and optimize queries
+    const apiData = matchId ? await fetchAPIMatchData(api, matchId, homeTeam, awayTeam) : null;
+    // Step 3: Assess coverage and optimize queries
     const coverage = assessDataCoverage(apiData);
     const queriesToExecute = optimizeQueries(coverage, queries);
+    // Step 4: Build header
     let combinedResults = `--- FOOTBALL MATCH DATA: ${homeTeam} vs ${awayTeam} ---\n`;
     if (matchId)
         combinedResults += `Resolved API Match ID: ${matchId}\n`;
     combinedResults += `Data Quality Score: ${coverage.score}/100\n`;
     combinedResults += `Match Context Date: ${new Date().toLocaleDateString()}\n\n`;
-    // Add API Data section if available
+    // Step 5: Add API data section
     if (apiData && coverage.score > 0) {
-        combinedResults += `--- API DATA (Reliable Source) ---\n\n`;
-        if (apiData.h2h) {
-            combinedResults += `### Head-to-Head Record\n`;
-            combinedResults += `- Total Matches: ${apiData.h2h.totalMatches}\n`;
-            combinedResults += `- ${homeTeam} Wins: ${apiData.h2h.homeWins}\n`;
-            combinedResults += `- Draws: ${apiData.h2h.draws}\n`;
-            combinedResults += `- ${awayTeam} Wins: ${apiData.h2h.awayWins}\n`;
-            combinedResults += `- Goals: ${apiData.h2h.homeGoals}-${apiData.h2h.awayGoals}\n\n`;
-        }
-        if (apiData.homeForm?.length) {
-            combinedResults += `### ${homeTeam} Recent Form (Last ${apiData.homeForm.length})\n`;
-            combinedResults += apiData.homeForm.map(m => {
-                const isHome = m.homeTeam.name.includes(homeTeam);
-                const score = m.score ? `${m.score.home}-${m.score.away}` : '?';
-                const opponent = isHome ? m.awayTeam.name : m.homeTeam.name;
-                const result = isHome
-                    ? (m.score?.home ?? 0) > (m.score?.away ?? 0) ? 'W' : (m.score?.home === m.score?.away ? 'D' : 'L')
-                    : (m.score?.away ?? 0) > (m.score?.home ?? 0) ? 'W' : (m.score?.home === m.score?.away ? 'D' : 'L');
-                return `- ${result} vs ${opponent} (${score})`;
-            }).join('\n');
-            combinedResults += '\n\n';
-        }
-        if (apiData.awayForm?.length) {
-            combinedResults += `### ${awayTeam} Recent Form (Last ${apiData.awayForm.length})\n`;
-            combinedResults += apiData.awayForm.map(m => {
-                const isAway = m.awayTeam.name.includes(awayTeam);
-                const score = m.score ? `${m.score.home}-${m.score.away}` : '?';
-                const opponent = isAway ? m.homeTeam.name : m.awayTeam.name;
-                const result = isAway
-                    ? (m.score?.away ?? 0) > (m.score?.home ?? 0) ? 'W' : (m.score?.home === m.score?.away ? 'D' : 'L')
-                    : (m.score?.home ?? 0) > (m.score?.away ?? 0) ? 'W' : (m.score?.home === m.score?.away ? 'D' : 'L');
-                return `- ${result} vs ${opponent} (${score})`;
-            }).join('\n');
-            combinedResults += '\n\n';
-        }
-        if (apiData.odds) {
-            combinedResults += `### Current Odds (from API)\n`;
-            combinedResults += `- Home Win: ${apiData.odds.homeWin.toFixed(2)}\n`;
-            combinedResults += `- Draw: ${apiData.odds.draw.toFixed(2)}\n`;
-            combinedResults += `- Away Win: ${apiData.odds.awayWin.toFixed(2)}\n`;
-            if (apiData.odds.asianHandicap) {
-                combinedResults += `- Asian Handicap: ${apiData.odds.asianHandicap.line}\n`;
-            }
-            combinedResults += '\n';
-        }
-        combinedResults += `--- END API DATA ---\n\n`;
+        combinedResults += formatAPIData(apiData, homeTeam, awayTeam);
     }
+    // Step 6: Add coverage notes
     if (coverage.factors.missingDataPoints.length > 0) {
         combinedResults += `*Note: Using web search to supplement: ${coverage.factors.missingDataPoints.join(', ')}*\n\n`;
     }
+    // Step 7: Execute searches
     const candidateUrls = [];
-    // Execute searches in parallel (in batches)
-    const BATCH_SIZE = 4;
-    for (let i = 0; i < queriesToExecute.length; i += BATCH_SIZE) {
-        const batch = queriesToExecute.slice(i, i + BATCH_SIZE);
-        const batchPromises = batch.map(async (q) => {
-            try {
-                const results = await searchProvider.search(q.query, undefined, 4);
-                results.forEach(r => candidateUrls.push(r.url));
-                const items = results.map(r => `- [${r.title}](${r.url}): ${r.snippet}`).join('\n');
-                return `### ${q.title}\n${items}\n`;
-            }
-            catch (error) {
-                return `### ${q.title} (Failed)\nError: ${error instanceof Error ? error.message : String(error)}\n`;
-            }
-        });
-        const batchResults = await Promise.all(batchPromises);
-        combinedResults += batchResults.join('\n');
-    }
-    // Deep dive: Scrape the best URLs (Dual-Source Strategy)
-    if (candidateUrls.length > 0) {
-        const bestStatsUrl = findBestMatchUrl(candidateUrls);
-        const bestNewsUrl = findBestNewsUrl(candidateUrls);
-        // 1. Scrape Stats Source (Priority)
-        if (bestStatsUrl) {
-            combinedResults += `\n--- DEEP DIVE ANALYSIS: STATS & DATA (${bestStatsUrl}) ---\n`;
-            try {
-                const scrapedContent = await scrapeMatchContent(bestStatsUrl);
-                if (scrapedContent.success) {
-                    combinedResults += scrapedContent.data || '';
-                }
-                else {
-                    combinedResults += `(Stats scrape failed: ${scrapedContent.error})`;
-                }
-            }
-            catch (scrapeError) {
-                combinedResults += `(Stats scrape failed: ${scrapeError instanceof Error ? scrapeError.message : String(scrapeError)})`;
-            }
-            combinedResults += `\n--- END STATS ---\n`;
-        }
-        // 2. Scrape News Source (if different from stats)
-        if (bestNewsUrl && bestNewsUrl !== bestStatsUrl) {
-            combinedResults += `\n--- DEEP DIVE ANALYSIS: NEWS & LINEUPS (${bestNewsUrl}) ---\n`;
-            try {
-                const scrapedContent = await scrapeMatchContent(bestNewsUrl);
-                if (scrapedContent.success) {
-                    // Truncate news to avoid blowing up context, keep first 3000 chars
-                    const newsContent = scrapedContent.data?.substring(0, 3000) || '';
-                    combinedResults += newsContent + (scrapedContent.data && scrapedContent.data.length > 3000 ? '\n...(truncated)' : '');
-                }
-                else {
-                    combinedResults += `(News scrape failed: ${scrapedContent.error})`;
-                }
-            }
-            catch (scrapeError) {
-                combinedResults += `(News scrape failed: ${scrapeError instanceof Error ? scrapeError.message : String(scrapeError)})`;
-            }
-            combinedResults += `\n--- END NEWS ---\n`;
-        }
-    }
+    const searchProvider = getSearchProvider();
+    combinedResults += await executeSearches(queriesToExecute, searchProvider, candidateUrls);
+    // Step 8: Scrape deep dive sources
+    combinedResults += await scrapeDeepDiveSources(candidateUrls);
+    // Step 9: Add instructions
     combinedResults += `\n--- END DATA ---\n\n`;
-    // Add analysis framework instructions
-    combinedResults += `INSTRUCTIONS: Act as a World-Class Football Analysis Panel. Provide a deep, non-obvious analysis using this framework:\n\n`;
-    combinedResults += `1. 📊 THE DATA SCIENTIST (Quantitative):\n   - Analyze xG trends & Possession stats.\n   - Assess Home/Away variance.\n\n`;
-    combinedResults += `2. 🧠 THE TACTICAL SCOUT (Qualitative):\n   - Stylistic Matchup (Press vs Block).\n   - Key Battles.\n\n`;
-    combinedResults += `3. 🚑 THE PHYSIO (Physical Condition):\n   - FATIGUE CHECK: Days rest? Travel distance?\n   - Squad Depth: Who has the better bench?\n\n`;
-    combinedResults += `4. 🎯 SET PIECE ANALYST:\n   - Corners/Free Kicks: Strong vs Weak?\n   - Who is most likely to score from a header?\n\n`;
-    combinedResults += `5. 💎 THE INSIDER (External Factors):\n   - Market Movements (Odds dropping?).\n   - Referee & Weather impact.\n\n`;
-    combinedResults += `6. 🕵️ THE SKEPTIC & SCENARIOS:\n   - Why might the favorite LOSE?\n   - Game Script: "If Team A scores first..."\n\n`;
-    combinedResults += `🏆 FINAL VERDICT:\n   - Asian Handicap Leans\n   - Goal Line (Over/Under)\n   - The "Value Pick"`;
+    combinedResults += getAnalysisInstructions();
     return combinedResults;
 }
+/**
+ * Scrape deep dive sources for additional context
+ */
+async function scrapeDeepDiveSources(candidateUrls) {
+    if (candidateUrls.length === 0)
+        return '';
+    let output = '';
+    const bestStatsUrl = findBestMatchUrl(candidateUrls);
+    const bestNewsUrl = findBestNewsUrl(candidateUrls);
+    // Scrape Stats Source
+    if (bestStatsUrl) {
+        output += `\n--- DEEP DIVE ANALYSIS: STATS & DATA (${bestStatsUrl}) ---\n`;
+        output += await scrapeContentWithErrorHandling(bestStatsUrl, 'stats');
+        output += `\n--- END STATS ---\n`;
+    }
+    // Scrape News Source (if different)
+    if (bestNewsUrl && bestNewsUrl !== bestStatsUrl) {
+        output += `\n--- DEEP DIVE ANALYSIS: NEWS & LINEUPS (${bestNewsUrl}) ---\n`;
+        output += await scrapeContentWithErrorHandling(bestNewsUrl, 'news');
+        output += `\n--- END NEWS ---\n`;
+    }
+    return output;
+}
 /**
  * Calculate probability range with uncertainty quantification
  */
@@ -491,6 +539,37 @@ async function detectValueBets(apiData, homeTeam, awayTeam) {
     }
     return valueBets.sort((a, b) => b.value - a.value);
 }
+/**
+ * Calculate points from a team's form matches
+ */
+function calculateFormPoints(form, teamName) {
+    return form.reduce((sum, m) => {
+        const isHome = m.homeTeam.name.includes(teamName);
+        const score = m.score;
+        if (!score)
+            return sum;
+        const teamScore = isHome ? score.home : score.away;
+        const opponentScore = isHome ? score.away : score.home;
+        if (teamScore > opponentScore)
+            return sum + 3;
+        if (teamScore === opponentScore)
+            return sum + 1;
+        return sum;
+    }, 0);
+}
+/**
+ * Calculate probabilities from form data
+ */
+function calculateProbabilitiesFromForm(homeForm, awayForm, homeTeam, awayTeam) {
+    const homePoints = calculateFormPoints(homeForm, homeTeam);
+    const awayPoints = calculateFormPoints(awayForm, awayTeam);
+    const totalPoints = homePoints + awayPoints + 5; // +5 for draw possibility
+    return {
+        homeWin: (homePoints + 1.5) / totalPoints,
+        draw: 5 / totalPoints,
+        awayWin: (awayPoints + 1.5) / totalPoints,
+    };
+}
 /**
  * Build structured analysis result from API and web data
  */
@@ -501,34 +580,10 @@ async function buildStructuredAnalysis(homeTeam, awayTeam, league, apiData, cove
     let awayWinProb = 0.35;
     // Adjust based on form if available
     if (apiData?.homeForm && apiData?.awayForm) {
-        const homePoints = apiData.homeForm.reduce((sum, m) => {
-            const isHome = m.homeTeam.name.includes(homeTeam);
-            const score = m.score;
-            if (!score)
-                return sum;
-            if (isHome) {
-                return sum + (score.home > score.away ? 3 : score.home === score.away ? 1 : 0);
-            }
-            else {
-                return sum + (score.away > score.home ? 3 : score.away === score.home ? 1 : 0);
-            }
-        }, 0);
-        const awayPoints = apiData.awayForm.reduce((sum, m) => {
-            const isAway = m.awayTeam.name.includes(awayTeam);
-            const score = m.score;
-            if (!score)
-                return sum;
-            if (isAway) {
-                return sum + (score.away > score.home ? 3 : score.away === score.home ? 1 : 0);
-            }
-            else {
-                return sum + (score.home > score.away ? 3 : score.home === score.away ? 1 : 0);
-            }
-        }, 0);
-        const totalPoints = homePoints + awayPoints + 5; // +5 for draw possibility
-        homeWinProb = (homePoints + 1.5) / totalPoints;
-        awayWinProb = (awayPoints + 1.5) / totalPoints;
-        drawProb = 1 - homeWinProb - awayWinProb;
+        const probs = calculateProbabilitiesFromForm(apiData.homeForm, apiData.awayForm, homeTeam, awayTeam);
+        homeWinProb = probs.homeWin;
+        drawProb = probs.draw;
+        awayWinProb = probs.awayWin;
     }
     // Calculate probability ranges
     const predictions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotza02/sequential-thinking",
-  "version": "10000.1.6",
+  "version": "10000.1.7",
   "publishConfig": {
     "access": "public"
   },