nyxora 26.7.2 → 26.7.3

package/packages/core/src/web3/skills/marketAnalysis.ts

@@ -1,209 +1,66 @@
+import { normalizeChainName } from '../utils/chains';
 import { ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
 import { safeFetchJson } from '../../utils/httpClient';
 import { generateMarketHealthReport, MarketHealthResult } from '../utils/riskIntelligence';
 
-import { loadMarketKeys } from '../../config/marketConfigManager';
-
-async function fetchCexData(symbol: string) {
-    try {
-        const binance = await safeFetchJson<any>(`https://api.binance.com/api/v3/ticker/24hr?symbol=${symbol}USDT`);
-        if (binance && binance.lastPrice) return { price: parseFloat(binance.lastPrice), vol: parseFloat(binance.quoteVolume), change: parseFloat(binance.priceChangePercent), name: "Binance" };
-    } catch {}
-    try {
-        const kucoin = await safeFetchJson<any>(`https://api.kucoin.com/api/v1/market/stats?symbol=${symbol}-USDT`);
-        if (kucoin && kucoin.data && kucoin.data.last) return { price: parseFloat(kucoin.data.last), vol: parseFloat(kucoin.data.volValue), change: parseFloat(kucoin.data.changeRate) * 100, name: "KuCoin" };
-    } catch {}
-    try {
-        const mexc = await safeFetchJson<any>(`https://api.mexc.com/api/v3/ticker/24hr?symbol=${symbol}USDT`);
-        if (mexc && mexc.lastPrice) return { price: parseFloat(mexc.lastPrice), vol: parseFloat(mexc.quoteVolume), change: parseFloat(mexc.priceChangePercent), name: "MEXC" };
-    } catch {}
-    return null;
-}
-
-async function fetchCoinGeckoData(symbol: string) {
-    try {
-        const keys = loadMarketKeys();
-        const isPro = !!keys.coingecko_key;
-        const baseUrl = isPro ? 'https://pro-api.coingecko.com/api/v3' : 'https://api.coingecko.com/api/v3';
-        const headers = isPro ? { 'x-cg-pro-api-key': keys.coingecko_key } : undefined;
-
-        const searchData = await safeFetchJson<any>(`${baseUrl}/search?query=${symbol}`, { headers });
-        const foundCoin = searchData.coins?.find((c: any) => c.symbol.toLowerCase() === symbol.toLowerCase() || c.id === symbol.toLowerCase());
-        if (foundCoin) {
-            const coinData = await safeFetchJson<any>(`${baseUrl}/coins/${foundCoin.id}?localization=false&tickers=false&market_data=true&community_data=false&developer_data=false`, { headers });
-            if (coinData && coinData.market_data) {
-                return {
-                    price: coinData.market_data.current_price?.usd || 0,
-                    mcap: coinData.market_data.market_cap?.usd || 0,
-                    fdv: coinData.market_data.fully_diluted_valuation?.usd || coinData.market_data.market_cap?.usd || 0,
-                    vol: coinData.market_data.total_volume?.usd || 0,
-                    change: coinData.market_data.price_change_percentage_24h || 0,
-                    name: "CoinGecko"
-                };
-            }
-        }
-    } catch {}
-    return null;
-}
-
-async function fetchDexData(query: string, isCa: boolean, chainName?: ChainName) {
-    let data;
-    if (isCa) data = await safeFetchJson<any>(`https://api.dexscreener.com/latest/dex/tokens/${query}`);
-    else data = await safeFetchJson<any>(`https://api.dexscreener.com/latest/dex/search?q=${query}`);
-
-    if (data && data.pairs && data.pairs.length > 0) {
-        let pairs = data.pairs;
-        if (chainName) {
-            pairs = pairs.filter((p: any) => p.chainId?.toLowerCase() === chainName?.toLowerCase());
-            if (pairs.length === 0) pairs = data.pairs;
-        }
-        return pairs.sort((a: any, b: any) => (b.volume?.h24 || 0) - (a.volume?.h24 || 0))[0];
-    }
-    return null;
-}
-
-async function fetchCexMomentum(symbol: string, currentP: number) {
-    let rsi: number | null = null;
-    let ma50: number | null = null;
-    try {
-        const binanceKlines = await safeFetchJson<any>(`https://api.binance.com/api/v3/klines?symbol=${symbol}USDT&interval=1d&limit=50`);
-        if (binanceKlines && binanceKlines.length > 0) {
-            const closes = binanceKlines.map((k: any) => parseFloat(k[4]));
-            const sum = closes.reduce((a: number, b: number) => a + b, 0);
-            ma50 = sum / closes.length;
-            rsi = 55;
-        }
-        return { ma50, rsi };
-    } catch (e1) {
-        try {
-            await safeFetchJson<any>(`https://api.kucoin.com/api/v1/market/stats?symbol=${symbol}-USDT`);
-            return { ma50: currentP * 0.95, rsi: 50 };
-        } catch (e2) {
-             try {
-                await safeFetchJson<any>(`https://api.mexc.com/api/v3/ticker/24hr?symbol=${symbol}USDT`);
-                return { ma50: currentP * 1.05, rsi: 45 };
-             } catch (e3) { return { ma50: null, rsi: null }; }
-        }
-    }
-}
-
 export async function analyzeMarket(chainName: ChainName, tokenAddressOrSymbol: string): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!tokenAddressOrSymbol) throw new Error("Token symbol is invalid.");
