natureco-cli 2.7.0 → 2.8.0

package/bin/natureco.js

@@ -193,6 +193,24 @@ program
     telegramCmd(action);
   });
 
+program
+  .command('message <action>')
+  .description('Send messages directly (send)')
+  .option('--target <target>', 'Target phone number or chat ID')
+  .option('--message <message>', 'Message to send')
+  .option('--channel <channel>', 'Channel: whatsapp or telegram (default: whatsapp)')
+  .action((action, options) => {
+    if (action === 'send') {
+      const messageCmd = require('../src/commands/message');
+      const args = process.argv.slice(3); // Get all args after 'message send'
+      messageCmd(args);
+    } else {
+      console.log(chalk.red('\n❌ Unknown action\n'));
+      console.log(chalk.gray('Available actions: send\n'));
+      process.exit(1);
+    }
+  });
+
 program
   .command('dashboard [action]')
   .description('Web Control UI (start|stop|status)')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "NatureCo AI Bot Terminal Interface",
   "main": "bin/natureco.js",
   "bin": {

package/src/commands/dashboard.js

@@ -211,7 +211,7 @@ body::before{
         <div class="header-bot-name" id="header-bot-name">Nature Bot</div>
         <div class="header-bot-model" id="header-bot-model">NatureCo</div>
       </div>
-      <div class="version-badge" id="version-badge">v2.7.0</div>
+      <div class="version-badge" id="version-badge">v2.8.0</div>
     </div>
     <div class="messages" id="messages"></div>
     <div class="input-area">
@@ -341,7 +341,7 @@ function dashboard(action) {
           apiKey: cfg.apiKey,
           defaultBot: cfg.defaultBot,
           defaultBotId: cfg.defaultBotId,
-          version: 'v2.7.0',
+          version: 'v2.8.0',
           bots: cfg.bots || [],
           telegramToken: cfg.telegramToken || null,
           whatsappConnected: cfg.whatsappConnected || false,

package/src/commands/gateway-server.js

@@ -128,7 +128,7 @@ async function startGateway() {
 
 async function runGatewayWorker() {
   // This runs in the background
-  log('gateway', 'Starting NatureCo Gateway v2.7.0...', 'green');
+  log('gateway', 'Starting NatureCo Gateway v2.8.0...', 'green');
   
   // Load config
   const { getConfig } = require('../utils/config');

package/src/commands/message.js

@@ -0,0 +1,195 @@
+const chalk = require('chalk');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { getConfig } = require('../utils/config');
+
+const PID_FILE = path.join(os.homedir(), '.natureco', 'gateway.pid');
+
+async function message(args) {
+  // Parse arguments
+  const targetIndex = args.indexOf('--target');
+  const messageIndex = args.indexOf('--message');
+  const channelIndex = args.indexOf('--channel');
+  
+  if (targetIndex === -1 || messageIndex === -1) {
+    console.log(chalk.red('\n❌ Eksik parametre\n'));
+    console.log(chalk.gray('Kullanım:'));
+    console.log(chalk.cyan('  natureco message send --target <target> --message <msg> --channel [whatsapp|telegram]'));
+    console.log(chalk.gray('\nÖrnekler:'));
+    console.log(chalk.cyan('  natureco message send --target +905422842631 --message "Test" --channel whatsapp'));
+    console.log(chalk.cyan('  natureco message send --target 6139455189 --message "Test" --channel telegram\n'));
+    process.exit(1);
+  }
+  
+  const target = args[targetIndex + 1];
+  const messageText = args[messageIndex + 1];
+  const channel = channelIndex !== -1 ? args[channelIndex + 1] : 'whatsapp';
+  
+  if (!target || !messageText) {
+    console.log(chalk.red('\n❌ Target veya message boş olamaz\n'));
+    process.exit(1);
+  }
+  
+  if (!['whatsapp', 'telegram'].includes(channel)) {
+    console.log(chalk.red('\n❌ Geçersiz kanal. Sadece "whatsapp" veya "telegram" kullanılabilir\n'));
+    process.exit(1);
+  }
+  
+  // Check if gateway is running
+  if (!fs.existsSync(PID_FILE)) {
+    console.log(chalk.red('\n❌ Gateway çalışmıyor\n'));
+    console.log(chalk.yellow('Önce gateway\'i başlatın:'), chalk.cyan('natureco gateway start\n'));
+    process.exit(1);
+  }
+  
+  try {
+    const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8').trim());
+    process.kill(pid, 0); // Check if process exists
+  } catch {
+    console.log(chalk.red('\n❌ Gateway çalışmıyor (stale PID)\n'));
+    console.log(chalk.yellow('Önce gateway\'i başlatın:'), chalk.cyan('natureco gateway start\n'));
+    process.exit(1);
+  }
+  
+  const config = getConfig();
+  
+  if (channel === 'whatsapp') {
+    await sendWhatsAppMessage(target, messageText, config);
+  } else if (channel === 'telegram') {
+    await sendTelegramMessage(target, messageText, config);
+  }
+}
+
+async function sendWhatsAppMessage(target, messageText, config) {
+  if (!config.whatsappConnected || !config.whatsappBotId) {
+    console.log(chalk.red('\n❌ WhatsApp bağlı değil\n'));
+    console.log(chalk.yellow('Önce WhatsApp\'ı bağlayın:'), chalk.cyan('natureco whatsapp connect\n'));
+    process.exit(1);
+  }
+  
+  console.log(chalk.yellow('\n⏳ WhatsApp mesajı gönderiliyor...\n'));
+  
+  try {
+    // Lazy load Baileys
+    const baileys = require('@whiskeysockets/baileys');
+    const makeWASocket = baileys.default;
+    const useMultiFileAuthState = baileys.useMultiFileAuthState;
+    const fetchLatestBaileysVersion = baileys.fetchLatestBaileysVersion;
+    const Browsers = baileys.Browsers;
+    const pino = require('pino');
+    const logger = pino({ level: 'silent' });
+    
+    const sessionDir = path.join(os.homedir(), '.natureco', 'whatsapp-sessions', config.whatsappBotId);
+    
+    if (!fs.existsSync(sessionDir)) {
+      console.log(chalk.red('❌ WhatsApp session bulunamadı\n'));
+      console.log(chalk.yellow('Önce WhatsApp\'ı bağlayın:'), chalk.cyan('natureco whatsapp connect\n'));
+      process.exit(1);
+    }
+    
+    const { state } = await useMultiFileAuthState(sessionDir);
+    const { version } = await fetchLatestBaileysVersion();
+    
+    const sock = makeWASocket({
+      version,
+      auth: state,
+      printQRInTerminal: false,
+      logger: logger,
+      browser: Browsers.ubuntu('Chrome'),
+      connectTimeoutMs: 30000,
+    });
+    
+    // Wait for connection
+    await new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        reject(new Error('Connection timeout'));
+      }, 30000);
+      
+      sock.ev.on('connection.update', (update) => {
+        if (update.connection === 'open') {
+          clearTimeout(timeout);
+          resolve();
+        } else if (update.connection === 'close') {
+          clearTimeout(timeout);
+          reject(new Error('Connection failed'));
+        }
+      });
+    });
+    
+    // Normalize phone number
+    const normalizedTarget = target.replace(/[^\d]/g, '');
+    const jid = `${normalizedTarget}@s.whatsapp.net`;
+    
+    // Send message
+    await sock.sendMessage(jid, { text: messageText });
+    
+    console.log(chalk.green('✅ Mesaj gönderildi!\n'));
+    console.log(chalk.cyan('Hedef:'), chalk.white(target));
+    console.log(chalk.cyan('Mesaj:'), chalk.white(messageText));
+    console.log('');
+    
+    // Close connection
+    setTimeout(() => {
+      sock.end();
+      process.exit(0);
+    }, 2000);
+    
+  } catch (err) {
+    console.log(chalk.red(`\n❌ Hata: ${err.message}\n`));
+    process.exit(1);
+  }
+}
+
+async function sendTelegramMessage(target, messageText, config) {
+  if (!config.telegramToken || !config.telegramBotId) {
+    console.log(chalk.red('\n❌ Telegram bağlı değil\n'));
+    console.log(chalk.yellow('Önce Telegram\'ı bağlayın:'), chalk.cyan('natureco telegram connect\n'));
+    process.exit(1);
+  }
+  
+  console.log(chalk.yellow('\n⏳ Telegram mesajı gönderiliyor...\n'));
+  
+  try {
+    // Lazy load node-telegram-bot-api
+    let TelegramBot;
+    try {
+      TelegramBot = require('node-telegram-bot-api');
+    } catch (err) {
+      console.log(chalk.red('❌ node-telegram-bot-api yüklü değil\n'));
+      console.log(chalk.yellow('Yüklemek için:'), chalk.cyan('npm install -g node-telegram-bot-api\n'));
+      process.exit(1);
+    }
+    
+    const bot = new TelegramBot(config.telegramToken, { polling: false });
+    
+    // Validate chat ID (should be numeric)
+    const chatId = target.trim();
+    if (!/^-?\d+$/.test(chatId)) {
+      console.log(chalk.red('❌ Geçersiz Telegram Chat ID\n'));
+      console.log(chalk.gray('Chat ID sadece rakamlardan oluşmalı (örnek: 123456789)\n'));
+      process.exit(1);
+    }
+    
+    // Send message
+    await bot.sendMessage(chatId, messageText);
+    
+    console.log(chalk.green('✅ Mesaj gönderildi!\n'));
+    console.log(chalk.cyan('Chat ID:'), chalk.white(chatId));
+    console.log(chalk.cyan('Mesaj:'), chalk.white(messageText));
+    console.log('');
+    
+    process.exit(0);
+    
+  } catch (err) {
+    console.log(chalk.red(`\n❌ Hata: ${err.message}\n`));
+    
+    if (err.message.includes('chat not found')) {
+      console.log(chalk.yellow('⚠️  Chat ID bulunamadı. Önce bot\'a mesaj gönderin.\n'));
+    }
+    
+    process.exit(1);
+  }
+}
+
+module.exports = message;

package/src/utils/api.js

@@ -1,4 +1,4 @@
-// NatureCo CLI v2.7.0 - Universal LLM Provider Support
+// NatureCo CLI v2.8.0 - Universal LLM Provider Support
 // Supports: OpenAI, Groq, Together, Fireworks, Perplexity, Mistral, DeepSeek, OpenRouter, Ollama, LM Studio, Anthropic
 
 const fs = require('fs');
@@ -293,12 +293,20 @@ async function sendMessageToProvider(apiKey, message, conversationId = null, sys
 
       // Add tool results to messages (base64 encoded for safety)
       for (const result of toolResults) {
-        const sanitizedContent = result.result.success 
-          ? { result: result.result.output || result.result }
-          : { error: result.result.error };
+        // Extract the actual content from tool result
+        let contentToEncode;
+        
+        if (result.result.success) {
+          // Try different field names: output, data, or entire result
+          contentToEncode = { 
+            result: result.result.output || result.result.data || result.result 
+          };
+        } else {
+          contentToEncode = { error: result.result.error };
+        }
         
         // Base64 encode the entire result to prevent injection attacks
-        const encoded = Buffer.from(JSON.stringify(sanitizedContent)).toString('base64');
+        const encoded = Buffer.from(JSON.stringify(contentToEncode)).toString('base64');
         
         messages.push({
           role: 'tool',