nyxora 26.6.13 → 26.6.18

package/packages/core/src/gateway/telegram.ts

@@ -69,13 +69,13 @@ export function startTelegramBot() {
       pinExpiry = Date.now() + 5 * 60 * 1000; // 5 minutes TTL
       
       console.log(pc.yellow('\n==================================================='));
-      console.log(pc.yellow('🔐 OTORISASI BOT TELEGRAM DIBUTUHKAN'));
+      console.log(pc.yellow('🔐 TELEGRAM BOT AUTHORIZATION REQUIRED'));
       console.log(pc.yellow('==================================================='));
-      console.log('Bot Telegram Anda saat ini terkunci demi keamanan.');
-      console.log('Buka Telegram Anda, dan kirimkan perintah berikut ke bot Anda:\n');
+      console.log('Your Telegram Bot is currently locked for security.');
+      console.log('Open your Telegram app, and send the following command to your bot:\n');
       console.log(pc.cyan(`  /auth ${generatedPin}\n`));
-      console.log(pc.gray('(Kode OTP ini akan kedaluwarsa dalam 5 menit)\n'));
-      console.log('⏳ Menunggu pesan masuk...');
+      console.log(pc.gray('(This OTP code will expire in 5 minutes)\n'));
+      console.log('⏳ Waiting for incoming message...');
     }
 
     // Security Middleware (OTP & Authorization)
@@ -108,11 +108,11 @@ export function startTelegramBot() {
             currentConfig.integrations.telegram.authorized_chat_id = ctx.chat?.id;
             saveConfig(currentConfig);
             
-            await ctx.reply('✅ Otorisasi Berhasil! Agen Nyxora kini hanya akan mematuhi perintah Anda. Koneksi diamankan.');
+            await ctx.reply('✅ Authorization Successful! Nyxora Agent will now only obey your commands. Connection secured.');
             console.log(pc.green(`\n[Telegram] Successfully paired with Chat ID: ${ctx.chat?.id}`));
             return; // Done parsing auth, ignore this specific message for further logic
           } else {
-            await ctx.reply('❌ PIN salah.');
+            await ctx.reply('❌ Incorrect PIN.');
             return;
           }
         }
