nyxora 26.6.24 → 26.6.26

package/README.md

@@ -3,7 +3,7 @@
 
 
 [![Status: Alpha](https://img.shields.io/badge/Status-Alpha-red.svg)](#)
-[![Built on Arbitrum](https://img.shields.io/badge/Built_on-Arbitrum-28A0F0?style=flat&logo=arbitrum&logoColor=white)](https://arbitrum.io/)
+[![Built on Base](https://img.shields.io/badge/Built_on-Base-0052FF?style=flat&logo=base&logoColor=white)](https://base.org/)
 [![MCP Supported](https://img.shields.io/badge/MCP-Supported-blue.svg)](#)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Security: Defense-in-Depth](https://img.shields.io/badge/Security-Defense--in--Depth-blue.svg)](#️-advanced-security-threat-model)
@@ -21,9 +21,9 @@ It operates under a **Zero-Trust, Defense-in-Depth Cryptographically Bound Human
 ## 🔥 Key Features
 
 ### Advanced Security Architecture
-*   **🛡️ On-Chain AI Kill-Switch**: Nyxora is governed by an Arbitrum Smart Contract (`NyxoraAgentRegistry`). Users have absolute cryptographic power to instantly paralyze the AI's on-chain execution if compromised, solving the Web3 AI safety dilemma. [Read more about our Arbitrum Architecture](https://nyxoraai.github.io/Nyxora/security/smart-contract)
+*   **🛡️ On-Chain AI Kill-Switch**: Nyxora is governed by a Base Smart Contract (`NyxoraAgentRegistry`). Users have absolute cryptographic power to instantly paralyze the AI's on-chain execution if compromised, solving the Web3 AI safety dilemma. [Read more about our Base Architecture](https://nyxoraai.github.io/Nyxora/security/smart-contract)
 *   **3-Tier IPC Architecture**: Nyxora is split into isolated processes: **Core** (LLM Runtime), **Policy Engine** (Guardrails on port 3001), and **Signer Vault** (Isolated Key Manager on Unix Sockets).
-*   **DeFi Configuration BYOK & UI Masking**: All aggregator and provider API keys are strictly isolated via a Bring Your Own Keys (BYOK) architecture into a heavily guarded `~/.nyxora/defi_keys.yaml` file. The local web Dashboard masks these injected secrets using `***********` and `IS_SET` censorship, completely neutralizing malicious browser extensions from exfiltrating your keys.
+*   **DeFi & Market Configuration BYOK & UI Masking**: All aggregator, provider, and oracle API keys are strictly isolated via a Bring Your Own Keys (BYOK) architecture into heavily guarded `~/.nyxora/defi_keys.yaml` and `~/.nyxora/market_keys.yaml` files. The local web Dashboard masks these injected secrets using `***********` and `IS_SET` censorship, completely neutralizing malicious browser extensions from exfiltrating your keys.
 *   **Approval Replay Protection (Nonce Guard)**: Transactions requested by the AI are drafted as hashes and signed with a randomized 16-byte Nonce. The `/api/transactions/:id/approve` endpoint strictly enforces Nonce matching to completely eliminate double-spending and Replay Attacks.
 *   **Native Asset Parameter Tampering Protection**: The internal cryptographic HMAC signature rigorously binds `toAddress`, `txData`, and `valueWei`, rendering the system mathematically immune to Native Token (ETH/BNB) destination or amount hijacking via Indirect Prompt Injections.
 *   **Human-in-the-Loop Memory Approval**: AI-extracted permanent behavioral rules are strictly quarantined in a `pending` state until explicitly authorized by the user via the Dashboard, neutralizing Persistent Memory Poisoning vectors.
@@ -35,10 +35,10 @@ It operates under a **Zero-Trust, Defense-in-Depth Cryptographically Bound Human
 ### 🌐 Web3 Skills (On-Chain)
 *   **Security Scanner**: Nyxora can scan smart contracts via GoPlus Labs to detect Honeypots, Hidden Taxes, and malicious proxy upgrades before you buy.
 *   **Advanced DeFi Optimization**: Autonomously supply assets to Aave V3, deposit into Beefy/Yearn Auto-Compounder Vaults, manage Uniswap V3 Liquidity (LP), and instantly revoke infinite approvals to secure your wallet. Features intelligent Transaction Chaining to auto-approve allowances prior to execution.
-*   **6-Engine Meta-Aggregator & Anti-MEV**: The core engine interfaces with a powerful 6-Engine Meta-Aggregator (**1inch, 0x, LI.FI, Relay, OpenOcean, and KyberSwap**) to route tokens cross-chain, ensuring absolute maximum liquidity depth.
+*   **Extensible 8-Engine Meta-Aggregator & Anti-MEV**: The core engine interfaces with a powerful, extensible Meta-Aggregator (**1inch, 0x, LI.FI, Relay, OpenOcean, KyberSwap, ArbitrumBridge, and OpBridge**) via a dynamic Provider Registry to route tokens cross-chain, ensuring absolute maximum liquidity depth.
 *   **Adaptive Auto Slippage Protection**: Nyxora enforces a dynamic and adaptive **'auto' slippage** by default to leverage dynamic MEV-protection from these industry-standard aggregators. However, the user retains absolute control to override this dynamically—either globally via the Dashboard Settings or on a per-transaction basis through NLP chat commands (e.g., *"Swap 1 ETH to PEPE with 10% slippage"*).
 
-*   **Dual-Routing Market Intelligence Engine**: Real-time asset tracking utilizing a sophisticated API Waterfall. Symbol queries are routed to CoinGecko/CEXs for global FDV, while Contract Addresses trigger DexScreener for live on-chain liquidity metrics across all networks.
+*   **Dual-Routing Market Intelligence & Smart Fallback Engine**: Real-time asset tracking utilizing a sophisticated API Waterfall. Symbol queries are routed to CoinGecko/CoinMarketCap Pro endpoints (if BYOK is configured) or gracefully fall back to public endpoints. Contract Addresses seamlessly trigger DexScreener for live on-chain liquidity metrics across all networks, guaranteeing robust discovery even for unlisted memecoins.
 *   **Asynchronous Watchdog Agents**: Seamlessly spawn detached background instances for long-running monitoring tasks (e.g., *"Notify me when $ETH drops below $2500"*), leaving your primary chat session free for other operations.
 *   **"Lean Degen" Auto-Whitelist**: Automatically intercepts Contract Addresses (CAs) whenever you check balances or swap tokens, saving them to your localized `user_whitelist.json` for future tracking.
 *   **Dynamic Portfolio Engine**: Merges standard tokens, your custom Degen CAs, and CoinGecko's daily trending list into a single hyper-fast Multicall scan to deliver a clean, spam-free PnL portfolio report in under 1 second.
@@ -95,58 +95,27 @@ To dive deeper into the technical details of our Zero-Knowledge security archite
 
 ---
 
-## 1. 🚀 Quick Start & Installation
+## 🚀 Quick Start & Installation
 
-### Global Installation via NPM (Recommended)
-The easiest and fastest way to use Nyxora is to install it globally via NPM. This ensures you get the latest version and can run Nyxora from anywhere on your machine.
+### Option 1: Global Installation (Recommended)
+Nyxora can be installed globally via NPM, allowing you to use the `nyxora` CLI command from anywhere on your machine.
 
-The fastest way to install Nyxora is via our automated installation script:
-
-**For Linux & macOS (Bash):**
 ```bash
-curl -fsSL https://nyxoraai.github.io/Nyxora/install.sh | bash
-```
-
-**For Windows (PowerShell):**
-```powershell
-iwr https://nyxoraai.github.io/Nyxora/install.ps1 -useb | iex
-```
-
-Alternatively, you can install it manually on any operating system using NPM:
+# Install globally
+npm install -g nyxora
 
-```bash
-npm install -g nyxora@latest
-```
-
-### 2. Run the Interactive Setup Wizard (API Keys, Wallet, Telegram)
-```bash
+# Run the interactive setup wizard (API Keys, Wallet, Telegram)
 nyxora setup
-```
 
-### 3. Start the Nyxora background daemon
-```bash
+# Start the background daemon
 nyxora start
-```
 
-### 4. Open the Web Dashboard
-```bash
+# Open the interactive UI dashboard
 nyxora dashboard
 ```
 
-### Utility: Atomically clear the AI's short-term and long-term memory
-```bash
-nyxora clear --force
-```
-
-### Utility: Clean Uninstallation
-To completely remove Nyxora, wipe the AI's local memory, and securely delete your Private Key from the OS Keyring before uninstalling the NPM package:
-```bash
-nyxora uninstall
-```
-> **⚠️ IMPORTANT:** Whenever you re-run `nyxora setup` or manually edit the config files, you **must restart the daemon** by running `nyxora restart` for the changes to take effect.
-
-### Local Development (From Source)
-If you wish to modify the code or run from source, you can use the Monorepo architecture.
+### Option 2: Local Development (Source Code)
+Nyxora operates on a Monorepo architecture. To run it locally from the source code, modify its behaviors, or contribute to the repository, follow these steps:
 
 ```bash
 git clone https://github.com/nyxoraAI/Nyxora.git
@@ -158,14 +127,16 @@ npm install
 # 2. Build the Dashboard UI
 npm run build
 
-# 3. Interactive Setup Wizard (API Keys, Wallet, Telegram)
+# 3. Interactive Setup Wizard
 npm run setup
 
 # 4. Start the Application
 npm start
 ```
+
 *(If you are actively developing and modifying the source code, use `npm run dev` to enable hot-reloading for the frontend and backend).*
-> **⚠️ IMPORTANT:** Whenever you re-run `npm run setup` or manually edit the config files, you **must restart the dev server** for the changes to take effect.
+
+> **⚠️ IMPORTANT:** Whenever you re-run `nyxora setup` or manually edit the config files, you **must restart the server** for the changes to take effect.
 
 ---
 
@@ -188,7 +159,7 @@ For complete technical deep-dives into our Cryptographic Architecture, please vi
 **❤️ Support the Project**
 
 Building and maintaining a highly secure, zero-trust architecture takes significant time and resources. If you love what we are building, you can help us keep Nyxora open, secure, and constantly evolving by sending a coffee our way:
-- **EVM :** `0x490717E50D6434C348AA0D2bD5fe682392823708`
+- **EVM :** `0xF5726f0F185d6304f30c9BAE95c477471E29F14f`
 
 ---
 **License:** MIT License

package/dist/packages/core/src/agent/llmProvider.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeminiAdapter = exports.AnthropicAdapter = exports.OpenAIAdapter = void 0;
-const genai_1 = require("@google/genai");
 class OpenAIAdapter {
     client;
     constructor(client) {
@@ -131,20 +130,20 @@ class AnthropicAdapter {
 }
 exports.AnthropicAdapter = AnthropicAdapter;
 class GeminiAdapter {
-    client;
-    constructor(client) {
-        this.client = client;
+    apiKey;
+    constructor(apiKey) {
+        this.apiKey = apiKey;
     }
     async chat(request) {
         let systemInstruction = '';
-        const rawGemini = [];
+        const contents = [];
         for (const m of request.messages) {
             if (m.role === 'system') {
                 systemInstruction = m.content;
                 continue;
             }
             if (m.role === 'user') {
-                rawGemini.push({ role: 'user', parts: [{ text: m.content }] });
+                contents.push({ role: 'user', parts: [{ text: m.content }] });
             }
             else if (m.role === 'assistant') {
                 const parts = [];
@@ -163,10 +162,12 @@ class GeminiAdapter {
                         catch (e) { }
                     });
                 }
-                rawGemini.push({ role: 'model', parts: parts });
+                if (parts.length > 0) {
+                    contents.push({ role: 'model', parts: parts });
+                }
             }
             else if (m.role === 'tool') {
-                rawGemini.push({
+                contents.push({
                     role: 'user',
                     parts: [{
                             functionResponse: {
@@ -177,18 +178,19 @@ class GeminiAdapter {
                 });
             }
         }
-        const geminiMessages = [];
-        for (const m of rawGemini) {
-            const last = geminiMessages[geminiMessages.length - 1];
+        // Merge adjacent messages of the same role
+        const mergedContents = [];
+        for (const m of contents) {
+            const last = mergedContents[mergedContents.length - 1];
             if (last && last.role === m.role) {
                 last.parts.push(...m.parts);
             }
             else {
-                geminiMessages.push(m);
+                mergedContents.push(m);
             }
         }
         let tools = undefined;
-        if (request.tools) {
+        if (request.tools && request.tools.length > 0) {
             tools = [{
                     functionDeclarations: request.tools.map(t => ({
                         name: t.function.name,
@@ -197,32 +199,45 @@ class GeminiAdapter {
                     }))
                 }];
         }
-        const response = await this.client.models.generateContent({
-            model: request.model,
-            contents: geminiMessages,
-            config: {
-                systemInstruction: systemInstruction,
-                tools: tools,
-                temperature: request.temperature,
-                safetySettings: [
-                    { category: genai_1.HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, threshold: genai_1.HarmBlockThreshold.BLOCK_NONE },
-                    { category: genai_1.HarmCategory.HARM_CATEGORY_HARASSMENT, threshold: genai_1.HarmBlockThreshold.BLOCK_NONE },
-                    { category: genai_1.HarmCategory.HARM_CATEGORY_HATE_SPEECH, threshold: genai_1.HarmBlockThreshold.BLOCK_NONE },
-                    { category: genai_1.HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, threshold: genai_1.HarmBlockThreshold.BLOCK_NONE }
-                ]
-            }
+        const payload = {
+            contents: mergedContents,
+            generationConfig: {
+                temperature: request.temperature || 0.7,
+            },
+            safetySettings: [
+                { category: 'HARM_CATEGORY_DANGEROUS_CONTENT', threshold: 'BLOCK_NONE' },
+                { category: 'HARM_CATEGORY_HARASSMENT', threshold: 'BLOCK_NONE' },
+                { category: 'HARM_CATEGORY_HATE_SPEECH', threshold: 'BLOCK_NONE' },
+                { category: 'HARM_CATEGORY_SEXUALLY_EXPLICIT', threshold: 'BLOCK_NONE' }
+            ]
+        };
+        if (systemInstruction) {
+            payload.systemInstruction = { parts: [{ text: systemInstruction }] };
+        }
+        if (tools) {
+            payload.tools = tools;
+        }
+        const response = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/${request.model}:generateContent?key=${this.apiKey}`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(payload)
         });
+        if (!response.ok) {
+            const errText = await response.text();
+            throw new Error(`Gemini API Error: ${response.status} ${response.statusText} - ${errText}`);
+        }
+        const data = await response.json();
         let contentStr = null;
         let toolCalls = [];
-        if (response.candidates && response.candidates.length > 0) {
-            const candidate = response.candidates[0];
-            // Log finish reason for debugging safety blocks
+        if (data.candidates && data.candidates.length > 0) {
+            const candidate = data.candidates[0];
             if (candidate.finishReason && candidate.finishReason !== 'STOP') {
                 console.warn(`[LLM] Gemini API returned finishReason: ${candidate.finishReason}`);
             }
             if (candidate.content && candidate.content.parts) {
-                const parts = candidate.content.parts;
-                for (const part of parts) {
+                for (const part of candidate.content.parts) {
                     if (part.text) {
                         contentStr = (contentStr || '') + part.text;
                     }
@@ -232,7 +247,7 @@ class GeminiAdapter {
                             type: 'function',
                             function: {
                                 name: part.functionCall.name,
-                                arguments: JSON.stringify(part.functionCall.args)
+                                arguments: JSON.stringify(part.functionCall.args || {})
                             }
                         });
                     }

package/dist/packages/core/src/agent/osAgent.js

@@ -4,102 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = void 0;
-exports.getOpenAI = getOpenAI;
 exports.processOsIntent = processOsIntent;
-const openai_1 = require("openai");
 const parser_1 = require("../config/parser");
 const logger_1 = require("../memory/logger");
 const tracker_1 = require("../gateway/tracker");
 const episodic_1 = require("../memory/episodic");
 const skillManager_1 = require("../utils/skillManager");
-const updateProfile_1 = require("./updateProfile");
-const updateIdentity_1 = require("./updateIdentity");
-const updateSecurityPolicy_1 = require("../system/skills/updateSecurityPolicy");
-const analyzeDocument_1 = require("../system/skills/analyzeDocument");
-const readFile_1 = require("../system/skills/readFile");
-const writeFile_1 = require("../system/skills/writeFile");
-const generateExcel_1 = require("../system/skills/generateExcel");
-const executeShell_1 = require("../system/skills/executeShell");
-const browseWeb_1 = require("../system/skills/browseWeb");
-const searchWeb_1 = require("../system/skills/searchWeb");
-const editFile_1 = require("../system/skills/editFile");
-const gitManager_1 = require("../system/skills/gitManager");
-const xManager_1 = require("../system/skills/xManager");
-const notionWorkspace_1 = require("../system/skills/notionWorkspace");
-const audioTranscribe_1 = require("../system/skills/audioTranscribe");
-const summarizeText_1 = require("../system/skills/summarizeText");
-const scheduleTask_1 = require("../system/skills/scheduleTask");
-const cancelTask_1 = require("../system/skills/cancelTask");
-const googleWorkspace_1 = require("../system/skills/googleWorkspace");
+const registry_1 = require("../plugin/registry");
 const picocolors_1 = __importDefault(require("picocolors"));
 exports.logger = new logger_1.Logger();
-const PROVIDER_CONFIGS = {
-    ollama: { baseURL: process.env.OLLAMA_BASE_URL ? `${process.env.OLLAMA_BASE_URL}/v1` : 'http://localhost:11434/v1', requiresApiKey: false },
-    gemini: { baseURL: 'https://generativelanguage.googleapis.com/v1beta/openai/', requiresApiKey: true },
-    openrouter: { baseURL: 'https://openrouter.ai/api/v1', requiresApiKey: true },
-    groq: { baseURL: 'https://api.groq.com/openai/v1', requiresApiKey: true },
-    mistral: { baseURL: 'https://api.mistral.ai/v1', requiresApiKey: true },
-    xai: { baseURL: 'https://api.x.ai/v1', requiresApiKey: true },
-    deepseek: { baseURL: 'https://api.deepseek.com', requiresApiKey: true },
-    openai: { requiresApiKey: true }
-};
-async function getOpenAI() {
-    const config = (0, parser_1.loadConfig)();
-    const vaultKeys = await (0, parser_1.loadApiKeys)();
-    const providerName = config.llm.provider || 'openai';
-    const providerConf = PROVIDER_CONFIGS[providerName] || PROVIDER_CONFIGS['openai'];
-    let apiKey = 'local';
-    if (providerConf.requiresApiKey) {
-        apiKey = '';
-        const keyName = `${providerName}_key`;
-        apiKey = vaultKeys[keyName] || config.credentials?.[keyName] || '';
-        if (!apiKey) {
-            throw new Error(`[Security] No API Key found for ${providerName} in OS Keyring. Please run 'nyxora set-key ${providerName} <key>' or 'nyxora setup'.`);
-        }
-        console.log(`[LLM] Using API Key securely unlocked from OS Keyring vault.`);
-    }
-    return new openai_1.OpenAI({
-        baseURL: providerConf.baseURL,
-        apiKey: apiKey,
-        timeout: 120 * 1000,
-        maxRetries: 0
-    });
-}
-async function executeWithRetry(requestBuilder, maxRetries = 3) {
-    let retries = 0;
-    while (retries <= maxRetries) {
-        try {
-            const client = await getOpenAI();
-            return await requestBuilder(client);
-        }
-        catch (error) {
-            const status = error?.status || error?.response?.status;
-            // 401 Unauthorized or 400 Bad Request - don't retry, it's fatal
-            if (status === 401 || status === 400) {
-                console.error(`[LLM] Fatal Error ${status}: ${error.message}. Aborting.`);
-                throw error;
-            }
-            // 429 Rate Limit - rotate provider/key immediately and retry
-            if (status === 429) {
-                console.warn(`[LLM] Rate Limit (429) hit. Rotating key...`);
-                // getOpenAI() automatically rotates to next key if available
-                retries++;
-                if (retries > maxRetries)
-                    throw error;
-                continue; // Try next key immediately
-            }
-            // 500, 502, 503, Timeout, Network error - Exponential Backoff
-            retries++;
-            if (retries > maxRetries) {
-                console.error(`[LLM] Max retries reached.`);
-                throw error;
-            }
-            const delayMs = Math.pow(2, retries) * 1000; // 2s, 4s, 8s
-            console.warn(`[LLM] API Error (${status || error.message}). Retrying in ${delayMs}ms...`);
-            await new Promise(resolve => setTimeout(resolve, delayMs));
-        }
-    }
-}
+const llmUtils_1 = require("../utils/llmUtils");
 function getSystemPrompt(context = 'os') {
     const config = (0, parser_1.loadConfig)();
     const currentDateTime = new Date().toLocaleString('id-ID', { timeZone: 'Asia/Jakarta' });
@@ -137,32 +51,24 @@ async function processOsIntent(input, role = 'user', onProgress, sessionId) {
     exports.logger.addEntry({ role, content: input }, sessionId);
     const history = exports.logger.getHistory(sessionId);
     // Format messages for OpenAI
-    let activeTools = [];
-    const SYSTEM_TOOLS = [updateProfile_1.updateProfileToolDefinition, updateIdentity_1.updateIdentityToolDefinition, updateSecurityPolicy_1.updateSecurityPolicyToolDefinition, analyzeDocument_1.analyzeDocumentToolDefinition, readFile_1.readLocalFileToolDefinition, writeFile_1.writeLocalFileToolDefinition, generateExcel_1.generateExcelToolDefinition, executeShell_1.runTerminalCommandToolDefinition, browseWeb_1.browseWebsiteToolDefinition, searchWeb_1.searchWebToolDefinition, editFile_1.editLocalFileToolDefinition, gitManager_1.gitManagerToolDefinition, xManager_1.xManagerToolDefinition, notionWorkspace_1.notionWorkspaceToolDefinition, audioTranscribe_1.audioTranscribeToolDefinition, summarizeText_1.summarizeTextToolDefinition, scheduleTask_1.scheduleTaskDefinition, cancelTask_1.cancelTaskDefinition];
-    const GOOGLE_TOOLS = [googleWorkspace_1.readGmailInboxToolDefinition, googleWorkspace_1.listCalendarEventsToolDefinition, googleWorkspace_1.appendRowToSheetsToolDefinition, googleWorkspace_1.readGoogleDocsToolDefinition, googleWorkspace_1.readGoogleFormResponsesToolDefinition];
-    activeTools = [...SYSTEM_TOOLS, ...GOOGLE_TOOLS].filter(t => (0, skillManager_1.isSkillActive)(t.function.name));
+    let activeTools = [...registry_1.pluginManager.getAllToolDefinitions()];
+    activeTools = activeTools.filter(t => (0, skillManager_1.isSkillActive)(t.function.name));
     const { sanitizeHistoryForLLM } = require('../utils/historySanitizer');
-    const sanitizedHistory = sanitizeHistoryForLLM(history, activeTools);
+    const sanitizedHistory = sanitizeHistoryForLLM(history, activeTools, config.llm.provider);
     let messages = [
         { role: 'system', content: getSystemPrompt('os') },
         ...sanitizedHistory
     ];
     try {
-        const context = 'os';
-        const SYSTEM_TOOLS = [updateProfile_1.updateProfileToolDefinition, updateIdentity_1.updateIdentityToolDefinition, updateSecurityPolicy_1.updateSecurityPolicyToolDefinition, analyzeDocument_1.analyzeDocumentToolDefinition, readFile_1.readLocalFileToolDefinition, writeFile_1.writeLocalFileToolDefinition, generateExcel_1.generateExcelToolDefinition, executeShell_1.runTerminalCommandToolDefinition, browseWeb_1.browseWebsiteToolDefinition, searchWeb_1.searchWebToolDefinition, editFile_1.editLocalFileToolDefinition, gitManager_1.gitManagerToolDefinition, xManager_1.xManagerToolDefinition, notionWorkspace_1.notionWorkspaceToolDefinition, audioTranscribe_1.audioTranscribeToolDefinition, summarizeText_1.summarizeTextToolDefinition, scheduleTask_1.scheduleTaskDefinition, cancelTask_1.cancelTaskDefinition];
-        const GOOGLE_TOOLS = [googleWorkspace_1.readGmailInboxToolDefinition, googleWorkspace_1.listCalendarEventsToolDefinition, googleWorkspace_1.appendRowToSheetsToolDefinition, googleWorkspace_1.readGoogleDocsToolDefinition, googleWorkspace_1.readGoogleFormResponsesToolDefinition];
-        let activeTools = [...SYSTEM_TOOLS, ...GOOGLE_TOOLS];
-        activeTools = activeTools.filter(t => (0, skillManager_1.isSkillActive)(t.function.name));
-        const response = await executeWithRetry(async (client) => {
-            return await client.chat.completions.create({
+        const response = await (0, llmUtils_1.executeWithRetry)(async (client) => {
+            return await client.chat({
                 model: config.llm.model,
                 temperature: config.llm.temperature,
                 messages: messages,
-                tools: activeTools,
-                tool_choice: "auto",
+                tools: activeTools
             });
         });
-        const responseMessage = response.choices[0].message;
+        const responseMessage = response.message;
         tracker_1.Tracker.addMessage();
         if (response.usage?.total_tokens) {
             tracker_1.Tracker.addTokens(response.usage.total_tokens, config.llm.provider);
@@ -214,103 +120,13 @@ async function processOsIntent(input, role = 'user', onProgress, sessionId) {
                     continue;
                 }
                 try {
-                    switch (toolName) {
-                        case 'update_profile': {
-                            result = (0, updateProfile_1.updateProfile)(args.content, args.mode);
-                            break;
-                        }
-                        case 'update_identity': {
-                            result = (0, updateIdentity_1.updateIdentity)(args.content, args.mode);
-                            break;
-                        }
-                        case 'update_security_policy': {
-                            result = await (0, updateSecurityPolicy_1.updateSecurityPolicy)(args.policy, args.action || 'add');
-                            break;
-                        }
-                        case 'analyze_document': {
-                            result = await (0, analyzeDocument_1.analyzeDocument)(args.filePath);
-                            break;
-                        }
-                        case 'read_local_file': {
-                            result = (0, readFile_1.readLocalFile)(args.filePath, args.startLine, args.endLine);
-                            break;
-                        }
-                        case 'edit_local_file': {
-                            result = (0, editFile_1.editLocalFile)(args.filePath, args.searchString, args.replacementString);
-                            break;
-                        }
-                        case 'execute_git_command': {
-                            result = await (0, gitManager_1.executeGitCommand)(args.action, args.commitMessage);
-                            break;
-                        }
-                        case 'manage_twitter': {
-                            result = await (0, xManager_1.manageTwitter)(args.action, args.content, args.username);
-                            break;
-                        }
-                        case 'manage_notion': {
-                            result = await (0, notionWorkspace_1.manageNotion)(args.action, args.pageId, args.text);
-                            break;
-                        }
-                        case 'transcribe_audio': {
-                            result = await (0, audioTranscribe_1.transcribeAudio)(args.filePath);
-                            break;
-                        }
-                        case 'summarize_text': {
-                            result = await (0, summarizeText_1.summarizeText)(args.text, args.focus);
-                            break;
-                        }
-                        case 'write_local_file': {
-                            result = (0, writeFile_1.writeLocalFile)(args.filePath, args.content);
-                            break;
-                        }
-                        case 'generate_excel_file': {
-                            result = await (0, generateExcel_1.generateExcelFile)(args.data, args.filePath);
-                            break;
-                        }
-                        case 'run_terminal_command': {
-                            result = await (0, executeShell_1.runTerminalCommand)(args.command);
-                            break;
-                        }
-                        case 'browse_website': {
-                            result = await (0, browseWeb_1.browseWebsite)(args.url);
-                            break;
-                        }
-                        case 'search_web': {
-                            result = await (0, searchWeb_1.searchWeb)(args.query, args.depth);
-                            break;
-                        }
-                        case 'schedule_task': {
-                            result = await (0, scheduleTask_1.executeScheduleTask)(args);
-                            break;
-                        }
-                        case 'cancel_task': {
-                            result = await (0, cancelTask_1.executeCancelTask)(args);
-                            break;
-                        }
-                        case 'read_gmail_inbox': {
-                            result = await (0, googleWorkspace_1.readGmailInbox)(args.maxResults);
-                            break;
-                        }
-                        case 'list_calendar_events': {
-                            result = await (0, googleWorkspace_1.listCalendarEvents)(args.maxResults);
-                            break;
-                        }
-                        case 'append_row_to_sheets': {
-                            result = await (0, googleWorkspace_1.appendRowToSheets)(args.spreadsheetId, args.range, args.values);
-                            break;
-                        }
-                        case 'read_google_docs': {
-                            result = await (0, googleWorkspace_1.readGoogleDocs)(args.documentId);
-                            break;
-                        }
-                        case 'read_google_form_responses': {
-                            result = await (0, googleWorkspace_1.readGoogleFormResponses)(args.formId);
-                            break;
-                        }
-                        default: {
-                            result = `Error: Tool ${toolName} is not implemented.`;
-                            break;
-                        }
+                    // 1. Execute via PluginManager
+                    const pluginResult = await registry_1.pluginManager.executeTool(toolName, args, { sessionId });
+                    if (pluginResult !== null) {
+                        result = pluginResult;
+                    }
+                    else {
+                        result = `Error: Tool ${toolName} is not implemented.`;
                     }
                     if (result.includes('[Security Blocked]') || result.startsWith('Error:')) {
                         console.log(picocolors_1.default.red(`[❌ Failed] Tool ${toolName} returned an error or was blocked.`));
@@ -342,13 +158,13 @@ async function processOsIntent(input, role = 'user', onProgress, sessionId) {
                 return finalContent;
             }
             // Second call to get the final answer after tool execution
-            const secondSanitized = sanitizeHistoryForLLM(exports.logger.getHistory(sessionId), activeTools);
+            const secondSanitized = sanitizeHistoryForLLM(exports.logger.getHistory(sessionId), activeTools, config.llm.provider);
             const secondMessages = [
                 { role: 'system', content: getSystemPrompt('os') },
                 ...secondSanitized
             ];
-            const secondResponse = await executeWithRetry(async (client) => {
-                return await client.chat.completions.create({
+            const secondResponse = await (0, llmUtils_1.executeWithRetry)(async (client) => {
+                return await client.chat({
                     model: config.llm.model,
                     messages: secondMessages,
                 });
@@ -357,7 +173,7 @@ async function processOsIntent(input, role = 'user', onProgress, sessionId) {
                 tracker_1.Tracker.addTokens(secondResponse.usage.total_tokens, config.llm.provider);
             }
             tracker_1.Tracker.addEvent('llm.final_response', { provider: config.llm.provider });
-            let finalContent = secondResponse.choices[0].message.content || "";
+            let finalContent = secondResponse.message.content || "";
             // Clean up orphaned <think> blocks that forgot to output </think>
             finalContent = finalContent.replace(/<thought>[\s\S]*?<\/thought>\n?/gi, '');
             finalContent = finalContent.replace(/<think>[\s\S]*?<\/think>\n?/gi, '');
@@ -382,7 +198,11 @@ async function processOsIntent(input, role = 'user', onProgress, sessionId) {
     }
     catch (error) {
         console.error("LLM Error:", error);
-        const errorMsg = '⚠️ All models are temporarily rate-limited. Please try again in a few minutes.';
+        const status = error?.status || error?.response?.status;
+        let errorMsg = '⚠️ All models are temporarily rate-limited. Please try again in a few minutes.';
+        if (status === 400 || (error.message && error.message.toLowerCase().includes('invalid'))) {
+            errorMsg = '⚠️ Terjadi kesalahan pemahaman instruksi. LLM kesulitan menentukan format alat (skill) yang cocok. Silakan coba deskripsikan perintah Anda dengan lebih spesifik.';
+        }
         exports.logger.addEntry({ role: 'assistant', content: errorMsg }, sessionId);
         return errorMsg;
     }