natureco-cli 2.23.29 → 2.23.31

package/src/commands/sms.js

@@ -6,59 +6,163 @@ async function sms(action) {
   if (!action || action === 'connect') return connectSms();
   if (action === 'disconnect') return disconnectSms();
   if (action === 'status') return statusSms();
+  if (action === 'probe') return probeSms();
   console.log(chalk.red('\n❌ Unknown action\n'));
-  console.log(chalk.gray('Available actions: connect, disconnect, status\n'));
+  console.log(chalk.gray('Available actions: connect, disconnect, status, probe\n'));
   process.exit(1);
 }
 
 async function connectSms() {
   const config = getConfig();
-  if (!config.providerUrl) { console.log(chalk.red('\n❌ Setup yapılmamış. Önce "natureco setup" çalıştırın.\n')); process.exit(1); }
+  if (!config.providerUrl) {
+    console.log(chalk.red('\n❌ Setup yapılmamış. Önce "natureco setup" çalıştırın.\n'));
+    process.exit(1);
+  }
   console.log(chalk.yellow('\n⏳ SMS (Twilio) bağlantısı hazırlanıyor...\n'));
-  console.log(chalk.gray('Twilio hesabı gereklidir: https://twilio.com'));
-  console.log(chalk.gray('Account SID ve Auth Token\'ı Twilio Console\'dan alın.\n'));
+  console.log(chalk.gray('Twilio hesabı gereklidir: https://twilio.com\n'));
+
+  const defaults = {
+    accountSid: config.smsAccountSid || '',
+    authToken: config.smsAuthToken || '',
+    fromNumber: config.smsFromNumber || '',
+    webhookUrl: config.smsPublicWebhookUrl || '',
+    dmPolicy: config.smsDmPolicy || 'allowlist',
+    messagingServiceSid: config.smsMessagingServiceSid || '',
+  };
+
   const answers = await inquirer.prompt([
-    { type: 'input', name: 'accountSid', message: 'Twilio Account SID:', validate: v => v.trim() ? true : 'Gerekli' },
-    { type: 'password', name: 'authToken', message: 'Twilio Auth Token:', validate: v => v.trim() ? true : 'Gerekli' },
-    { type: 'input', name: 'fromNumber', message: 'Twilio telefon numarası (E.164, örn: +15551234567):', validate: v => v.trim() ? true : 'Gerekli' },
-    { type: 'input', name: 'publicWebhookUrl', message: 'Webhook URL\'si (opsiyonel, ngrok vb.):' },
-    { type: 'list', name: 'dmPolicy', message: 'DM politikası:', choices: [{ name: 'Allowlist (önerilen)', value: 'allowlist' }, { name: 'Pairing', value: 'pairing' }, { name: 'Open', value: 'open' }, { name: 'Disabled', value: 'disabled' }], default: 'allowlist' },
+    { type: 'input', name: 'accountSid', message: 'Twilio Account SID:', default: defaults.accountSid ? defaults.accountSid.slice(0, 10) + '...' : '', validate: v => v.trim() ? true : 'Gerekli' },
+    { type: 'password', name: 'authToken', message: 'Twilio Auth Token:' },
+    { type: 'input', name: 'fromNumber', message: 'Gönderen numara (E.164, +15551234567):', default: defaults.fromNumber, validate: v => v.trim() || defaults.messagingServiceSid ? true : 'Numara veya Messaging Service SID gerekli' },
+    { type: 'input', name: 'messagingServiceSid', message: 'Messaging Service SID (opsiyonel):', default: defaults.messagingServiceSid },
+    { type: 'input', name: 'webhookUrl', message: 'Genel webhook URL (ngrok vb., opsiyonel):', default: defaults.webhookUrl },
+    { type: 'list', name: 'dmPolicy', message: 'DM politikası:', default: defaults.dmPolicy, choices: [
+      { name: 'Allowlist (önerilen) — spam koruması', value: 'allowlist' },
+      { name: 'Pairing — eşleşme kodu ile', value: 'pairing' },
+      { name: 'Open — herkese açık', value: 'open' },
+      { name: 'Disabled — devre dışı', value: 'disabled' },
+    ]},
+    { type: 'confirm', name: 'enableWebhook', message: 'Gelen SMS webhook\'u etkinleştirilsin mi?', default: config.smsEnableWebhook !== false },
   ]);
+
   const botId = `sms_${Date.now()}`;
   config.smsAccountSid = answers.accountSid.trim();
   config.smsAuthToken = answers.authToken.trim();
   config.smsFromNumber = answers.fromNumber.trim();
-  config.smsPublicWebhookUrl = answers.publicWebhookUrl.trim() || '';
+  config.smsMessagingServiceSid = answers.messagingServiceSid.trim() || '';
+  config.smsPublicWebhookUrl = answers.webhookUrl.trim() || '';
   config.smsDmPolicy = answers.dmPolicy;
+  config.smsEnableWebhook = answers.enableWebhook;
   config.smsBotId = botId;
   saveConfig(config);
+
   console.log(chalk.green('\n✅ SMS (Twilio) bağlantısı kaydedildi!\n'));
   console.log(chalk.cyan('Bot ID:'), chalk.white(botId));
   console.log(chalk.cyan('Account SID:'), chalk.white(answers.accountSid.slice(0, 20) + '...'));
-  console.log(chalk.cyan('Numara:'), chalk.white(answers.fromNumber.trim()));
-  console.log(chalk.gray('\nNot: SMS webhook\'u için Twilio Console\'da Webhook URL\'si ayarlayın.'));
-  console.log(chalk.gray('Gateway ile başlatmak için: natureco gateway start\n'));
+  console.log(chalk.cyan('Numara:'), chalk.white(answers.fromNumber || '(Messaging Service)'));
+  console.log(chalk.cyan('DM Politikası:'), chalk.white(answers.dmPolicy));
+
+  if (answers.enableWebhook) {
+    console.log(chalk.gray('\nTwilio Console\'da webhook URL\'si ayarlayın:'));
+    if (answers.webhookUrl) {
+      console.log(chalk.cyan(`  ${answers.webhookUrl}/webhooks/sms`));
+    } else {
+      console.log(chalk.gray('  (önce bir genel URL ayarlayın)'));
+    }
+  }
+  console.log(chalk.gray('\nGateway ile başlatmak için: natureco gateway start\n'));
 }
 
 async function disconnectSms() {
   const config = getConfig();
-  if (!config.smsBotId) { console.log(chalk.gray('\n⚠️  No SMS connection found\n')); return; }
-  const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'SMS bağlantısını kaldırmak istediğinize emin misiniz?', default: false }]);
-  if (!confirm) { console.log(chalk.gray('\nCancelled\n')); return; }
+  if (!config.smsBotId) {
+    console.log(chalk.gray('\n⚠️  No SMS connection found\n'));
+    return;
+  }
+  const { confirm } = await inquirer.prompt([
+    { type: 'confirm', name: 'confirm', message: 'SMS bağlantısını kaldırmak istediğinize emin misiniz?', default: false }
+  ]);
+  if (!confirm) {
+    console.log(chalk.gray('\nCancelled\n'));
+    return;
+  }
   delete config.smsAccountSid; delete config.smsAuthToken; delete config.smsFromNumber;
