nyxora 26.6.20 → 26.6.21

package/dist/packages/core/src/gateway/server.js

@@ -52,6 +52,8 @@ const provideLiquidity_1 = require("../web3/skills/provideLiquidity");
 const getTxHistory_1 = require("../web3/skills/getTxHistory");
 const checkRegistryStatus_1 = require("../web3/skills/checkRegistryStatus");
 const createLimitOrder_1 = require("../web3/skills/createLimitOrder");
+const userWhitelistManager_1 = require("../utils/userWhitelistManager");
+const tokens_2 = require("../web3/utils/tokens");
 // System Skills
 const browseWeb_1 = require("../system/skills/browseWeb");
 const executeShell_1 = require("../system/skills/executeShell");
@@ -77,6 +79,8 @@ const episodic_1 = require("../memory/episodic");
 const reflection_1 = require("../memory/reflection");
 // Initialize Google Auth
 (0, googleAuthModule_1.initGoogleAuth)();
+// Synchronize all active skills to config.yaml on startup
+(0, skillManager_1.syncAllSkillsToConfig)();
 const util_1 = __importDefault(require("util"));
 // Intercept console.log and console.error
 const originalLog = console.log;
@@ -307,34 +311,62 @@ app.post('/api/defi-keys', (req, res) => {
         res.status(500).json({ error: error.message });
     }
 });
