natureco-cli 1.0.24 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "NatureCo AI Bot Terminal Interface",
   "main": "bin/natureco.js",
   "bin": {
@@ -24,6 +24,7 @@
   "author": "NatureCo",
   "license": "MIT",
   "dependencies": {
+    "@whiskeysockets/baileys": "^7.0.0-rc10",
     "boxen": "^5.1.2",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
@@ -32,6 +33,7 @@
     "inquirer": "^8.2.7",
     "node-cron": "^2.0.3",
     "ora": "^5.4.1",
+    "pino": "^8.21.0",
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.20.0"
   },

package/src/commands/setup.js

@@ -63,10 +63,54 @@ async function setup() {
     },
   ]);
 
+  // Model listesi
+  const MODELS = {
+    anthropic: [
+      { name: 'Claude Opus 4.7', value: 'claude-opus-4-7' },
+      { name: 'Claude Opus 4.6', value: 'claude-opus-4-6' },
+      { name: 'Claude Opus 4.5', value: 'claude-opus-4-5-20251101' },
+      { name: 'Claude Sonnet 4.6', value: 'claude-sonnet-4-6' },
+      { name: 'Claude Sonnet 4.5', value: 'claude-sonnet-4-5-20251001' },
+      { name: 'Claude Haiku 4.5', value: 'claude-haiku-4-5-20251001' },
+      { name: 'Claude Haiku 3.5', value: 'claude-haiku-3-5-20241022' },
+    ],
+    openai: [
+      { name: 'GPT-5.5', value: 'gpt-5.5' },
+      { name: 'GPT-5.4', value: 'gpt-5.4' },
+      { name: 'GPT-5.4 Mini', value: 'gpt-5.4-mini' },
+      { name: 'GPT-5.4 Nano', value: 'gpt-5.4-nano' },
+      { name: 'GPT-5', value: 'gpt-5' },
+      { name: 'GPT-5 Mini', value: 'gpt-5-mini' },
+      { name: 'GPT-4.1', value: 'gpt-4.1' },
+      { name: 'GPT-4.1 Mini', value: 'gpt-4.1-mini' },
+      { name: 'GPT-4.1 Nano', value: 'gpt-4.1-nano' },
+      { name: 'GPT-4o', value: 'gpt-4o' },
+      { name: 'GPT-4o Mini', value: 'gpt-4o-mini' },
+      { name: 'o3', value: 'o3' },
+      { name: 'o3 Mini', value: 'o3-mini' },
+      { name: 'o4 Mini', value: 'o4-mini' },
+    ],
+    groq: [
+      { name: 'Llama 3.3 70B', value: 'llama-3.3-70b-versatile' },
+      { name: 'Llama 3.1 8B', value: 'llama-3.1-8b-instant' },
+      { name: 'Llama 3.1 70B', value: 'llama-3.1-70b-versatile' },
+      { name: 'Mixtral 8x7B', value: 'mixtral-8x7b-32768' },
+      { name: 'Gemma 2 9B', value: 'gemma2-9b-it' },
+    ],
+    gemini: [
+      { name: 'Gemini 2.5 Pro', value: 'gemini-2.5-pro' },
+      { name: 'Gemini 2.5 Flash', value: 'gemini-2.5-flash' },
+      { name: 'Gemini 2.0 Flash', value: 'gemini-2.0-flash' },
+      { name: 'Gemini 1.5 Pro', value: 'gemini-1.5-pro' },
+      { name: 'Gemini 1.5 Flash', value: 'gemini-1.5-flash' },
+    ],
+  };
+
   let aiApiKey = null;
+  let aiModel = null;
   let naturecoApiKey = null;
 