-  delete config.smsPublicWebhookUrl; delete config.smsDmPolicy; delete config.smsBotId;
+  delete config.smsMessagingServiceSid; delete config.smsPublicWebhookUrl;
+  delete config.smsDmPolicy; delete config.smsEnableWebhook; delete config.smsBotId;
   saveConfig(config);
   console.log(chalk.green('\n✅ SMS disconnected\n'));
 }
 
 function statusSms() {
   const config = getConfig();
-  if (!config.smsBotId) { console.log(chalk.gray('\n⚠️  SMS not connected\n')); console.log(chalk.gray('Connect with: natureco sms connect\n')); return; }
+  if (!config.smsBotId) {
+    console.log(chalk.gray('\n⚠️  SMS not connected\n'));
+    console.log(chalk.gray('Connect with: natureco sms connect\n'));
+    return;
+  }
   console.log(chalk.green('\n✅ SMS (Twilio) connected\n'));
   console.log(chalk.cyan('Bot ID:'), chalk.white(config.smsBotId));
   console.log(chalk.cyan('Account SID:'), chalk.white((config.smsAccountSid || '').slice(0, 20) + '...'));
-  console.log(chalk.cyan('Numara:'), chalk.white(config.smsFromNumber));
+  console.log(chalk.cyan('Numara:'), chalk.white(config.smsFromNumber || '(Messaging Service)'));
+  console.log(chalk.cyan('DM Politikası:'), chalk.white(config.smsDmPolicy || 'allowlist'));
+  console.log(chalk.cyan('Webhook:'), chalk.white(config.smsEnableWebhook !== false ? 'Aktif' : 'Devre Dışı'));
   console.log(chalk.gray('\nDisconnect with: natureco sms disconnect\n'));
 }
 