+const allSkills = [
+    getBalance_1.getBalanceToolDefinition,
+    transfer_1.transferToolDefinition,
+    getPrice_1.getPriceToolDefinition,
+    swapToken_1.swapTokenToolDefinition,
+    bridgeToken_1.bridgeTokenToolDefinition,
+    mintNft_1.mintNftToolDefinition,
+    customTx_1.customTxToolDefinition,
+    checkAddress_1.checkAddressToolDefinition,
+    getMyAddress_1.getMyAddressToolDefinition,
+    checkSecurity_1.checkSecurityToolDefinition,
+    checkPortfolio_1.checkPortfolioToolDefinition,
+    marketAnalysis_1.marketAnalysisToolDefinition,
+    manageCustomTokens_1.manageCustomTokensDefinition,
+    defiLending_1.aaveSupplyToolDefinition,
+    revokeApprovals_2.revokeApprovalToolDefinition,
+    yieldVault_1.vaultDepositToolDefinition,
+    provideLiquidity_1.provideLiquidityToolDefinition,
+    getTxHistory_1.getTxHistoryToolDefinition,
+    createLimitOrder_1.createLimitOrderToolDefinition,
+    checkRegistryStatus_1.checkRegistryStatusToolDefinition
+];
+const systemSkills = [
+    executeShell_1.runTerminalCommandToolDefinition,
+    readFile_1.readLocalFileToolDefinition,
+    writeFile_1.writeLocalFileToolDefinition,
+    generateExcel_1.generateExcelToolDefinition,
+    browseWeb_1.browseWebsiteToolDefinition,
+    updateSecurityPolicy_1.updateSecurityPolicyToolDefinition,
+    analyzeDocument_1.analyzeDocumentToolDefinition,
+    searchWeb_1.searchWebToolDefinition,
+    googleWorkspace_1.readGmailInboxToolDefinition,
+    googleWorkspace_1.listCalendarEventsToolDefinition,
+    googleWorkspace_1.appendRowToSheetsToolDefinition,
+    googleWorkspace_1.readGoogleDocsToolDefinition,
+    googleWorkspace_1.readGoogleFormResponsesToolDefinition,
+    editFile_1.editLocalFileToolDefinition,
+    gitManager_1.gitManagerToolDefinition,
+    xManager_1.xManagerToolDefinition,
+    notionWorkspace_1.notionWorkspaceToolDefinition,
+    audioTranscribe_1.audioTranscribeToolDefinition,
+    summarizeText_1.summarizeTextToolDefinition
+];
 app.get('/api/stats', (req, res) => {
-    res.json(tracker_1.Tracker.getStats());
+    const stats = tracker_1.Tracker.getStats();
+    const dbPath = (0, paths_1.getPath)('memory.db');
+    const activeWeb3 = allSkills.filter(s => (0, skillManager_1.isSkillActive)(s.function.name)).length;
+    const activeSystem = systemSkills.filter(s => (0, skillManager_1.isSkillActive)(s.function.name)).length;
+    const totalSkills = allSkills.length + systemSkills.length;
+    const activeSkills = activeWeb3 + activeSystem;
+    res.json({ ...stats, memoryPath: dbPath, totalSkills, activeSkills });
 });
 app.get('/api/logs', (req, res) => {
     res.json(tracker_1.Tracker.getLogs());
 });
 app.get('/api/skills', (req, res) => {
-    const allSkills = [
-        getBalance_1.getBalanceToolDefinition,
-        transfer_1.transferToolDefinition,
-        getPrice_1.getPriceToolDefinition,
-        swapToken_1.swapTokenToolDefinition,
-        bridgeToken_1.bridgeTokenToolDefinition,
-        mintNft_1.mintNftToolDefinition,
-        customTx_1.customTxToolDefinition,
-        checkAddress_1.checkAddressToolDefinition,
-        getMyAddress_1.getMyAddressToolDefinition,
-        checkSecurity_1.checkSecurityToolDefinition,
-        checkPortfolio_1.checkPortfolioToolDefinition,
-        marketAnalysis_1.marketAnalysisToolDefinition,
-        manageCustomTokens_1.manageCustomTokensDefinition,
-        defiLending_1.aaveSupplyToolDefinition,
-        revokeApprovals_2.revokeApprovalToolDefinition,
-        yieldVault_1.vaultDepositToolDefinition,
-        provideLiquidity_1.provideLiquidityToolDefinition,
-        getTxHistory_1.getTxHistoryToolDefinition,
-        createLimitOrder_1.createLimitOrderToolDefinition
-    ];
     const skillsWithStatus = allSkills.map(skill => ({
         ...skill,
         isActive: (0, skillManager_1.isSkillActive)(skill.function.name)
@@ -342,27 +374,6 @@ app.get('/api/skills', (req, res) => {
     res.json(skillsWithStatus);
 });
 app.get('/api/skills/system', (req, res) => {
-    const systemSkills = [
-        executeShell_1.runTerminalCommandToolDefinition,
-        readFile_1.readLocalFileToolDefinition,
-        writeFile_1.writeLocalFileToolDefinition,
-        generateExcel_1.generateExcelToolDefinition,
-        browseWeb_1.browseWebsiteToolDefinition,
-        updateSecurityPolicy_1.updateSecurityPolicyToolDefinition,
-        analyzeDocument_1.analyzeDocumentToolDefinition,
-        searchWeb_1.searchWebToolDefinition,
-        googleWorkspace_1.readGmailInboxToolDefinition,
-        googleWorkspace_1.listCalendarEventsToolDefinition,
-        googleWorkspace_1.appendRowToSheetsToolDefinition,
-        googleWorkspace_1.readGoogleDocsToolDefinition,
-        googleWorkspace_1.readGoogleFormResponsesToolDefinition,
-        editFile_1.editLocalFileToolDefinition,
-        gitManager_1.gitManagerToolDefinition,
-        xManager_1.xManagerToolDefinition,
-        notionWorkspace_1.notionWorkspaceToolDefinition,
-        audioTranscribe_1.audioTranscribeToolDefinition,
-        summarizeText_1.summarizeTextToolDefinition
-    ];
     const skillsWithStatus = systemSkills.map(skill => ({
         ...skill,
         isActive: (0, skillManager_1.isSkillActive)(skill.function.name)
@@ -377,6 +388,41 @@ app.post('/api/skills/toggle', (req, res) => {
     (0, skillManager_1.toggleSkill)(skillName, active);
     res.json({ success: true, skillName, active });
 });
+// Portfolio Whitelist Routes
+app.get('/api/portfolio/whitelist', async (req, res) => {
+    const whitelist = (0, userWhitelistManager_1.getUserWhitelist)();
+    res.json(whitelist);
+});
+app.post('/api/portfolio/whitelist', async (req, res) => {
+    const { walletAddress, chainName, tokenAddress, symbol, decimals } = req.body;
+    if (!walletAddress || !chainName || !tokenAddress) {
+        return res.status(400).json({ error: 'Missing required fields' });
+    }
+    await (0, userWhitelistManager_1.saveTokenToWhitelist)(walletAddress, chainName, tokenAddress, 'manual', symbol, decimals);
+    res.json({ success: true });
+});
+app.delete('/api/portfolio/whitelist', (req, res) => {
+    const { walletAddress, chainName, tokenAddress } = req.body;
+    if (!walletAddress || !chainName || !tokenAddress) {
+        return res.status(400).json({ error: 'Missing required fields' });
+    }
+    (0, userWhitelistManager_1.removeTokenFromWhitelist)(walletAddress, chainName, tokenAddress);
+    res.json({ success: true });
+});
+app.get('/api/portfolio/token-metadata', async (req, res) => {
+    const { chain, address } = req.query;
+    if (!chain || !address || typeof address !== 'string') {
+        return res.status(400).json({ error: 'Missing chain or address' });
+    }
+    try {
+        const client = (0, config_1.getPublicClient)(chain);
+        const metadata = await (0, tokens_2.getTokenMetadata)(client, address);
+        res.json(metadata);
+    }
+    catch (err) {
+        res.status(500).json({ error: err.message });
+    }
+});
 // Google Workspace Auth Routes
 app.get('/api/auth/google/url', (req, res) => {
     const url = (0, googleAuthModule_1.getAuthUrl)();
@@ -604,14 +650,8 @@ app.get('/api/wallet', async (req, res) => {
 app.get('/api/portfolio', async (req, res) => {
     try {
         const userAddress = await (0, config_1.getAddress)();
-        const customTokensPath = path_1.default.join((0, paths_1.getPath)('custom_tokens.json'));
-        let customTokens = {};
-        if (fs_1.default.existsSync(customTokensPath)) {
-            try {
-                customTokens = JSON.parse(fs_1.default.readFileSync(customTokensPath, 'utf8'));
-            }
-            catch (e) { }
-        }
+        const whitelist = (0, userWhitelistManager_1.getUserWhitelist)();
+        const userCustomTokens = whitelist[userAddress.toLowerCase()] || [];
         const portfolio = {};
         await Promise.all(config_1.SUPPORTED_CHAIN_NAMES.map(async (chainName) => {
             portfolio[chainName] = [];
@@ -628,11 +668,14 @@ app.get('/api/portfolio', async (req, res) => {
                         isNative: true
                     });
                 }
-                // 2. Combine TOKEN_MAP and customTokens for this chain
+                // 2. Combine TOKEN_MAP and YAML whitelist for this chain
                 const tokensToQuery = { ...(tokens_1.TOKEN_MAP[chainName] || {}) };
-                if (customTokens[chainName]) {
-                    Object.assign(tokensToQuery, customTokens[chainName]);
-                }
+                // Inject whitelisted tokens
+                userCustomTokens.forEach(t => {
+                    if (t.chainName === chainName && t.symbol && t.address) {
+                        tokensToQuery[t.symbol.toUpperCase()] = t.address;
+                    }
+                });
                 // 3. Query all ERC-20 balances in parallel
                 await Promise.all(Object.entries(tokensToQuery).map(async ([symbol, address]) => {
                     if (address === '0x0000000000000000000000000000000000000000')
@@ -650,7 +693,8 @@ app.get('/api/portfolio', async (req, res) => {
                             functionName: 'decimals'
                         });
                         const [bal, decimals] = await Promise.all([balPromise, decPromise]);
-                        if (bal > 0n) {
+                        const isCustom = userCustomTokens.some(t => t.chainName === chainName && t.address === address);
+                        if (bal > 0n || isCustom) {
                             portfolio[chainName].push({
                                 symbol,
                                 address,

package/dist/packages/core/src/gateway/setup.js

@@ -10,22 +10,6 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const fs_1 = __importDefault(require("fs"));
 const paths_1 = require("../config/paths");
 const parser_1 = require("../config/parser");
-const crypto_1 = __importDefault(require("crypto"));
-function encryptKey(privateKey, password) {
-    const salt = crypto_1.default.randomBytes(16);
-    const key = crypto_1.default.pbkdf2Sync(password, salt, 100000, 32, 'sha256');
-    const iv = crypto_1.default.randomBytes(12);
-    const cipher = crypto_1.default.createCipheriv('aes-256-gcm', key, iv);
-    let encrypted = cipher.update(privateKey, 'utf8', 'hex');
-    encrypted += cipher.final('hex');
-    const authTag = cipher.getAuthTag().toString('hex');
-    return {
-        salt: salt.toString('hex'),
-        iv: iv.toString('hex'),
-        authTag,
-        encryptedData: encrypted
-    };
-}
 const accounts_1 = require("viem/accounts");
 async function runSetupWizard() {
     console.clear();
@@ -274,9 +258,9 @@ Provider: ${config.llm.provider}`;
             privateKey = '0x' + Buffer.from(account.getHdKey().privateKey).toString('hex');
             prompts_1.log.success('New Wallet Generated!');
             prompts_1.log.info(`Address: ${account.address}`);
-            prompts_1.log.info(`Private Key: ${privateKey}`);
+            prompts_1.log.info(`Private Key: [REDACTED - Saved securely to vault]`);
             prompts_1.log.info(`Seed Phrase (Mnemonic): ${seedPhrase}`);
-            prompts_1.log.warn('IMPORTANT: Write down these 12 words (or the Private Key) NOW! This is your ONLY backup. The credentials have been securely injected into your local OS vault.');
+            prompts_1.log.warn('IMPORTANT: Write down these 12 words NOW! This is your ONLY backup. The credentials have been securely injected into your local OS vault.');
         }
     }
     // --- OS SKILLS ---
@@ -343,16 +327,26 @@ Provider: ${config.llm.provider}`;
         }));
         if ((0, prompts_1.isCancel)(telegramToken))
             return process.exit(0);
-        if (telegramToken && !authorizedChatId) {
+        if (telegramToken && telegramToken.trim() !== '') {
+            authorizedChatId = undefined;
+        }
+        const activeToken = telegramToken || config.integrations?.telegram?.bot_token;
+        if (activeToken && !authorizedChatId) {
             const s = (0, prompts_1.spinner)();
             const pin = Math.floor(100000 + Math.random() * 900000).toString();
             (0, prompts_1.note)(picocolors_1.default.cyan(`1. Open Telegram and search for your Bot.\n2. Send this exact message to your bot:\n\n   /auth ${pin}\n\nWaiting for your message...`), 'Telegram Pairing Required');
             s.start(`Waiting for /auth ${pin} on Telegram...`);
+            let bot = null;
             try {
                 const { Telegraf } = require('telegraf');
-                const bot = new Telegraf(telegramToken);
+                bot = new Telegraf(activeToken);
                 let paired = false;
+                let failedAttempts = {};
                 bot.command('auth', (ctx) => {
+                    const chatId = ctx.chat.id.toString();
+                    if (failedAttempts[chatId] >= 5) {
+                        return ctx.reply('❌ Too many failed attempts. You are locked out.');
+                    }
                     const text = ctx.message.text.split(' ');
                     if (text[1] === pin) {
                         authorizedChatId = ctx.chat.id;
@@ -361,18 +355,38 @@ Provider: ${config.llm.provider}`;
                         bot.stop();
                     }
                     else {
+                        failedAttempts[chatId] = (failedAttempts[chatId] || 0) + 1;
                         ctx.reply('❌ Invalid PIN.');
                     }
                 });
                 bot.launch();
                 // Wait until paired
-                while (!paired) {
+                let attempts = 0;
+                while (!paired && attempts < 120) {
                     await new Promise(r => setTimeout(r, 1000));
+                    attempts++;
+                }
+                if (!paired) {
+                    s.stop('Timeout waiting for Telegram pairing. Setup will continue, but Telegram integration is disabled.');
+                    try {
+                        bot.stop();
+                    }
+                    catch (e) { }
+                    authorizedChatId = undefined;
+                    telegramToken = '';
+                }
+                else {
+                    s.stop(`Bot successfully paired with Chat ID: ${authorizedChatId}`);
                 }
-                s.stop(`Bot successfully paired with Chat ID: ${authorizedChatId}`);
             }
             catch (err) {
                 s.stop(`Failed to start bot listener: ${err.message}. You can pair it later.`);
+                // Try to stop the bot if it was initialized before the error (L17)
+                try {
+                    if (bot)
+                        bot.stop();
+                }
+                catch (e) { }
             }
         }
     }
@@ -424,6 +438,9 @@ Provider: ${config.llm.provider}`;
     if (authorizedChatId) {
         config.integrations.telegram.authorized_chat_id = authorizedChatId;
     }
+    else if (config.integrations.telegram) {
+        delete config.integrations.telegram.authorized_chat_id;
+    }
     (0, parser_1.saveConfig)(config);
     // Sync disabled_skills.json based on user selection
     const allWeb3Skills = [

package/dist/packages/core/src/utils/formatter.test.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const formatter_1 = require("./formatter");
+(0, vitest_1.describe)('Formatter Utilities', () => {
+    (0, vitest_1.it)('should format transaction success correctly for swap', () => {
+        const tx = {
+            id: 'test-1',
+            type: 'swap',
+            chainName: 'ethereum',
+            status: 'pending',
+            nonce: "0",
+            details: {
+                fromToken: 'eth',
+                toToken: 'usdc',
+                amountStr: '1'
+            },
+            createdAt: Date.now()
+        };
+        const rawResult = '{"txHash":"0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"}';
+        const output = (0, formatter_1.formatTransactionSuccess)(tx, rawResult);
+        (0, vitest_1.expect)(output).toContain('Network:** Ethereum');
+        (0, vitest_1.expect)(output).toContain('Action:** Swapped 1 ETH to USDC');
+        (0, vitest_1.expect)(output).toContain('Tx Hash:** `0x1234...cdef`');
+    });
+    (0, vitest_1.it)('should format transaction error correctly', () => {
+        const tx = {
+            id: 'test-2',
+            type: 'bridge',
+            chainName: 'base_sepolia',
+            status: 'failed',
+            nonce: "0",
+            details: {},
+            createdAt: Date.now()
+        };
+        const output = (0, formatter_1.formatTransactionError)(tx, 'Insufficient funds');
+        (0, vitest_1.expect)(output).toContain('Transaction Failed (Base Sepolia)');
+        (0, vitest_1.expect)(output).toContain('Error: Insufficient funds');
+    });
+});

package/dist/packages/core/src/utils/skillManager.js

@@ -6,9 +6,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDisabledSkills = getDisabledSkills;
 exports.toggleSkill = toggleSkill;
 exports.isSkillActive = isSkillActive;
+exports.syncAllSkillsToConfig = syncAllSkillsToConfig;
 const fs_1 = __importDefault(require("fs"));
 const paths_1 = require("../config/paths");
+const parser_1 = require("../config/parser");
 let disabledSkillsCache = null;
+const reverseSkillMapping = {
+    // OS Skills
+    'read_local_file': { category: 'os', name: 'readFile' },
+    'write_local_file': { category: 'os', name: 'writeFile' },
+    'edit_local_file': { category: 'os', name: 'editFile' },
+    'generate_excel_file': { category: 'os', name: 'generateExcel' },
+    'analyze_document': { category: 'os', name: 'analyzeDocument' },
+    'run_terminal_command': { category: 'os', name: 'executeShell' },
+    'browse_website': { category: 'os', name: 'browseWeb' },
+    'search_web': { category: 'os', name: 'searchWeb' },
+    'read_gmail_inbox': { category: 'os', name: 'readGmail' },
+    'list_calendar_events': { category: 'os', name: 'listCalendar' },
+    'append_row_to_sheets': { category: 'os', name: 'appendSheets' },
+    'read_google_docs': { category: 'os', name: 'readDocs' },
+    'read_google_form_responses': { category: 'os', name: 'readForms' },
+    'execute_git_command': { category: 'os', name: 'gitManager' },
+    'manage_twitter': { category: 'os', name: 'xManager' },
+    'manage_notion': { category: 'os', name: 'notionWorkspace' },
+    'transcribe_audio': { category: 'os', name: 'audioTranscribe' },
+    'summarize_text': { category: 'os', name: 'summarizeText' },
+    'update_security_policy': { category: 'os', name: 'updateSecurityPolicy' },
+    // Web3 Skills
+    'transfer_token': { category: 'web3', name: 'transfer' },
+    'transfer_native': { category: 'web3', name: 'transfer' },
+    'swap_token': { category: 'web3', name: 'swap' },
+    'bridge_token': { category: 'web3', name: 'bridge' },
+    'mint_nft': { category: 'web3', name: 'mintNft' },
+    'custom_tx': { category: 'web3', name: 'customTx' },
+    'check_address': { category: 'web3', name: 'checkAddress' },
+    'get_my_address': { category: 'web3', name: 'getMyAddress' },
+    'check_token_security': { category: 'web3', name: 'checkSecurity' },
+    'check_portfolio': { category: 'web3', name: 'checkPortfolio' },
+    'analyze_market': { category: 'web3', name: 'marketAnalysis' },
+    'manage_custom_tokens': { category: 'web3', name: 'manageCustomTokens' },
+    'get_price': { category: 'web3', name: 'getPrice' },
+    'supply_aave': { category: 'web3', name: 'aaveSupply' },
+    'revoke_approval': { category: 'web3', name: 'revokeApproval' },
+    'deposit_yield_vault': { category: 'web3', name: 'vaultDeposit' },
+    'provide_liquidity_v3': { category: 'web3', name: 'provideLiquidity' },
+    'get_tx_history': { category: 'web3', name: 'getTxHistory' },
+    'check_registry_status': { category: 'web3', name: 'checkRegistryStatus' },
+    'create_limit_order': { category: 'web3', name: 'createLimitOrder' }
+};
 function getDisabledSkillsFile() {
     return (0, paths_1.getPath)('disabled_skills.json');
 }
@@ -43,8 +88,54 @@ function toggleSkill(skillName, active) {
     }
     disabledSkillsCache = Array.from(current);
     fs_1.default.writeFileSync(getDisabledSkillsFile(), JSON.stringify(disabledSkillsCache, null, 2));
+    // Sync to config.yaml
+    const mapping = reverseSkillMapping[skillName];
+    if (mapping) {
+        const config = (0, parser_1.loadConfig)();
+        if (!config.skills)
+            config.skills = { web3: [], os: [] };
+        const categoryArray = mapping.category === 'web3' ? config.skills.web3 : config.skills.os;
+        if (active && !categoryArray.includes(mapping.name)) {
+            categoryArray.push(mapping.name);
+        }
+        else if (!active) {
+            const index = categoryArray.indexOf(mapping.name);
+            if (index !== -1) {
+                categoryArray.splice(index, 1);
+            }
+        }
+        (0, parser_1.saveConfig)(config);
+    }
 }
 function isSkillActive(skillName) {
     const disabled = getDisabledSkills();
     return !disabled.includes(skillName);
 }
+function syncAllSkillsToConfig() {
+    const config = (0, parser_1.loadConfig)();
+    if (!config.skills)
+        config.skills = { web3: [], os: [] };
+    const activeWeb3 = new Set();
+    const activeOs = new Set();
+    for (const [skillName, mapping] of Object.entries(reverseSkillMapping)) {
+        if (isSkillActive(skillName)) {
+            if (mapping.category === 'web3') {
+                activeWeb3.add(mapping.name);
+            }
+            else {
+                activeOs.add(mapping.name);
+            }
+        }
+    }
+    // Check if arrays are different to avoid unnecessary saves
+    const currentWeb3 = config.skills.web3 || [];
+    const currentOs = config.skills.os || [];
+    const web3Changed = currentWeb3.length !== activeWeb3.size || !currentWeb3.every(s => activeWeb3.has(s));
+    const osChanged = currentOs.length !== activeOs.size || !currentOs.every(s => activeOs.has(s));
+    if (web3Changed || osChanged) {
+        config.skills.web3 = Array.from(activeWeb3);
+        config.skills.os = Array.from(activeOs);
+        (0, parser_1.saveConfig)(config);
+        console.log('[SkillManager] Automatically synchronized active skills to config.yaml');
+    }
+}

package/dist/packages/core/src/utils/userWhitelistManager.js

@@ -10,70 +10,75 @@ exports.getUserTokens = getUserTokens;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
-const WHITELIST_FILE_PATH = path_1.default.join(os_1.default.homedir(), '.nyxora', 'user_whitelist.json');
+const yaml_1 = __importDefault(require("yaml"));
+const config_1 = require("../web3/config");
+const tokens_1 = require("../web3/utils/tokens");
+const WHITELIST_FILE_PATH = path_1.default.join(os_1.default.homedir(), '.nyxora', 'user_whitelist.yaml');
 function getUserWhitelist() {
     try {
         if (!fs_1.default.existsSync(WHITELIST_FILE_PATH)) {
+            // Try migrating from JSON if YAML doesn't exist yet
+            const oldJsonPath = path_1.default.join(os_1.default.homedir(), '.nyxora', 'user_whitelist.json');
+            if (fs_1.default.existsSync(oldJsonPath)) {
+                const data = fs_1.default.readFileSync(oldJsonPath, 'utf-8');
+                const parsed = JSON.parse(data);
+                fs_1.default.writeFileSync(WHITELIST_FILE_PATH, yaml_1.default.stringify(parsed), 'utf-8');
+                // Rename old file so it doesn't get used again
+                fs_1.default.renameSync(oldJsonPath, `${oldJsonPath}.bak`);
+                return parsed;
+            }
             return {};
         }
         const data = fs_1.default.readFileSync(WHITELIST_FILE_PATH, 'utf-8');
-        const parsed = JSON.parse(data);
-        // Auto-migrate legacy format
-        let migrated = false;
-        for (const addr in parsed) {
-            if (parsed[addr] && !Array.isArray(parsed[addr])) {
-                const newArray = [];
-                for (const chain in parsed[addr]) {
-                    const tokens = parsed[addr][chain];
-                    if (Array.isArray(tokens)) {
-                        for (const t of tokens) {
-                            newArray.push({
-                                chainName: chain,
-                                address: typeof t === 'string' ? t.toLowerCase() : (t.address || '').toLowerCase(),
-                                source: 'manual',
-                                lastSeen: Date.now()
-                            });
-                        }
-                    }
-                }
-                parsed[addr] = newArray;
-                migrated = true;
-            }
-        }
-        if (migrated) {
-            fs_1.default.writeFileSync(WHITELIST_FILE_PATH, JSON.stringify(parsed, null, 2), 'utf-8');
-        }
-        return parsed;
+        return yaml_1.default.parse(data) || {};
     }
     catch (err) {
-        console.error('[Whitelist] Error reading user_whitelist.json', err);
+        console.error('[Whitelist] Error reading user_whitelist.yaml', err);
         return {};
     }
 }
-function saveTokenToWhitelist(walletAddress, chainName, tokenAddress, source = 'manual') {
+async function saveTokenToWhitelist(walletAddress, chainName, tokenAddress, source = 'manual', symbol, decimals) {
     try {
         const whitelist = getUserWhitelist();
         const addr = walletAddress.toLowerCase();
         const tokenAddr = tokenAddress.toLowerCase();
+        // Auto-fetch metadata if not provided
+        if (!symbol || decimals === undefined) {
+            try {
+                const client = (0, config_1.getPublicClient)(chainName);
+                const metadata = await (0, tokens_1.getTokenMetadata)(client, tokenAddr);
+                symbol = metadata.symbol;
+                decimals = metadata.decimals;
+            }
+            catch (err) {
+                console.warn(`[Whitelist] Could not fetch metadata for ${tokenAddr} on ${chainName}`, err);
+            }
+        }
         if (!whitelist[addr])
             whitelist[addr] = [];
         const existingIndex = whitelist[addr].findIndex(t => t.chainName === chainName && t.address === tokenAddr);
         if (existingIndex >= 0) {
             whitelist[addr][existingIndex].lastSeen = Date.now();
+            if (symbol)
+                whitelist[addr][existingIndex].symbol = symbol;
+            if (decimals !== undefined)
+                whitelist[addr][existingIndex].decimals = decimals;
         }
         else {
             whitelist[addr].push({
                 chainName,
                 address: tokenAddr,
+                symbol,
+                decimals,
                 source,
                 lastSeen: Date.now()
             });
-            console.log(`[Whitelist] Added ${tokenAddr} to ${chainName} for ${addr} via ${source}`);
+            console.log(`[Whitelist] Added ${symbol || tokenAddr} to ${chainName} for ${addr} via ${source}`);
         }
-        fs_1.default.writeFileSync(WHITELIST_FILE_PATH, JSON.stringify(whitelist, null, 2), 'utf-8');
+        fs_1.default.writeFileSync(WHITELIST_FILE_PATH, yaml_1.default.stringify(whitelist), 'utf-8');
     }
     catch (err) {
-        console.error('[Whitelist] Error saving token to user_whitelist.json', err);
+        console.error('[Whitelist] Error saving token to user_whitelist.yaml', err);
     }
 }
 function removeTokenFromWhitelist(walletAddress, chainName, tokenAddress) {
@@ -86,12 +91,12 @@ function removeTokenFromWhitelist(walletAddress, chainName, tokenAddress) {
         const initialLength = whitelist[addr].length;
         whitelist[addr] = whitelist[addr].filter(t => !(t.chainName === chainName && t.address === tokenAddr));
         if (whitelist[addr].length !== initialLength) {
-            fs_1.default.writeFileSync(WHITELIST_FILE_PATH, JSON.stringify(whitelist, null, 2), 'utf-8');
-            console.log(`[Whitelist] Removed garbage token ${tokenAddr} on ${chainName} for ${addr}`);
+            fs_1.default.writeFileSync(WHITELIST_FILE_PATH, yaml_1.default.stringify(whitelist), 'utf-8');
+            console.log(`[Whitelist] Removed token ${tokenAddr} on ${chainName} for ${addr}`);
         }
     }
     catch (err) {
-        console.error('[Whitelist] Error removing token from user_whitelist.json', err);
+        console.error('[Whitelist] Error removing token from user_whitelist.yaml', err);
     }
 }
 function getUserTokens(walletAddress, chainName) {

package/dist/packages/core/src/web3/aggregator/aggregatorMainnet.js

@@ -50,8 +50,8 @@ async function fetchMainnetBestRoute(fromChain, toChain, fromToken, toToken, amo
     if (isProviderHealthy('openocean')) {
         promises.push(fetchOpenOcean(fromChain, toChain, fromToken, toToken, amountInWei, userAddress, slippageTolerance, keys.openocean_key));
     }
-    // Provider 6: KyberSwap (Cross-chain & Same-chain)
-    if (isProviderHealthy('kyberswap')) {
+    // Provider 6: KyberSwap (Same-chain ONLY)
+    if (!isCrossChain && isProviderHealthy('kyberswap')) {
         promises.push(fetchKyberSwap(fromChain, fromToken, toToken, amountInWei, userAddress, slippageTolerance));
     }
     // Execute all healthy providers concurrently with a 4s timeout

package/dist/packages/core/src/web3/aggregator/defiRouter.js

@@ -4,6 +4,9 @@ exports.routeTransaction = routeTransaction;
 const aggregatorMainnet_1 = require("./aggregatorMainnet");
 const aggregatorTestnet_1 = require("./aggregatorTestnet");
 async function routeTransaction(fromChain, toChain, fromToken, toToken, amountInWei, userAddress, slippageTolerance = "auto") {
+    if (!fromChain || !toChain) {
+        throw new Error("Missing source or destination chain in routing.");
+    }
     // Auto-correct: If one is testnet and the other is mainnet, assume they meant testnet
     if (fromChain.includes('sepolia') && !toChain.includes('sepolia')) {
         if (toChain === 'base')

package/dist/packages/core/src/web3/skills/bridgeToken.js

@@ -11,6 +11,10 @@ const tokens_1 = require("../utils/tokens");
 const defiRouter_1 = require("../aggregator/defiRouter");
 async function prepareBridgeToken(fromChain, toChain, tokenSymbol, amountStr, mode = "auto", providerName = "auto", slippagePercent) {
     try {
+        if (!fromChain || !toChain)
+            throw new Error("Source or destination chain not provided by AI.");
+        if (!amountStr)
+            throw new Error("Bridge amount not provided by AI.");
         const userAddress = await (0, vaultClient_1.getAddress)();
         // Auto-correct: If one is testnet and the other is mainnet, assume they meant testnet
         if (fromChain.includes('sepolia') && !toChain.includes('sepolia')) {

package/dist/packages/core/src/web3/skills/checkRegistryStatus.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkRegistryStatusToolDefinition = void 0;
 exports.checkRegistryStatus = checkRegistryStatus;
 const config_1 = require("../config");
 const config_2 = require("../config");
@@ -77,3 +78,15 @@ async function checkRegistryStatus() {
         return { isActive: true, reason: 'Registry check skipped due to network error.' };
     }
 }
+exports.checkRegistryStatusToolDefinition = {
+    type: "function",
+    function: {
+        name: "check_registry_status",
+        description: "Internal Security Middleware: Checks the On-Chain Kill Switch Registry before executing any transaction. If the agent is deactivated, the transaction will be strictly blocked for safety.",
+        parameters: {
+            type: "object",
+            properties: {},
+            required: []
+        }
+    }
+};