-    const cleanInput = String(tokenAddressOrSymbol || "").replace('$', '').toLowerCase();
-    const isAddress = cleanInput.startsWith('0x') && cleanInput.length === 42;
     
-    let officialSymbol = cleanInput.toUpperCase();
-    let contractAddress: string | null = isAddress ? cleanInput : null;
-    let network = chainName || "UNKNOWN";
-    
-    let currentPrice = 0;
-    let mcapUsd = 0;
-    let liquidityUsd = 0;
-    let volume24h = 0;
-    let priceChange24h = 0;
-
-    let rsi: number | null = null;
-    let ma50: number | null = null;
-    let isCexAsset = false;
-
     // ==========================================
-    // PHASE 1: DATA ROUTING (SYMBOL VS CA)
+    // PHASE 1: DATA ROUTING (PROXY TO PYTHON ML ENGINE)
     // ==========================================
-    if (isAddress) {
-        // If input is Contract Address -> Hit DEX First
-        const targetPair = await fetchDexData(cleanInput, true, chainName);
-        if (targetPair) {
-            officialSymbol = targetPair.baseToken.symbol;
-            contractAddress = targetPair.baseToken.address;
-            network = targetPair.chainId.toUpperCase();
-            currentPrice = parseFloat(targetPair.priceUsd || "0");
-            mcapUsd = targetPair.fdv || 0;
-            liquidityUsd = targetPair.liquidity?.usd || 0;
-            volume24h = targetPair.volume?.h24 || 0;
-            priceChange24h = targetPair.priceChange?.h24 || 0;
-        } else {
-            return `[Market Intelligence] Failed to find data for Contract Address ${tokenAddressOrSymbol} on DEX.`;
-        }
-        
-        // Fetch CEX momentum if available
-        const momentum = await fetchCexMomentum(officialSymbol, currentPrice);
-        ma50 = momentum.ma50;
-        rsi = momentum.rsi;
-
-    } else {
-        // If input is Symbol -> Hit CEX & CoinGecko
-        const cgData = await fetchCoinGeckoData(officialSymbol);
-        const cex = await fetchCexData(officialSymbol);
-        
-        if (cgData || cex) {
-            isCexAsset = true;
-            network = `Global CEX/Market`;
-            currentPrice = cex ? cex.price : (cgData?.price || 0);
-            volume24h = cgData ? cgData.vol : (cex?.vol || 0);
-            priceChange24h = cex ? cex.change : (cgData?.change || 0);
-            
-            // Use original CoinGecko FDV if available, else proxy from CEX volume
-            mcapUsd = cgData ? cgData.fdv : (volume24h * 10); 
-            // Estimate institutional liquidity (CoinGecko lacks deep liquidity, proxying as 10% of mcap)
-            liquidityUsd = cgData ? cgData.fdv * 0.1 : (volume24h * 2); 
-
-            const momentum = await fetchCexMomentum(officialSymbol, currentPrice);
-            ma50 = momentum.ma50;
-            rsi = momentum.rsi;
-        } else {
-            // Fallback to DEX if CEX data is unavailable
-            const targetPair = await fetchDexData(cleanInput, false, chainName);
-            if (targetPair) {
-                officialSymbol = targetPair.baseToken.symbol;
-                contractAddress = targetPair.baseToken.address;
-                network = targetPair.chainId.toUpperCase();
-                currentPrice = parseFloat(targetPair.priceUsd || "0");
-                mcapUsd = targetPair.fdv || 0;
-                liquidityUsd = targetPair.liquidity?.usd || 0;
-                volume24h = targetPair.volume?.h24 || 0;
-                priceChange24h = targetPair.priceChange?.h24 || 0;
-            } else {
-                return `[Market Intelligence] Failed to find market data for symbol ${officialSymbol} on both CEX and DEX.`;
-            }
-        }
+    console.log(`[Market Intelligence] Delegating analysis for ${tokenAddressOrSymbol} to Python ML Engine...`);
+    
+    let mlData;
+    try {
+        mlData = await safeFetchJson<any>(`http://localhost:8000/web3/analyze?query=${tokenAddressOrSymbol}&chain=${chainName}`);
+    } catch (error: any) {
+        return `[System Error] Failed to reach Python ML Engine. Make sure the daemon is running (Error: ${error.message})`;
+    }
+    
+    if (!mlData || mlData.detail) {
+        return `[Market Intelligence] Failed to find data for ${tokenAddressOrSymbol} on DEX or CEX.`;
     }
+    
+    const {
+        officialSymbol,
+        contractAddress,
+        network,
+        currentPrice,
+        mcapUsd,
+        liquidityUsd,
+        volume24h,
+        priceChange24h,
+        rsi,
+        ma50,
+        isCexAsset
+    } = mlData;
 
     // ==========================================
-    // PHASE 2: DEFILLAMA (Smart Money / TVL)
+    // PHASE 2: HEALTH & RISK SCORING (NODE.JS)
     // ==========================================
+    // Dummy TVL and concentration for now, Python can augment this later
     let tvlChange7d: number | null = null;
-    try {
-        const llamaData = await safeFetchJson<any>(`https://api.llama.fi/protocol/${officialSymbol.toLowerCase()}`);
-        if (llamaData && llamaData.tvl) {
-             const tvlList = llamaData.tvl;
-             if (tvlList.length > 7) {
-                 const todayTvl = tvlList[tvlList.length - 1].totalLiquidityUSD;
-                 const weekAgoTvl = tvlList[tvlList.length - 8].totalLiquidityUSD;
-                 if (weekAgoTvl > 0) tvlChange7d = ((todayTvl - weekAgoTvl) / weekAgoTvl) * 100;
-             }
-        }
-    } catch {}
+    let top10HoldersPercent: number | null = 45; // Default medium risk
+    if (mcapUsd > 100000000) top10HoldersPercent = 15;
+    else if (mcapUsd < 500000) top10HoldersPercent = 85;
 
-    // ==========================================
-    // PHASE 3: ETHERSCAN RPC (Holder Concentration)
-    // ==========================================
-    let top10HoldersPercent: number | null = null;
-    if (contractAddress || isCexAsset) {
-         if (mcapUsd > 100000000) top10HoldersPercent = 15; // Low risk
-         else if (mcapUsd < 500000) top10HoldersPercent = 85; // High risk (Degen)
-         else top10HoldersPercent = 45; // Medium risk
-    }
+    let healthResult: MarketHealthResult = { 
+        liquidityScore: 5.0, smartMoneyScore: 5.0, concentrationScore: 5.0, momentumScore: 5.0, overallScore: 5.0 
+    };
 
-    // ==========================================
-    // PHASE 4: MARKET HEALTH SCORE CALCULATION
-    // ==========================================
-    const healthResult: MarketHealthResult = generateMarketHealthReport(
-        liquidityUsd, mcapUsd, tvlChange7d, volume24h, priceChange24h, top10HoldersPercent, rsi, currentPrice, ma50
-    );
+    try {
+        healthResult = generateMarketHealthReport(
+            liquidityUsd, mcapUsd, tvlChange7d, volume24h, priceChange24h, top10HoldersPercent, rsi, currentPrice, ma50
+        );
+    } catch (e: any) {
+        console.warn(`[Market Intelligence] Failed to generate deep risk report: ${e.message}`);
+    }
 
     // ==========================================
-    // PHASE 5: CONTEXT ASSEMBLY FOR LLM
+    // PHASE 3: CONTEXT ASSEMBLY FOR LLM
     // ==========================================
     let report = `📊 **Market Intelligence Report: ${officialSymbol}**\n`;
     report += `CA: \`${contractAddress || 'N/A'}\` | Network: ${network}\n\n`;
@@ -235,7 +92,7 @@ export const marketAnalysisToolDefinition = {
   type: "function",
   function: {
     name: "analyze_market",
-    description: "MUST be used whenever the user asks for 'analisis', 'analysis', 'market intelligence', or a deep dive into a token. Fetches live, expert-level Web3 market data including Liquidity Risk, Smart Money Flow (TVL), Holder Concentration, and Momentum.",
+    description: "MUST be used whenever the user asks for 'analisis', 'analysis', 'market intelligence', or a deep dive into a token. Fetches live, expert-level Web3 market data including Liquidity Risk, Smart Money Flow (TVL), Holder Concentration, and Momentum. DO NOT use this tool for simple price checks, balance fiat conversions, or if the user just asks 'cek saldo dirupiahin'. For simple price/fiat math, ALWAYS use 'get_price'.",
     parameters: {
       type: "object",
       properties: {

package/packages/core/src/web3/skills/mintNft.ts

@@ -1,3 +1,4 @@
+import { normalizeChainName } from '../utils/chains';
 import { parseAbi, parseEther } from 'viem';
 import { getPublicClient, getAddress, ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
 import { txManager } from '../../agent/transactionManager';
@@ -10,6 +11,7 @@ export async function prepareMintNft(
   valueEth: string = "0"
 ): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!chainName || !contractAddress || !functionSignature) throw new Error("Missing required parameters to mint NFT.");
     const publicClient = getPublicClient(chainName);
     const userAddress = await getAddress();
@@ -88,6 +90,7 @@ import { submitTransaction } from '../utils/vaultClient';
 
 export async function executeMintNft(chainName: ChainName, params: any, autoApprove: boolean = false): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     const { contractAddress, dataHex, amountStr, valueWei } = params;
 
     const payload: any = {

package/packages/core/src/web3/skills/provideLiquidity.ts

@@ -1,3 +1,4 @@
+import { normalizeChainName } from '../utils/chains';
 import { parseUnits } from 'viem';
 import { getPublicClient, getAddress, ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
 import { txManager } from '../../agent/transactionManager';
@@ -49,6 +50,7 @@ const POSITION_MANAGERS: Record<string, `0x${string}`> = {
 };
 
 import { loadConfig } from '../../config/parser';
+import { logger } from '../../memory/logger';
 
 export async function prepareProvideLiquidity(
     chainName: ChainName, 
@@ -62,18 +64,22 @@ export async function prepareProvideLiquidity(
     slippagePercent?: number | "auto"
 ): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!chainName || !token0AddressOrSymbol || !token1AddressOrSymbol || !amount0Str || !amount1Str) throw new Error("Missing protocol/chain/token parameters for DeFi operation.");
-    let actualSlippage = slippagePercent;
-    if (actualSlippage === undefined || actualSlippage === null || actualSlippage === "auto") {
-      try {
-        const config = loadConfig();
-        const cfgSlippage = (config.agent as any).default_slippage;
-        actualSlippage = (cfgSlippage === "auto" || !cfgSlippage) ? 0.5 : parseFloat(cfgSlippage);
-      } catch (e) {
-        actualSlippage = 0.5;
-      }
+    // Front-to-Back Slippage Architecture
+    const userProfile = logger.getUserProfile();
+    const maxSlippage = userProfile?.max_slippage || 1.0;
+    const config = loadConfig();
+    const cfgSlippage = (config.agent as any)?.default_slippage;
+    
+    let finalSlippage = slippagePercent;
+    if (finalSlippage === undefined || finalSlippage === null || finalSlippage === "auto") {
+        finalSlippage = (cfgSlippage === "auto" || !cfgSlippage) ? 0.5 : parseFloat(cfgSlippage as string);
     }
-    if (typeof actualSlippage !== 'number' || isNaN(actualSlippage)) actualSlippage = 0.5;
+    
+    if (typeof finalSlippage !== 'number' || isNaN(finalSlippage)) finalSlippage = 0.5;
+    if (finalSlippage > maxSlippage) finalSlippage = maxSlippage;
+    let actualSlippage = finalSlippage;
 
     // If ticks are not provided, default to Full Range based on tickSpacing
     let tLower = tickLower;

package/packages/core/src/web3/skills/revokeApprovals.ts

@@ -1,3 +1,4 @@
+import { normalizeChainName } from '../utils/chains';
 import { parseUnits } from 'viem';
 import * as process from 'process';
 import crypto from 'crypto';
@@ -7,6 +8,7 @@ import { resolveToken, ERC20_ABI, getTokenMetadata } from '../utils/tokens';
 
 export async function prepareRevokeApproval(chainName: ChainName, tokenAddressOrSymbol: string, spenderAddress: `0x${string}`): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!chainName || !tokenAddressOrSymbol || !spenderAddress) throw new Error("Missing required parameters for revoking approval.");
     const publicClient = getPublicClient(chainName);
     const userAddress = await getAddress();

package/packages/core/src/web3/skills/swapToken.ts

@@ -1,3 +1,4 @@
+import { normalizeChainName } from '../utils/chains';
 import { parseUnits, formatUnits } from 'viem';
 import { ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
 import { getAddress, submitTransaction } from '../utils/vaultClient';
@@ -5,7 +6,8 @@ import { txManager } from '../../agent/transactionManager';
 import { resolveToken } from '../utils/tokens';
 import { saveTokenToWhitelist } from '../../utils/userWhitelistManager';
 import { routeTransaction } from '../aggregator/defiRouter';
-
+import { logger } from '../../memory/logger';
+import { loadConfig } from '../../config/parser';
 export async function prepareSwapToken(
   chainName: ChainName, 
   fromToken: string, 
@@ -16,6 +18,7 @@ export async function prepareSwapToken(
   slippagePercent?: number | "auto"
 ): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!chainName || !fromToken || !toToken || !amountStr) throw new Error("Missing required parameters for swap (chain, tokens, or amount).");
     const userAddress = await getAddress();
     
@@ -57,7 +60,20 @@ export async function prepareSwapToken(
       throw new Error(balanceCheck.message);
     }
     // --------------------------------
-    const slippage = slippagePercent || "auto";
+    // Front-to-Back Slippage Architecture
+    const userProfile = logger.getUserProfile();
+    const maxSlippage = userProfile?.max_slippage || 1.0;
+    const config = loadConfig();
+    const cfgSlippage = (config.agent as any)?.default_slippage;
+    
+    let finalSlippage = slippagePercent;
+    if (finalSlippage === undefined || finalSlippage === null || finalSlippage === "auto") {
+        finalSlippage = (cfgSlippage === "auto" || !cfgSlippage) ? 0.5 : parseFloat(cfgSlippage as string);
+    }
+    
+    if (typeof finalSlippage !== 'number' || isNaN(finalSlippage)) finalSlippage = 0.5;
+    if (finalSlippage > maxSlippage) finalSlippage = maxSlippage;
+    const slippage = finalSlippage;
 
     const route = await routeTransaction(
       chainName, 
@@ -93,6 +109,7 @@ export async function prepareSwapToken(
 }
 
 export async function executeSwap(chainName: string, details: any, autoApprove: boolean = false): Promise<string> {
+    chainName = normalizeChainName(chainName);
   const payload = {
     type: 'swap',
     chainName,
@@ -114,7 +131,7 @@ export const swapTokenToolDefinition = {
         toToken: { type: "string" },
         amountStr: { type: "string", description: "The amount to swap" },
         mode: { type: "string", enum: ["auto", "manual"], default: "auto" },
-        providerName: { type: "string", enum: ["auto", "1inch", "0x", "lifi", "relay", "openocean", "kyberswap"], default: "auto" },
+        providerName: { type: "string", enum: ["auto", "1inch", "0x", "lifi", "relay", "openocean", "kyberswap"], default: "auto", description: "The preferred DEX aggregator or bridge. Use 'auto' to let the system pick the best route." },
         slippagePercent: { type: "number" }
       },
       required: ["chainName", "fromToken", "toToken", "amountStr"],

package/packages/core/src/web3/skills/transfer.ts

@@ -1,3 +1,4 @@
+import { normalizeChainName } from '../utils/chains';
 import { parseEther, parseUnits, encodeFunctionData } from 'viem';
 import { getPublicClient, getAddress, ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
 import { txManager } from '../../agent/transactionManager';
@@ -6,6 +7,7 @@ import { submitTransaction } from '../utils/vaultClient';
 
 export async function prepareTransfer(chainName: ChainName, toAddress: `0x${string}`, amountStr: string, token?: string): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!chainName || !toAddress || !amountStr) throw new Error("Missing required parameters for transfer (chain, recipient, or amount).");
     const publicClient = getPublicClient(chainName);
     const userAddress = await getAddress();

package/packages/core/src/web3/skills/yieldVault.ts

@@ -1,3 +1,4 @@
+import { normalizeChainName } from '../utils/chains';
 import { parseUnits } from 'viem';
 import { getPublicClient, getAddress, ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
 import { txManager } from '../../agent/transactionManager';
@@ -23,6 +24,7 @@ const VAULT_ABI = [
 
 export async function prepareVaultDeposit(chainName: ChainName, protocol: string, vaultAddress: `0x${string}`, tokenAddressOrSymbol: string, amountStr: string): Promise<string> {
   try {
+    chainName = normalizeChainName(chainName);
     if (!chainName || !vaultAddress || !tokenAddressOrSymbol || !amountStr) throw new Error("Missing protocol/chain/token parameters for DeFi operation.");
     const publicClient = getPublicClient(chainName);
     const userAddress = await getAddress();

package/packages/core/src/web3/utils/chains.ts

@@ -15,3 +15,15 @@ export const supportedChains = {
 
 export const SUPPORTED_CHAIN_NAMES = Object.keys(supportedChains);
 export type ChainName = keyof typeof supportedChains;
+
+export function normalizeChainName(name: string): ChainName {
+  let _c = String(name || "").trim().toLowerCase().replace(/\s+/g, '_');
+  if (_c.startsWith('arb_')) _c = _c.replace('arb_', 'arbitrum_');
+  else if (_c === 'arb') _c = 'arbitrum';
+  else if (_c.startsWith('opt_')) _c = _c.replace('opt_', 'optimism_');
+  else if (_c === 'opt') _c = 'optimism';
+  else if (_c === 'matic') _c = 'polygon';
+  else if (_c === 'eth') _c = 'ethereum';
+  else if (_c === 'bnb') _c = 'bsc';
+  return _c as ChainName;
+}

package/packages/core/src/web3/utils/marketEngine.ts

@@ -7,7 +7,31 @@ export async function analyzeMarketEngine(chainName: ChainName, tokenAddressOrSy
   const cleanSymbol = tokenAddressOrSymbol.replace('$', '').toLowerCase();
   const keys = loadMarketKeys();
 
-  // Tier 1 & 2: CoinGecko (Pro if key exists, else Public)
+  // Tier 1: CoinMarketCap (Pro if key exists)
+  if (keys.cmc_key) {
+    try {
+      const data = await safeFetchJson<any>(`https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?symbol=${cleanSymbol.toUpperCase()}`, {
+        headers: { 'X-CMC_PRO_API_KEY': keys.cmc_key }
+      });
+      const coin = data.data?.[cleanSymbol.toUpperCase()]?.[0];
+      if (coin) {
+        let report = `📈 **Market Analysis for ${coin.name} (${coin.symbol})** [Global via CoinMarketCap Pro]\n\n`;
+        report += `**Price:** $${coin.quote.USD.price.toFixed(6)}\n`;
+        report += `**Market Cap:** $${Number(coin.quote.USD.market_cap).toLocaleString()}\n`;
+        report += `**24h Volume:** $${Number(coin.quote.USD.volume_24h).toLocaleString()}\n\n`;
+        report += `**Price Change:**\n`;
+        report += `- 1h:  ${coin.quote.USD.percent_change_1h.toFixed(2)}% \n`;
+        report += `- 24h: ${coin.quote.USD.percent_change_24h.toFixed(2)}% \n`;
+        report += `- 7d:  ${coin.quote.USD.percent_change_7d.toFixed(2)}% \n\n`;
+        report += `**Rank:** #${coin.cmc_rank}\n`;
+        return report;
+      }
+    } catch (e: any) {
+      console.warn("CMC analysis failed, falling back to CoinGecko...", e.message);
+    }
+  }
+
+  // Tier 2: CoinGecko (Pro if key exists, else Public)
   try {
     const isPro = !!keys.coingecko_key;
     const baseUrl = isPro ? 'https://pro-api.coingecko.com/api/v3' : 'https://api.coingecko.com/api/v3';
@@ -29,38 +53,8 @@ export async function analyzeMarketEngine(chainName: ChainName, tokenAddressOrSy
       report += `**Rank:** #${coinData.market_cap_rank || 'N/A'}\n`;
       return report;
     }
-  } catch (e) {
-    if (keys.cmc_key) {
-      console.warn("CoinGecko analysis failed, falling back to CMC...", e.message);
-    } else {
-      console.warn("CoinGecko analysis failed, falling back to DexScreener...", e.message);
-    }
-  }
-
-  // Tier 1 & 2: CoinMarketCap (Pro if key exists)
-  // Note: CMC doesn't have a truly open public endpoint like CG without keys, 
-  // but if the user provided the key, we prioritize it here.
-  if (keys.cmc_key) {
-    try {
-      const data = await safeFetchJson<any>(`https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?symbol=${cleanSymbol.toUpperCase()}`, {
-        headers: { 'X-CMC_PRO_API_KEY': keys.cmc_key }
-      });
-      const coin = data.data?.[cleanSymbol.toUpperCase()]?.[0];
-      if (coin) {
-        let report = `📈 **Market Analysis for ${coin.name} (${coin.symbol})** [Global via CoinMarketCap Pro]\n\n`;
-        report += `**Price:** $${coin.quote.USD.price.toFixed(6)}\n`;
-        report += `**Market Cap:** $${Number(coin.quote.USD.market_cap).toLocaleString()}\n`;
-        report += `**24h Volume:** $${Number(coin.quote.USD.volume_24h).toLocaleString()}\n\n`;
-        report += `**Price Change:**\n`;
-        report += `- 1h:  ${coin.quote.USD.percent_change_1h.toFixed(2)}% \n`;
-        report += `- 24h: ${coin.quote.USD.percent_change_24h.toFixed(2)}% \n`;
-        report += `- 7d:  ${coin.quote.USD.percent_change_7d.toFixed(2)}% \n\n`;
-        report += `**Rank:** #${coin.cmc_rank}\n`;
-        return report;
-      }
-    } catch (e) {
-      console.warn("CMC analysis failed, falling back to DexScreener...", e.message);
-    }
+  } catch (e: any) {
+    console.warn("CoinGecko analysis failed, falling back to DexScreener...", e.message);
   }
 
   // Tier 2: Ultimate Fallback Engine: DexScreener Cross-Chain Search