+async function probeSms() {
+  const config = getConfig();
+  if (!config.smsAccountSid || !config.smsAuthToken) {
+    console.log(chalk.red('\n❌ SMS bağlantısı yapılmamış\n'));
+    console.log(chalk.gray('Önce: natureco sms connect\n'));
+    process.exit(1);
+  }
+
+  const base64Auth = Buffer.from(`${config.smsAccountSid}:${config.smsAuthToken}`).toString('base64');
+  console.log(chalk.yellow('\n⏳ Twilio problanıyor...\n'));
+
+  try {
+    const res = await fetch('https://api.twilio.com/2010-04-01/Accounts/' + config.smsAccountSid + '.json', {
+      headers: { 'Authorization': `Basic ${base64Auth}` },
+      signal: AbortSignal.timeout(10000),
+    });
+
+    if (!res.ok) {
+      console.log(chalk.red(`✗ Twilio API Hatası: HTTP ${res.status}\n`));
+      if (res.status === 401) console.log(chalk.gray('  Account SID veya Auth Token hatalı.\n'));
+      process.exit(1);
+    }
+
+    const account = await res.json();
+    console.log(chalk.green('✓ Twilio API Bağlantısı Başarılı\n'));
+    console.log(chalk.cyan('Hesap Adı:'), chalk.white(account.friendly_name));
+    console.log(chalk.cyan('Status:'), chalk.white(account.status));
+    console.log(chalk.cyan('Type:'), chalk.white(account.type));
+
+    // Check balance
+    if (account.subresource_uris?.balance) {
+      try {
+        const balRes = await fetch('https://api.twilio.com' + account.subresource_uris.balance, {
+          headers: { 'Authorization': `Basic ${base64Auth}` },
+          signal: AbortSignal.timeout(5000),
+        });
+        if (balRes.ok) {
+          const balance = await balRes.json();
+          console.log(chalk.cyan('Bakiye:'), chalk.white(`${balance.balance} ${balance.currency}`));
+        }
+      } catch {}
+    }
+
+    // Check phone number
+    if (config.smsFromNumber) {
+      console.log(chalk.gray(`\nGönderen numara: ${config.smsFromNumber}`));
+    }
+
+    console.log('');
+
+  } catch (err) {
+    console.log(chalk.red(`\n✗ Probe hatası: ${err.message}\n`));
+    process.exit(1);
+  }
+}
+
 module.exports = sms;

package/src/commands/status.js