-  // NatureCo dışı sağlayıcı seçildiyse key sor
+  // NatureCo dışı sağlayıcı seçildiyse key ve model sor
   if (aiProvider !== 'natureco') {
     const providerInfo = {
       openai: { name: 'OpenAI', prefix: 'sk-', example: 'sk-...' },
@@ -97,6 +141,19 @@ async function setup() {
 
     aiApiKey = customApiKey.trim();
 
+    // Model seçimi
+    process.stdin.resume();
+    const { selectedModel } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'selectedModel',
+        message: 'Model seçin:',
+        choices: MODELS[aiProvider],
+      },
+    ]);
+
+    aiModel = selectedModel;
+
     // NatureCo API key de sor (opsiyonel)
     process.stdin.resume();
     const { wantNaturecoKey } = await inquirer.prompt([
@@ -613,6 +670,7 @@ async function setup() {
   if (aiProvider !== 'natureco') {
     config.aiProvider = aiProvider;
     config.aiApiKey = aiApiKey;
+    config.aiModel = aiModel;
   }
 
   if (naturecoApiKey) {

package/src/commands/whatsapp.js

@@ -1,10 +1,34 @@
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const qrcode = require('qrcode-terminal');
-const EventSource = require('eventsource');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const pino = require('pino');
 const { getApiKey, getConfig, saveConfig } = require('../utils/config');
 const { getBots } = require('../utils/api');
 
+// Baileys imports
+let makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, Browsers;
+
+// Logger
+const logger = pino({ level: 'silent' });
+
+// Lazy load Baileys (only when needed)
+function loadBaileys() {
+  if (!makeWASocket) {
+    const baileys = require('@whiskeysockets/baileys');
+    makeWASocket = baileys.default;
+    useMultiFileAuthState = baileys.useMultiFileAuthState;
+    DisconnectReason = baileys.DisconnectReason;
+    fetchLatestBaileysVersion = baileys.fetchLatestBaileysVersion;
+    Browsers = baileys.Browsers;
+  }
+}
+
+// WhatsApp session directory
+const WHATSAPP_SESSION_DIR = path.join(os.homedir(), '.natureco', 'whatsapp-sessions');
+
 async function whatsapp(action) {
   if (!action || action === 'connect') {
     return connectWhatsApp();
@@ -61,110 +85,124 @@ async function connectWhatsApp() {
   
   const selectedBot = botList.bots.find(b => b.id === botId);
   
-  console.log(chalk.cyan('\n📱 WhatsApp bağlantısı QR kod ile yapılır.'));
+  console.log(chalk.cyan('\n📱 WhatsApp bağlantısı başlatılıyor...'));
   console.log(chalk.gray('Telefonunuzda WhatsApp\'ı açın ve QR kodu taratın.\n'));
-  console.log(chalk.yellow('⏳ Session oluşturuluyor...\n'));
   
+  // Load Baileys
+  loadBaileys();
+  
+  // Create session directory
+  const sessionDir = path.join(WHATSAPP_SESSION_DIR, botId);
+  if (!fs.existsSync(sessionDir)) {
+    fs.mkdirSync(sessionDir, { recursive: true });
+  }
+  
+  // Start connection
+  await startWhatsAppConnection(sessionDir, botId, selectedBot, config);
+}
+
+async function startWhatsAppConnection(sessionDir, botId, selectedBot, config) {
   try {
-    // Create WhatsApp session
-    const response = await fetch('http://localhost:3000/connect', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        bot_id: botId,
-      }),
-    });
-    
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(error);
-    }
-    
-    const data = await response.json();
-    
-    if (!data.session_id) {
-      throw new Error('No session ID returned');
-    }
+    // Create auth state
+    const { state, saveCreds } = await useMultiFileAuthState(sessionDir);
     
-    console.log(chalk.green('✅ Session oluşturuldu!\n'));
-    console.log(chalk.cyan('Session ID:'), chalk.white(data.session_id));
-    console.log(chalk.yellow('\n⏳ QR kod bekleniyor...\n'));
+    // Get latest Baileys version
+    const { version } = await fetchLatestBaileysVersion();
     
-    // Save session ID to config
-    config.whatsappSessionId = data.session_id;
-    config.whatsappConnected = true;
-    config.whatsappBotId = botId;
-    saveConfig(config);
+    console.log(chalk.yellow('⏳ WhatsApp client başlatılıyor...\n'));
     
-    // Connect to SSE endpoint for QR code
-    const sseUrl = `http://localhost:3000/qr/${data.session_id}`;
-    const eventSource = new EventSource(sseUrl);
+    // Create socket
+    const sock = makeWASocket({
+      version,
+      auth: state,
+      printQRInTerminal: false,
+      browser: Browsers.ubuntu('Chrome'),
+      logger: logger,
+    });
     
     let qrDisplayed = false;
+    let isConnected = false;
     
-    eventSource.onmessage = (event) => {
-      try {
-        const eventData = JSON.parse(event.data);
+    // Connection update handler
+    sock.ev.on('connection.update', async (update) => {
+      const { connection, lastDisconnect, qr } = update;
+      
+      if (qr && !qrDisplayed) {
+        console.log(chalk.green('✅ QR kod hazır!\n'));
+        
+        // Display QR code in terminal
+        qrcode.generate(qr, { small: true });
+        
+        console.log('');
+        console.log(chalk.gray('1. WhatsApp\'ı açın'));
+        console.log(chalk.gray('2. Ayarlar > Bağlı Cihazlar > Cihaz Bağla'));
+        console.log(chalk.gray('3. Bu QR kodu taratın\n'));
+        console.log(chalk.yellow('⏳ QR kod taranması bekleniyor...\n'));
+        
+        qrDisplayed = true;
+      }
+      
+      if (connection === 'close') {
+        const statusCode = lastDisconnect?.error?.output?.statusCode;
         
-        if (eventData.type === 'qr') {
-          if (!qrDisplayed) {
-            console.log(chalk.green('✅ QR kod hazır!\n'));
-            
-            // Display QR code in terminal using the text version
-            if (eventData.qrText) {
-              qrcode.generate(eventData.qrText, { small: true });
-            } else if (eventData.qr) {
-              // Fallback: try to extract from base64 data URL
-              console.log(chalk.yellow('QR kod alındı (base64 format)\n'));
-            }
-            
-            console.log('');
-            console.log(chalk.gray('1. WhatsApp\'ı açın'));
-            console.log(chalk.gray('2. Ayarlar > Bağlı Cihazlar > Cihaz Bağla'));
-            console.log(chalk.gray('3. Bu QR kodu taratın\n'));
-            console.log(chalk.yellow('⏳ QR kod taranması bekleniyor...\n'));
-            
-            qrDisplayed = true;
-          }
-        } else if (eventData.type === 'ready') {
-          console.log(chalk.green('✅ WhatsApp bağlandı!\n'));
-          console.log(chalk.cyan('Bot:'), chalk.white(selectedBot.name));
-          console.log(chalk.gray('Botunuz WhatsApp\'ta aktif.\n'));
-          eventSource.close();
+        if (statusCode === 515) {
+          // Normal — yeniden bağlan, logout değil
+          console.log(chalk.yellow('🔄 Yeniden bağlanıyor...'));
+          setTimeout(() => startWhatsAppConnection(sessionDir, botId, selectedBot, config), 1000);
+          return;
+        } else if (statusCode === 401) {
+          console.log(chalk.red('❌ Oturum sonlandı, tekrar bağlanın.'));
+          process.exit(1);
+        } else if (statusCode === DisconnectReason.loggedOut) {
+          console.log(chalk.red('\n❌ WhatsApp oturumu kapatıldı\n'));
           process.exit(0);
-        } else if (eventData.type === 'error') {
-          console.log(chalk.red(`\n❌ Hata: ${eventData.error}\n`));
-          eventSource.close();
+        } else if (!isConnected) {
+          console.log(chalk.red('\n❌ Bağlantı başarısız\n'));
+          console.log(chalk.gray(`Hata kodu: ${statusCode}\n`));
           process.exit(1);
-        } else if (eventData.type === 'disconnected') {
-          console.log(chalk.yellow(`\n⚠️  Bağlantı kesildi: ${eventData.reason}\n`));
-          eventSource.close();
+        } else {
+          console.log(chalk.red(`❌ Bağlantı kesildi: ${statusCode}\n`));
           process.exit(1);
         }
-      } catch (err) {
-        console.error(chalk.red('Event parse error:'), err.message);
+      } else if (connection === 'open') {
+        isConnected = true;
+        console.log(chalk.green('✅ WhatsApp bağlandı!\n'));
+        console.log(chalk.cyan('Bot:'), chalk.white(selectedBot.name));
+        console.log(chalk.cyan('Telefon:'), chalk.white(sock.user?.id || 'Unknown'));
+        console.log(chalk.gray('\nSession kaydedildi: ~/.natureco/whatsapp-sessions/'));
+        
+        // Save to config
+        config.whatsappConnected = true;
+        config.whatsappBotId = botId;
+        config.whatsappPhone = sock.user?.id;
+        saveConfig(config);
+        
+        console.log(chalk.green('\n✅ Kurulum tamamlandı!\n'));
+        console.log(chalk.gray('Botunuz WhatsApp\'ta aktif.\n'));
+        
+        // Keep process alive for a moment then exit
+        setTimeout(() => {
+          process.exit(0);
+        }, 2000);
       }
-    };
+    });
     
-    eventSource.onerror = (err) => {
-      console.log(chalk.red('\n❌ SSE connection error\n'));
-      console.log(chalk.gray('Make sure WhatsApp service is running on http://localhost:3000\n'));
-      eventSource.close();
-      process.exit(1);
-    };
+    // Save credentials on update
+    sock.ev.on('creds.update', saveCreds);
     
     // Handle Ctrl+C
     process.on('SIGINT', () => {
       console.log(chalk.yellow('\n\n⚠️  Bağlantı iptal edildi\n'));
-      eventSource.close();
       process.exit(0);
     });
     
   } catch (err) {
     console.log(chalk.red(`\n❌ Connection failed: ${err.message}\n`));
-    console.log(chalk.gray('Make sure WhatsApp service is running on http://localhost:3000\n'));
+    if (err.message.includes('Cannot find module')) {
+      console.log(chalk.yellow('⚠️  Baileys paketi yüklü değil. Yükleniyor...\n'));
+      console.log(chalk.gray('Lütfen şu komutu çalıştırın:\n'));
+      console.log(chalk.cyan('npm install -g @whiskeysockets/baileys pino\n'));
+    }
     process.exit(1);
   }
 }
@@ -193,39 +231,28 @@ async function disconnectWhatsApp() {
     return;
   }
   
-  const apiKey = getApiKey();
-  
-  if (apiKey && config.whatsappSessionId) {
-    try {
-      const response = await fetch('http://localhost:3000/disconnect', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          session_id: config.whatsappSessionId,
-        }),
-      });
-      
-      if (response.ok) {
-        console.log(chalk.green('\n✅ WhatsApp session disconnected from server\n'));
-      }
-    } catch (err) {
-      console.log(chalk.yellow(`\n⚠️  API disconnect failed: ${err.message}`));
+  try {
+    // Remove session directory
+    const sessionDir = path.join(WHATSAPP_SESSION_DIR, config.whatsappBotId);
+    if (fs.existsSync(sessionDir)) {
+      fs.rmSync(sessionDir, { recursive: true, force: true });
+      console.log(chalk.green('\n✅ Session dosyaları silindi\n'));
     }
+    
+    // Remove from config
+    delete config.whatsappConnected;
+    delete config.whatsappBotId;
+    delete config.whatsappPhone;
+    saveConfig(config);
+    
+    console.log(chalk.green('✅ WhatsApp disconnected\n'));
+    console.log(chalk.gray('Note: You may need to manually remove the device from WhatsApp settings.\n'));
+  } catch (err) {
+    console.log(chalk.red(`\n❌ Error: ${err.message}\n`));
   }
-  
-  // Remove from config
-  delete config.whatsappConnected;
-  delete config.whatsappBotId;
-  delete config.whatsappSessionId;
-  saveConfig(config);
-  
-  console.log(chalk.green('✅ WhatsApp disconnected locally\n'));
-  console.log(chalk.gray('Note: You may need to manually remove the device from WhatsApp settings.\n'));
 }
 
-async function statusWhatsApp() {
+function statusWhatsApp() {
   const config = getConfig();
   
   if (!config.whatsappConnected) {
@@ -234,54 +261,23 @@ async function statusWhatsApp() {
     return;
   }
   
-  const apiKey = getApiKey();
-  
-  // Try to get status from API if session ID exists
-  if (apiKey && config.whatsappSessionId) {
-    try {
-      console.log(chalk.yellow('\n⏳ Checking connection status...\n'));
-      
-      const response = await fetch(`http://localhost:3000/status/${config.whatsappSessionId}`, {
-        method: 'GET',
-      });
-      
-      if (response.ok) {
-        const data = await response.json();
-        
-        if (data.status === 'connected') {
-          console.log(chalk.green('✅ WhatsApp connected\n'));
-        } else if (data.status === 'pending') {
-          console.log(chalk.yellow('⏳ WhatsApp connection pending\n'));
-          console.log(chalk.gray('Waiting for QR code scan...\n'));
-        } else {
-          console.log(chalk.red('❌ WhatsApp disconnected\n'));
-        }
-        
-        console.log(chalk.cyan('Session ID:'), chalk.white(data.session_id));
-        console.log(chalk.cyan('Bot ID:'), chalk.white(data.bot_id));
-        console.log(chalk.cyan('Created:'), chalk.white(data.created_at));
-        
-        if (data.connected_at) {
-          console.log(chalk.cyan('Connected:'), chalk.white(data.connected_at));
-        }
-        
-        console.log('');
-        return;
-      }
-    } catch (err) {
-      console.log(chalk.yellow(`⚠️  Could not fetch status: ${err.message}\n`));
-    }
-  }
-  
-  // Fallback to local config
-  console.log(chalk.green('\n✅ WhatsApp connected (local)\n'));
+  console.log(chalk.green('\n✅ WhatsApp connected\n'));
   
   if (config.whatsappBotId) {
     console.log(chalk.cyan('Bot ID:'), chalk.white(config.whatsappBotId));
   }
   
-  if (config.whatsappSessionId) {
-    console.log(chalk.cyan('Session ID:'), chalk.white(config.whatsappSessionId));
+  if (config.whatsappPhone) {
+    console.log(chalk.cyan('Phone:'), chalk.white(config.whatsappPhone));
+  }
+  
+  // Check if session files exist
+  const sessionDir = path.join(WHATSAPP_SESSION_DIR, config.whatsappBotId);
+  if (fs.existsSync(sessionDir)) {
+    console.log(chalk.cyan('Session:'), chalk.white('Active'));
+    console.log(chalk.gray(`Location: ${sessionDir}`));
+  } else {
+    console.log(chalk.yellow('Session:'), chalk.gray('Not found (may need to reconnect)'));
   }
   
   console.log(chalk.gray('\nDisconnect with: natureco whatsapp disconnect\n'));

package/src/utils/api.js

@@ -45,6 +45,11 @@ async function sendMessage(apiKey, botId, message, conversationId = null, skillP
   if (config.aiProvider && config.aiApiKey) {
     body.custom_provider = config.aiProvider;
     body.custom_api_key = config.aiApiKey;
+    
+    // Model varsa ekle
+    if (config.aiModel) {
+      body.model = config.aiModel;
+    }
   }
 
   return request('/api/agent/chat', {