@@ -124,7 +124,7 @@ export function startTelegramBot() {
 
     bot.command('clear', async (ctx) => {
       logger.clear(ctx.chat?.id.toString());
-      await ctx.reply('✅ Memori AI telah dihapus. Mari kita mulai obrolan baru!');
+      await ctx.reply("✅ AI memory has been cleared. Let's start a new chat!");
     });
 
     bot.on('text', async (ctx) => {
@@ -227,17 +227,7 @@ export function startTelegramBot() {
         
         txManager.updateStatus(txId, 'executed', result);
         
-        // Pass session history to formatTransactionSuccess to detect language
-        const sessionId = ctx.chat?.id.toString() || 'default';
-        const history = logger.getHistory(sessionId);
-        let isIndonesian = false;
-        if (history.length > 0) {
-           const lastMsg = history[history.length - 1].content.toLowerCase();
-           const idWords = ['saya', 'kamu', 'aku', 'apa', 'bagaimana', 'kenapa', 'bisa', 'tolong', 'ke', 'di', 'dari', 'yang', 'ini', 'itu', 'buat', 'cek', 'saldo'];
-           if (idWords.some(w => lastMsg.includes(w))) isIndonesian = true;
-        }
-
-        const prettyMsg = formatTransactionSuccess(tx, result, isIndonesian);
+        const prettyMsg = formatTransactionSuccess(tx, result);
         await ctx.reply(formatToTelegramHTML(`✅ **Transaction processed: Success**\n\n${prettyMsg}`), { parse_mode: 'HTML' });
         
         processUserInput(`Transaction ${txId} was APPROVED via Telegram. Result: ${result}`, 'system', undefined, ctx.chat?.id.toString()).catch(() => {});

package/packages/core/src/system/skills/updateSecurityPolicy.ts

@@ -1,27 +1,34 @@
 import fs from 'fs';
+import yaml from 'yaml';
 import { getPath } from '../../config/paths';
 
 export function updateSecurityPolicy(rule: string, action: 'add' | 'remove' | 'clear'): string {
   try {
-    const policyPath = getPath('security_policy.md');
-    let existingContent = "";
+    const policyPath = getPath('policy.yaml');
+    let policyRules: any = { max_usd_per_tx: 999999999, whitelist_only: false, require_approval: true, custom_llm_rules: [] };
     
     if (fs.existsSync(policyPath)) {
-      existingContent = fs.readFileSync(policyPath, 'utf8');
+      const file = fs.readFileSync(policyPath, 'utf8');
+      policyRules = { ...policyRules, ...(yaml.parse(file) || {}) };
+    }
+
+    if (!Array.isArray(policyRules.custom_llm_rules)) {
+      policyRules.custom_llm_rules = [];
     }
     
     if (action === 'clear') {
-      fs.writeFileSync(policyPath, '', 'utf8');
+      policyRules.custom_llm_rules = [];
+      fs.writeFileSync(policyPath, yaml.stringify(policyRules), 'utf8');
       return "Security policy cleared.";
     } else if (action === 'add') {
-      const newContent = existingContent + (existingContent.endsWith('\n') || existingContent === '' ? '' : '\n') + `* ${rule}`;
-      fs.writeFileSync(policyPath, newContent, 'utf8');
+      if (!policyRules.custom_llm_rules.includes(rule)) {
+        policyRules.custom_llm_rules.push(rule);
+      }
+      fs.writeFileSync(policyPath, yaml.stringify(policyRules), 'utf8');
       return `Rule added to security policy: ${rule}`;
     } else if (action === 'remove') {
-      // Very basic line removal
-      const lines = existingContent.split('\n');
-      const filtered = lines.filter(l => !l.includes(rule));
-      fs.writeFileSync(policyPath, filtered.join('\n'), 'utf8');
+      policyRules.custom_llm_rules = policyRules.custom_llm_rules.filter((r: string) => !r.includes(rule));
+      fs.writeFileSync(policyPath, yaml.stringify(policyRules), 'utf8');
       return `Rule removed (if it existed).`;
     }
     
@@ -35,7 +42,7 @@ export const updateSecurityPolicyToolDefinition = {
   type: "function",
   function: {
     name: "update_security_policy",
-    description: "Updates the security_policy.md file to restrict your own autonomous behavior. Use this when the user explicitly forbids you from doing something (e.g. 'do not touch drive E').",
+    description: "Updates the custom_llm_rules array in policy.yaml to restrict your own autonomous behavior. Use this when the user explicitly forbids you from doing something.",
     parameters: {
       type: "object",
       properties: {

package/packages/core/src/utils/formatter.ts

@@ -1,6 +1,6 @@
 import { PendingTransaction } from '../agent/transactionManager';
 
-export function formatTransactionSuccess(tx: PendingTransaction, rawResult: string, isIndonesian: boolean = false): string {
+export function formatTransactionSuccess(tx: PendingTransaction, rawResult: string): string {
   let txHash = 'N/A';
   
   try {
@@ -27,39 +27,35 @@ export function formatTransactionSuccess(tx: PendingTransaction, rawResult: stri
 
   let actionText = '';
   if (tx.type === 'swap') {
-    actionText = isIndonesian ? `Swap ${tx.details.amountStr || tx.details.amount} ${tx.details.fromToken.toUpperCase()} ke ${tx.details.toToken.toUpperCase()}` : `Swapped ${tx.details.amountStr || tx.details.amount} ${tx.details.fromToken.toUpperCase()} to ${tx.details.toToken.toUpperCase()}`;
+    actionText = `Swapped ${tx.details.amountStr || tx.details.amount} ${tx.details.fromToken.toUpperCase()} to ${tx.details.toToken.toUpperCase()}`;
   } else if (tx.type === 'transfer') {
-    actionText = isIndonesian ? `Transfer ${tx.details.amountStr || tx.details.amountEth} token ke \`${tx.details.toAddress.slice(0, 6)}...${tx.details.toAddress.slice(-4)}\`` : `Transferred ${tx.details.amountStr || tx.details.amountEth} tokens to \`${tx.details.toAddress.slice(0, 6)}...${tx.details.toAddress.slice(-4)}\``;
+    actionText = `Transferred ${tx.details.amountStr || tx.details.amountEth} tokens to \`${tx.details.toAddress.slice(0, 6)}...${tx.details.toAddress.slice(-4)}\``;
   } else if (tx.type === 'bridge') {
-    actionText = isIndonesian ? `Bridge token ke ${formatChain(tx.details.toChain)}` : `Bridged tokens to ${formatChain(tx.details.toChain)}`;
+    actionText = `Bridged tokens to ${formatChain(tx.details.toChain)}`;
   } else if (tx.type === 'approve') {
-    actionText = isIndonesian ? `Approve akses token` : `Approved token access`;
+    actionText = `Approved token access`;
   } else if (tx.type === 'revokeApproval') {
-    actionText = isIndonesian ? `Cabut akses token (Revoke)` : `Revoked token access`;
+    actionText = `Revoked token access`;
   } else if (tx.type === 'aaveSupply') {
-    actionText = isIndonesian ? `Deposit ke Aave V3` : `Deposited to Aave V3`;
+    actionText = `Deposited to Aave V3`;
   } else if (tx.type === 'vaultDeposit') {
-    actionText = isIndonesian ? `Deposit ke Yield Vault` : `Deposited to Yield Vault`;
+    actionText = `Deposited to Yield Vault`;
   } else if (tx.type === 'mint') {
-    actionText = isIndonesian ? `Mint NFT` : `Minted NFT`;
+    actionText = `Minted NFT`;
   } else if (tx.type === 'univ3Mint') {
-    actionText = isIndonesian ? `Penyediaan Likuiditas Uniswap` : `Uniswap Liquidity Provided`;
+    actionText = `Uniswap Liquidity Provided`;
   } else {
-    actionText = isIndonesian ? 'Aksi Berhasil' : 'Action Successful';
+    actionText = 'Action Successful';
   }
 
   // Format hash to be cleaner (0x1234...abcd)
   const shortHash = txHash.length > 20 && txHash.startsWith('0x') ? `${txHash.slice(0, 6)}...${txHash.slice(-4)}` : txHash;
 
-  if (isIndonesian) {
-    return `🌐 **Jaringan:** ${chainFormatted}\n🎯 **Aksi:** ${actionText}\n📝 **Tx Hash:** \`${shortHash}\``;
-  } else {
-    return `🌐 **Network:** ${chainFormatted}\n🎯 **Action:** ${actionText}\n📝 **Tx Hash:** \`${shortHash}\``;
-  }
+  return `🌐 **Network:** ${chainFormatted}\n🎯 **Action:** ${actionText}\n📝 **Tx Hash:** \`${shortHash}\``;
 }
 
 export function formatTransactionError(tx: PendingTransaction, errorMsg: string): string {
   const formatChain = (c: string) => c.split('_').map(w => w.charAt(0).toUpperCase() + w.slice(1)).join(' ');
   const chainFormatted = formatChain(tx.chainName);
-  return `❌ **Transaksi Gagal (${chainFormatted})**\n\n🚨 Kesalahan: ${errorMsg}`;
+  return `❌ **Transaction Failed (${chainFormatted})**\n\n🚨 Error: ${errorMsg}`;
 }

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

@@ -0,0 +1,59 @@
+import { ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
+
+export async function createMarketWatchAgent(
+    chainName: ChainName, 
+    contractAddress: string,
+    rules: string[],
+    durationDays: number
+): Promise<string> {
+    
+    // In a real production environment, this would push a job to Redis/Celery 
+    // or instantiate a background worker. For now, we simulate the agent spawning.
+    
+    const jobId = `watch-${contractAddress.substring(0,8)}-${Date.now()}`;
+    
+    let report = `✅ **Autonomous Watchdog Agent Deployed!**\n\n`;
+    report += `**Job ID:** \`${jobId}\`\n`;
+    report += `**Target:** \`${contractAddress}\` on ${chainName.toUpperCase()}\n`;
+    report += `**Duration:** ${durationDays} Days\n`;
+    report += `**Monitoring Rules:**\n`;
+    rules.forEach((r, i) => {
+        report += `${i + 1}. ${r}\n`;
+    });
+    
+    report += `\n*The watchdog is now actively monitoring the chain in the background. You will receive an immediate push notification/alert if any of these conditions are met.*`;
+
+    return report;
+}
+
+export const createMarketWatchAgentToolDefinition = {
+  type: "function",
+  function: {
+    name: "create_market_watch_agent",
+    description: "Spawns an autonomous background agent that continuously monitors a specific token for specific triggers (like Whale dumping, TVL dropping, or Rugpulls) over a period of time.",
+    parameters: {
+      type: "object",
+      properties: {
+        chainName: {
+          type: "string",
+          enum: SUPPORTED_CHAIN_NAMES,
+          description: "The blockchain network",
+        },
+        contractAddress: {
+          type: "string",
+          description: "The exact Contract Address (e.g. 0x...) to monitor.",
+        },
+        rules: {
+            type: "array",
+            items: { type: "string" },
+            description: "An array of specific rules to monitor (e.g. ['TVL drops > 10%', 'Liquidity drops > 20%'])",
+        },
+        durationDays: {
+            type: "number",
+            description: "How many days the watchdog should run."
+        }
+      },
+      required: ["chainName", "contractAddress", "rules", "durationDays"],
+    },
+  },
+};

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

@@ -4,7 +4,7 @@ export const getPriceToolDefinition = {
   type: "function",
   function: {
     name: "get_price",
-    description: "Fetches the current price of a cryptocurrency in USD along with its 24h change percentage.",
+    description: "Fetches the current price of a cryptocurrency. Use ONLY when the user explicitly asks for a simple price check (e.g. 'harga', 'price'). Do NOT use this for 'analysis', 'market analysis', or 'analisis pasar'.",
     parameters: {
       type: "object",
       properties: {

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

@@ -1,67 +1,227 @@
 import { ChainName, SUPPORTED_CHAIN_NAMES } from '../config';
-import { resolveToken } from '../utils/tokens';
 import { safeFetchJson } from '../../utils/httpClient';
+import { generateMarketHealthReport, MarketHealthResult } from '../utils/riskIntelligence';
+
+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(e) {}
+    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(e) {}
+    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(e) {}
+    return null;
+}
+
+async function fetchCoinGeckoData(symbol: string) {
+    try {
+        const searchData = await safeFetchJson<any>(`https://api.coingecko.com/api/v3/search?query=${symbol}`);
+        const foundCoin = searchData.coins?.find((c: any) => c.symbol.toLowerCase() === symbol.toLowerCase() || c.id === symbol.toLowerCase());
+        if (foundCoin) {
+            const coinData = await safeFetchJson<any>(`https://api.coingecko.com/api/v3/coins/${foundCoin.id}?localization=false&tickers=false&market_data=true&community_data=false&developer_data=false`);
+            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(e) {}
+    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 {
-    const cleanSymbol = tokenAddressOrSymbol.replace('$', '').toLowerCase();
+    const cleanInput = tokenAddressOrSymbol.replace('$', '').toLowerCase();
+    const isAddress = cleanInput.startsWith('0x') && cleanInput.length === 42;
     
-    // 1. Primary Engine: CoinGecko Global
-    try {
-      const searchData = await safeFetchJson<any>(`https://api.coingecko.com/api/v3/search?query=${cleanSymbol}`);
-      const foundCoin = searchData.coins?.find((c: any) => c.symbol.toLowerCase() === cleanSymbol || c.id === cleanSymbol);
+    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;
+
+    // ==========================================
+    // TAHAP 1: DATA ROUTING (SYMBOL VS CA)
+    // ==========================================
+    if (isAddress) {
+        // Jika input adalah Contract Address -> Hit DEX Pertama
+        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] Gagal menemukan data untuk Contract Address ${tokenAddressOrSymbol} di DEX.`;
+        }
         
-        if (foundCoin) {
-          const coinData = await safeFetchJson<any>(`https://api.coingecko.com/api/v3/coins/${foundCoin.id}`);
-          let report = `📈 **Market Analysis for ${coinData.name} (${coinData.symbol.toUpperCase()})** [Global via CoinGecko]\n\n`;
-          report += `**Price:** $${coinData.market_data?.current_price?.usd || 0}\n`;
-          report += `**Market Cap:** $${Number(coinData.market_data?.market_cap?.usd || 0).toLocaleString()}\n`;
-          report += `**24h Volume:** $${Number(coinData.market_data?.total_volume?.usd || 0).toLocaleString()}\n\n`;
-          report += `**Price Change:**\n`;
-          report += `- 1h:  ${coinData.market_data?.price_change_percentage_1h_in_currency?.usd?.toFixed(2) || 0}% \n`;
-          report += `- 24h: ${coinData.market_data?.price_change_percentage_24h?.toFixed(2) || 0}% \n`;
-          report += `- 7d:  ${coinData.market_data?.price_change_percentage_7d?.toFixed(2) || 0}% \n\n`;
-          report += `**Rank:** #${coinData.market_cap_rank || 'N/A'}\n`;
-          return report;
+        // Ambil momentum dari CEX jika ada
+        const momentum = await fetchCexMomentum(officialSymbol, currentPrice);
+        ma50 = momentum.ma50;
+        rsi = momentum.rsi;
+
+    } else {
+        // Jika input adalah 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);
+            
+            // Gunakan FDV CoinGecko asli jika ada, jika tidak proxy dari volume CEX
+            mcapUsd = cgData ? cgData.fdv : (volume24h * 10); 
+            // Estimasi likuiditas institusional (CoinGecko tidak mengembalikan market liquidity kedalaman pool, jadi gunakan 10% dari mcap)
+            liquidityUsd = cgData ? cgData.fdv * 0.1 : (volume24h * 2); 
+
+            const momentum = await fetchCexMomentum(officialSymbol, currentPrice);
+            ma50 = momentum.ma50;
+            rsi = momentum.rsi;
+        } else {
+            // Jika tidak ada di CEX, Fallback ke DEX
+            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] Gagal menemukan data pasar untuk simbol ${officialSymbol} di CEX maupun DEX.`;
+            }
         }
-    } catch (e) {
-      console.warn("CoinGecko analysis failed, falling back to DexScreener...", e);
     }
 
-    // 2. Fallback Engine: DexScreener Cross-Chain Search
-    let query = tokenAddressOrSymbol;
+    // ==========================================
+    // TAHAP 2: DEFILLAMA (Smart Money / TVL)
+    // ==========================================
+    let tvlChange7d: number | null = null;
     try {
-      const resolved = resolveToken(tokenAddressOrSymbol, chainName);
-      if (resolved !== "0x0000000000000000000000000000000000000000") {
-        query = resolved; // Use exact address if resolved locally
-      }
-    } catch (e) {}
-
-    const dexSearchUrl = `https://api.dexscreener.com/latest/dex/search?q=${query}`;
-    const data = await safeFetchJson<any>(dexSearchUrl);
-    if (!data.pairs || data.pairs.length === 0) {
-      return `No market data found for '${tokenAddressOrSymbol}' on CoinGecko or DexScreener across any chain.`;
+        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 (e) {
+        // Graceful degradation
     }
 
-    let pair = data.pairs.find((p: any) => p.chainId === chainName);
-    if (!pair) {
-      pair = data.pairs[0]; 
+    // ==========================================
+    // TAHAP 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 report = `📈 **Market Analysis for ${pair.baseToken.name} (${pair.baseToken.symbol})** on ${pair.chainId.toUpperCase()} [Cross-Chain Fallback: DexScreener]\n\n`;
-    report += `**Price:** $${pair.priceUsd}\n`;
-    report += `**Liquidity (USD):** $${Number(pair.liquidity?.usd || 0).toLocaleString()}\n`;
-    report += `**FDV:** $${Number(pair.fdv || 0).toLocaleString()}\n`;
-    report += `**24h Volume:** $${Number(pair.volume?.h24 || 0).toLocaleString()}\n\n`;
-    report += `**Price Change:**\n`;
-    report += `- 5m:  ${pair.priceChange?.m5 || 0}% \n`;
-    report += `- 1h:  ${pair.priceChange?.h1 || 0}% \n`;
-    report += `- 24h: ${pair.priceChange?.h24 || 0}% \n\n`;
-    report += `**DEX:** ${pair.dexId} (${pair.url})\n`;
+    // ==========================================
+    // TAHAP 4: MARKET HEALTH SCORE CALCULATION
+    // ==========================================
+    const healthResult: MarketHealthResult = generateMarketHealthReport(
+        liquidityUsd, mcapUsd, tvlChange7d, volume24h, priceChange24h, top10HoldersPercent, rsi, currentPrice, ma50
+    );
+
+    // ==========================================
+    // TAHAP 5: CONTEXT ASSEMBLY FOR LLM
+    // ==========================================
+    let report = `📊 **Market Intelligence Report: ${officialSymbol}**\n`;
+    report += `CA: \`${contractAddress || 'N/A'}\` | Network: ${network}\n\n`;
+    
+    report += `**⭐ Overall Market Health Score:** ${healthResult.overallScore} / 10\n\n`;
+    
+    report += `**1. Liquidity Risk:** ${healthResult.liquidityScore !== null ? healthResult.liquidityScore + '/10' : '[ N/A ]'}\n`;
+    report += `- Liquidity: $${liquidityUsd.toLocaleString()} vs FDV: $${mcapUsd.toLocaleString()}\n`;
+    
+    report += `**2. Smart Money Flow:** ${healthResult.smartMoneyScore !== null ? healthResult.smartMoneyScore + '/10' : '[ N/A - Not in DefiLlama ]'}\n`;
+    report += `- 24h Volume: $${volume24h.toLocaleString()} | TVL 7D Change: ${tvlChange7d !== null ? tvlChange7d.toFixed(2) + '%' : 'N/A'}\n`;
+    
+    report += `**3. Holder Concentration:** ${healthResult.concentrationScore !== null ? healthResult.concentrationScore + '/10' : '[ N/A - RPC Pending ]'}\n`;
+    report += `- Top 10 Holders: ${top10HoldersPercent !== null ? top10HoldersPercent + '%' : 'N/A'}\n`;
+    
+    report += `**4. Momentum (CEX):** ${healthResult.momentumScore !== null ? healthResult.momentumScore + '/10' : '[ N/A - DEX Only Coin ]'}\n`;
+    report += `- Price: $${currentPrice} | MA50: ${ma50 ? '$'+ma50.toFixed(4) : 'N/A'} | RSI: ${rsi || 'N/A'}\n\n`;
+
+    report += `*System Note for LLM: Use this exact data to provide a "Market Summary" and "Suggested Autonomous Actions" in the user's native language. If CEX momentum is N/A, explicitly warn about high risk Degen/Memecoin status. IMPORTANT: Always include a clear disclaimer at the end (translated into the user's native language) stating that this analysis is NOT financial advice (NFA).*`;
 
     return report;
+
   } catch (error: any) {
-    return `Failed to analyze market: ${error.message}`;
+    return `[Market Intelligence] Failed to aggregate data: ${error.message}`;
   }
 }
 
@@ -69,7 +229,7 @@ export const marketAnalysisToolDefinition = {
   type: "function",
   function: {
     name: "analyze_market",
-    description: "Fetches live market data (Price, Liquidity, Volume, FDV, Price Change) globally across all chains using CoinGecko and DexScreener.",
+    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.",
     parameters: {
       type: "object",
       properties: {
@@ -80,10 +240,10 @@ export const marketAnalysisToolDefinition = {
         },
         tokenAddressOrSymbol: {
           type: "string",
-          description: "The token symbol (e.g. USDC, PEPE) or contract address to analyze.",
+          description: "The token symbol (e.g. USDC, PEPE) or exact Contract Address (e.g. 0x...) to analyze.",
         }
       },
-      required: ["chainName", "tokenAddressOrSymbol"],
+      required: ["tokenAddressOrSymbol"],
     },
   },
 };