@@ -1,127 +1,101 @@
-const chalk = require('chalk');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const { getConfig } = require('../utils/config');
-const { getSkills } = require('../utils/skills');
-
-async function status() {
-  const config = getConfig();
-  const version = require('../../package.json').version;
-  const w = process.stdout.columns || 120;
-  const line = chalk.gray('─'.repeat(w));
-
-  // ── Header ────────────────────────────────────────────────────────────────
-  console.log('');
-  console.log(line);
-  const title = chalk.bold.cyan('  NatureCo CLI') + chalk.gray(' — Durum Raporu');
-  const ver = chalk.gray(`v${version}  `);
-  const pad = w - 16 - version.length - 3;
-  console.log(title + ' '.repeat(Math.max(1, pad)) + ver);
-  console.log(line);
-
-  // ── Provider & Bot ────────────────────────────────────────────────────────
-  const providerHost = config.providerUrl
-    ? config.providerUrl.replace('https://', '').split('/')[0]
-    : null;
-  const model = config.providerModel
-    ? config.providerModel.split('/').pop().split('-').slice(0, 3).join('-')
-    : 'bilinmiyor';
-
-  console.log('');
-  row('Provider ', providerHost ? chalk.white(providerHost) : chalk.yellow('yapılandırılmamış'),
-      'Bot      ', config.botName ? chalk.cyan(config.botName) : chalk.gray('—'), w);
-  row('Model    ', chalk.white(model),
-      'Kullanıcı', config.userName ? chalk.white(config.userName) : chalk.gray('—'), w);
-
-  // ── Servisler ─────────────────────────────────────────────────────────────
-  const pidFile = path.join(os.homedir(), '.natureco', 'gateway.pid');
-  const dashPid = path.join(os.homedir(), '.natureco', 'dashboard.pid');
-  const gatewayRunning = fs.existsSync(pidFile);
-  const dashRunning = fs.existsSync(dashPid);
-
-  row('Gateway  ', gatewayRunning ? chalk.green('● çalışıyor') : chalk.gray('○ durdurulmuş'),
-      'Dashboard', dashRunning ? chalk.green('● localhost:3848') : chalk.gray('○ durdurulmuş'), w);
-
-  // ── Entegrasyonlar ────────────────────────────────────────────────────────
-  const tg  = config.telegramToken    ? chalk.green('● bağlı') : chalk.gray('○ —');
-  const wa  = config.whatsappConnected ? chalk.green('● bağlı') : chalk.gray('○ —');
-  const dc  = config.discordToken     ? chalk.green('● bağlı') : chalk.gray('○ —');
-  const sl  = config.slackToken       ? chalk.green('● bağlı') : chalk.gray('○ —');
-
-  console.log('');
-  console.log(chalk.gray('  ' + '─'.repeat(w - 2)));
-  console.log(chalk.gray('  Entegrasyonlar'));
-  console.log('');
-  row('Telegram ', tg,  'Discord  ', dc, w);
-  row('WhatsApp ', wa,  'Slack    ', sl, w);
-
-  // ── Kaynaklar ─────────────────────────────────────────────────────────────
-  const skills = getSkills();
-  const memDir = path.join(os.homedir(), '.natureco', 'memory');
-  const memFiles = fs.existsSync(memDir)
-    ? fs.readdirSync(memDir).filter(f => f.endsWith('.json')).length : 0;
-  const sessDir = path.join(os.homedir(), '.natureco', 'sessions');
-  let sessCount = 0;
-  if (fs.existsSync(sessDir)) {
-    sessCount = fs.readdirSync(sessDir).filter(f => f.endsWith('.json')).length;
-  }
-
-  console.log('');
-  console.log(chalk.gray('  ' + '─'.repeat(w - 2)));
-  console.log(chalk.gray('  Kaynaklar'));
-  console.log('');
-  row('Skills   ', chalk.white(`${skills.length} yüklü`),
-      'Hafıza   ', chalk.white(`${memFiles} bot`), w);
-  row('Sessions ', chalk.white(`${sessCount} kayıtlı`),
-      'Versiyon ', chalk.white(`v${version}`), w);
-
-  // ── Son Loglar ────────────────────────────────────────────────────────────
-  const logFile = path.join(os.homedir(), '.natureco', 'gateway.log');
-  if (fs.existsSync(logFile)) {
-    const lines = fs.readFileSync(logFile, 'utf-8').split('\n').filter(l => l.trim());
-    const last = lines.slice(-3);
-    if (last.length > 0) {
-      console.log('');
-      console.log(chalk.gray('  ' + '─'.repeat(w - 2)));
-      console.log(chalk.gray('  Son Aktivite'));
-      console.log('');
-      last.forEach(l => {
-        const trimmed = l.slice(0, w - 4);
-        console.log(chalk.gray('  ') + chalk.gray(trimmed));
-      });
-    }
-  }
-
-  // ── Footer ────────────────────────────────────────────────────────────────
-  console.log('');
-  console.log(line);
-  console.log(
-    chalk.gray('  natureco doctor') +
-    chalk.gray('  ·  ') +
-    chalk.gray('natureco chat') +
-    chalk.gray('  ·  ') +
-    chalk.gray('natureco code') +
-    chalk.gray('  ·  ') +
-    chalk.gray('natureco channels status')
-  );
-  console.log(line);
-  console.log('');
-}
-
-// ── İki kolon satır yardımcısı ─────────────────────────────────────────────
-function row(label1, val1, label2, val2, w) {
-  const col = Math.floor(w / 2);
-  const left = chalk.gray('  ' + label1) + val1;
-  const right = chalk.gray(label2) + val2;
-  // ANSI kodlarını sayma — sabit padding kullan
-  const leftPlain = ('  ' + label1).length + stripAnsi(String(val1)).length;
-  const pad = Math.max(1, col - leftPlain);
-  console.log(left + ' '.repeat(pad) + right);
-}
-
-function stripAnsi(str) {
-  return str.replace(/\x1B\[[0-9;]*m/g, '');
-}
-
-module.exports = status;
+const chalk = require('chalk');
+const F = require('../utils/format');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+function tryRequire(mod) {
+  try { return require(mod); }
+  catch { return null; }
+}
+
+function status(args) {
+  const [action, ...params] = args || [];
+
+  if (!action || action === 'run') return cmdRun();
+  if (action === 'simple') return cmdSimple();
+  if (action === 'usage') return cmdUsage();
+
+  F.error(`Unknown status action: ${action}`);
+  F.meta('Usage: natureco status <action>');
+  F.meta('Actions: run, simple, usage');
+  process.exit(1);
+}
+
+function cmdRun() {
+  let version = '—';
+  try { version = require('../../package.json').version; } catch {}
+
+  const config = tryRequire('../utils/config');
+  const cfg = config ? config.getConfig() : {};
+
+  F.header('System Status');
+  F.kv('Version', version);
+  F.kv('Platform', `${process.platform} ${os.release()}`);
+
+  const pidFile = path.join(os.homedir(), '.natureco', 'gateway.pid');
+  const gatewayRunning = fs.existsSync(pidFile);
+  F.dot(gatewayRunning, 'Gateway');
+
+  if (cfg.providerUrl) {
+    F.kv('Provider', cfg.providerUrl);
+  }
+  if (cfg.botName) {
+    F.kv('Bot', cfg.botName);
+  }
+
+  const nodesFile = path.join(os.homedir(), '.natureco', 'nodes.json');
+  let nodeCount = 0;
+  if (fs.existsSync(nodesFile)) {
+    try { nodeCount = Object.keys(JSON.parse(fs.readFileSync(nodesFile, 'utf8'))).length; } catch {}
+  }
+  F.kv('Nodes', String(nodeCount));
+
+  const channels = cfg.channels || cfg.telegramToken || cfg.whatsappConnected || cfg.discordToken || cfg.slackToken;
+  const channelCount = [cfg.telegramToken, cfg.whatsappConnected, cfg.discordToken, cfg.slackToken].filter(Boolean).length;
+  F.kv('Channels', String(channelCount));
+  F.divider();
+}
+
+function cmdSimple() {
+  let version = '—';
+  try { version = require('../../package.json').version; } catch {}
+
+  const config = tryRequire('../utils/config');
+  const cfg = config ? config.getConfig() : {};
+  const pidFile = path.join(os.homedir(), '.natureco', 'gateway.pid');
+  const gatewayRunning = fs.existsSync(pidFile);
+
+  F.dot(gatewayRunning, 'Gateway');
+
+  const parts = [chalk.gray(`v${version}`)];
+  if (cfg.providerUrl) {
+    const host = cfg.providerUrl.replace('https://', '').split('/')[0];
+    parts.push(chalk.white(host));
+  }
+
+  console.log(chalk.cyan.bold('  NatureCo ') + parts.join(chalk.gray(' · ')));
+}
+
+function cmdUsage() {
+  const config = tryRequire('../utils/config');
+  const cfg = config ? config.getConfig() : {};
+
+  F.header('Provider Usage');
+
+  if (cfg.providerUrl) {
+    const rows = [
+      ['Provider', cfg.providerUrl],
+      ['Model', cfg.providerModel || '—'],
+    ];
+    const usage = cfg.usage || {};
+    rows.push(['Tokens', String(usage.totalTokens || '—')]);
+    rows.push(['Requests', String(usage.totalRequests || '—')]);
+    rows.push(['Session', String(usage.sessionTokens || '—')]);
+    F.table(['Key', 'Value'], rows);
+  } else {
+    F.info('No provider configured.');
+  }
+}
+
+module.exports = status;

package/src/commands/system.js

@@ -0,0 +1,53 @@
+const chalk = require('chalk');
+const os = require('os');
+
+function system(args) {
+  const [action, ...params] = args || [];
+
+  if (!action || action === 'status') return systemStatus();
+  if (action === 'events' || action === 'heartbeat') return systemHeartbeat();
+  if (action === 'presence') return systemPresence();
+
+  console.log(chalk.red(`\n  ❌ Bilinmeyen komut: ${action}\n`));
+  console.log(chalk.gray('  Kullanım: natureco system [status|events|presence]\n'));
+  process.exit(1);
+}
+
+function systemStatus() {
+  const mem = process.memoryUsage();
+  const uptime = process.uptime();
+  const days = Math.floor(uptime / 86400);
+  const hours = Math.floor((uptime % 86400) / 3600);
+  const mins = Math.floor((uptime % 3600) / 60);
+
+  console.log(chalk.cyan('\n  💻 System\n'));
+  console.log(chalk.gray('  ' + '─'.repeat(48)));
+  console.log(`  ${chalk.white('Host:')}       ${os.hostname()}`);
+  console.log(`  ${chalk.white('Platform:')}   ${process.platform} ${os.release()}`);
+  console.log(`  ${chalk.white('Uptime:')}     ${days}d ${hours}h ${mins}m`);
+  console.log(`  ${chalk.white('Node:')}       ${process.version}`);
+  console.log(`  ${chalk.white('Memory:')}     ${Math.round(mem.heapUsed / 1024 / 1024)}MB / ${Math.round(mem.heapTotal / 1024 / 1024)}MB`);
+  console.log(`  ${chalk.white('CPU:')}        ${os.cpus()[0]?.model || 'unknown'}`);
+  console.log(`  ${chalk.white('Load:')}       ${os.loadavg().map(l => l.toFixed(2)).join(', ')}`);
+  console.log(`  ${chalk.white('PID:')}        ${process.pid}`);
+  console.log();
+}
+
+function systemHeartbeat() {
+  console.log(chalk.cyan(`\n  💓 Heartbeat: ${new Date().toISOString()}\n`));
+  console.log(chalk.gray(`  PID: ${process.pid}`));
+  console.log(chalk.gray(`  Memory: ${Math.round(process.memoryUsage().heapUsed / 1024 / 1024)}MB`));
+  console.log(chalk.gray(`  Status: ${chalk.green('alive')}\n`));
+}
+
+function systemPresence() {
+  console.log(chalk.cyan('\n  🟢 Presence\n'));
+  console.log(chalk.gray('  ' + '─'.repeat(48)));
+  console.log(`  ${chalk.white('Status:')}   ${chalk.green('online')}`);
+  console.log(`  ${chalk.white('Since:')}    ${new Date(Date.now() - process.uptime() * 1000).toISOString()}`);
+  console.log(`  ${chalk.white('Host:')}     ${os.hostname()}`);
+  console.log(`  ${chalk.white('Version:')} NatureCo CLI`);
+  console.log();
+}
+
+module.exports = system;