natureco-cli 2.17.10 → 2.18.0

package/bin/natureco.js

@@ -53,6 +53,14 @@ program
     chat(botName, options);
   });
 
+program
+  .command('code [file]')
+  .description('Agentic coding modu — dosya oku, değiştir, komut çalıştır')
+  .action((file) => {
+    const codeCmd = require('../src/commands/code');
+    codeCmd(file);
+  });
+
 program
   .command('init')
   .description('Initialize NatureCo project in current directory')

package/package.json

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

package/src/commands/chat.js

@@ -13,7 +13,7 @@ const { getMemoryPrompt, extractMemoryFromMessage, loadMemory, clearMemory, addM
 const { getCommands, getCommandContent } = require('../utils/commands');
 const { runHooks } = require('../utils/hooks');
 const { createSession, loadSession, getLatestSession, addMessageToSession } = require('../utils/sessions');
-const { getToolDefinitions, executeToolCalls } = require('../utils/tool-runner');
+const { getToolDefinitions, executeToolCalls, getSessionStats, resetSessionStats } = require('../utils/tool-runner');
 const { extractToolCalls } = require('../utils/tool-adapter');
 
 // ── ASCII Logo ────────────────────────────────────────────────────────────────
@@ -127,6 +127,8 @@ async function chat(botName, options = {}) {
   }
 
   let conversationId = null;
+  let messagesCount = 0;
+  resetSessionStats();
 
   // ── What's New kontrolü ─────────────────────────────────────────────────────
   const lastVersionFile = path.join(os.homedir(), '.natureco', 'lastVersion');
@@ -138,22 +140,22 @@ async function chat(botName, options = {}) {
   console.clear();
   console.log(centerText(ASCII_LOGO.map((line, i) => i < 5 ? chalk.green(line) : chalk.gray(line)).join('\n')));
   console.log();
-  console.log(centerText(chalk.cyan(`(\\_/)  `) + chalk.white(`Hoş geldin, ${userName}`) + chalk.gray('  ·  ') + chalk.cyan(`${displayBotName} hazır`) + chalk.gray(`  ·  v${version}`)));
-  console.log(sep());
+  console.log(centerText(chalk.cyan(`(\\_/)  Hoş geldin, ${userName}  ·  ${displayBotName} hazır  ·  v${version}`)));
+  console.log(chalk.gray('─'.repeat(process.stdout.columns || 120)));
   console.log();
 
   // ── What's New ──────────────────────────────────────────────────────────────
   if (isNewVersion) {
-    console.log(chalk.yellow(`── v${version} yenilikleri ──`));
-    CHANGELOG.forEach(c => console.log(chalk.gray(`  · ${c}`)));
+    console.log(centerText(chalk.yellow(`── v${version} yenilikleri ──`)));
+    CHANGELOG.forEach(c => console.log(centerText(chalk.gray(`· ${c}`))));
     console.log();
     try { fs.writeFileSync(lastVersionFile, version); } catch {}
   } else {
     // Yeni versiyon yoksa günlük tip göster
     const dayIndex = Math.floor(Date.now() / (1000 * 60 * 60 * 24)) % TIPS.length;
-    console.log(sep());
-    console.log('  ' + chalk.yellow(TIPS[dayIndex]));
-    console.log(sep());
+    console.log(chalk.gray('─'.repeat(process.stdout.columns || 120)));
+    console.log(centerText(chalk.yellow(TIPS[dayIndex])));
+    console.log(chalk.gray('─'.repeat(process.stdout.columns || 120)));
     console.log();
   }
 
@@ -167,8 +169,8 @@ async function chat(botName, options = {}) {
     });
   }
 
-  console.log(chalk.gray(`  ${shortModel}  ·  /help için yardım  ·  Ctrl+C çıkış`));
-  console.log(sep());
+  console.log(centerText(chalk.gray(`${shortModel}  ·  /help için yardım  ·  Ctrl+C çıkış`)));
+  console.log(chalk.gray('─'.repeat(process.stdout.columns || 120)));
   console.log();
 
   // ── Yükleme animasyonu ──────────────────────────────────────────────────────
@@ -299,6 +301,7 @@ async function chat(botName, options = {}) {
     // Normal mesaj
     userMessage = await runHooks('pre-message', userMessage, { botId: bot.id, botName: bot.name });
     console.log(chalk.white('You  ') + userMessage);
+    messagesCount++;
 
     startLoading();
 
@@ -350,7 +353,15 @@ async function chat(botName, options = {}) {
   process.on('SIGINT', async () => {
     await runHooks('on-exit', null, { botId: bot.id, botName: bot.name });
     rl.close();
-    console.log(chalk.gray('\n👋 Goodbye!\n'));
+    const { filesChanged, commandsRun } = getSessionStats();
+    if (filesChanged > 0 || commandsRun > 0 || messagesCount > 0) {
+      console.log(chalk.gray('\n─── Session Özeti ───'));
+      if (filesChanged > 0) console.log(chalk.green(`  ✓ ${filesChanged} dosya değiştirildi`));
+      if (commandsRun > 0) console.log(chalk.green(`  ✓ ${commandsRun} komut çalıştırıldı`));
+      console.log(chalk.cyan(`  ✓ ${messagesCount} mesaj gönderildi`));
+      console.log();
+    }
+    console.log(chalk.gray('👋 Goodbye!\n'));
     process.exit(0);
   });
 

package/src/commands/code.js

@@ -0,0 +1,236 @@
+const path = require('path');
+const os = require('os');
+const fs = require('fs');
+const readline = require('readline');
+const inquirer = require('inquirer');
+const chalk = require('chalk');
+const { getApiKey, getConfig } = require('../utils/config');
+const { getBots, _sendMessage } = require('../utils/api');
+const { getMemoryPrompt, loadMemory } = require('../utils/memory');
+const { getAgentsPrompt } = require('../utils/agents');
+const { createSession, addMessageToSession } = require('../utils/sessions');
+const { addToHistory } = require('../utils/history');
+const { getToolDefinitions, executeToolCalls, getSessionStats, resetSessionStats } = require('../utils/tool-runner');
+const { extractToolCalls } = require('../utils/tool-adapter');
+
+const sep = () => chalk.gray('─'.repeat(process.stdout.columns || 120));
+
+function centerText(text) {
+  const width = process.stdout.columns || 120;
+  return text.split('\n').map(line => {
+    const padding = Math.max(0, Math.floor((width - line.length) / 2));
+    return ' '.repeat(padding) + line;
+  }).join('\n');
+}
+
+const CODE_SYSTEM_PROMPT = `Sen bir AI coding asistanısın. Kullanıcının projesinde dosyaları oku, değiştir, komut çalıştır.
+Her adımı açıkça belirt. Değişiklik yapmadan önce plan sun.
+Türkçe konuş.
+Mevcut çalışma dizini: ${process.cwd()}`;
+
+async function code(targetFile, options = {}) {
+  const apiKey = getApiKey();
+  const config = getConfig();
+  const version = require('../../package.json').version;
+
+  // ── Bot seçimi ──────────────────────────────────────────────────────────────
+  let botList;
+  try {
+    botList = await (require('../utils/api').getBots)(apiKey || config.providerApiKey || '');
+  } catch (err) {
+    console.log(chalk.red(`\n❌ Error: ${err.message}\n`));
+    process.exit(1);
+  }
+
+  if (!botList?.bots?.length) {
+    console.log(chalk.gray('No bots found. Create one at https://developers.natureco.me\n'));
+    process.exit(1);
+  }
+
+  let bot;
+  if (config.botName) {
+    bot = botList.bots.find(b => b.name && b.name.toLowerCase() === config.botName.toLowerCase());
+  }
+  if (!bot) {
+    process.stdin.resume();
+    const { selectedBot } = await inquirer.prompt([{
+      type: 'list',
+      name: 'selectedBot',
+      message: 'Bot seçin:',
+      choices: botList.bots.map(b => ({ name: b.name, value: b.id })),
+    }]);
+    bot = botList.bots.find(b => b.id === selectedBot);
+  }
+
+  const mem = loadMemory(bot.id);
+  const displayBotName = mem.botName || bot.name || 'NatureCo';
+  const userName = mem.name || config.userName || 'User';
+  const providerModel = config.providerModel || 'unknown';
+  const shortModel = providerModel.split('/').pop().split('-').slice(0, 3).join('-');
+
+  const agentsPrompt = getAgentsPrompt();
+  const memoryPrompt = getMemoryPrompt(bot.id);
+
+  let systemPrompt = CODE_SYSTEM_PROMPT;
+  if (agentsPrompt) systemPrompt += `\n\n## Project Instructions\n${agentsPrompt}`;
+  if (memoryPrompt) systemPrompt += '\n\n' + memoryPrompt;
+
+  // Hedef dosya varsa context'e ekle
+  if (targetFile) {
+    try {
+      const content = fs.readFileSync(path.resolve(targetFile), 'utf-8');
+      systemPrompt += `\n\n## Odak Dosyası: ${targetFile}\n\`\`\`\n${content}\n\`\`\``;
+    } catch {
+      console.log(chalk.yellow(`  ⚠️  ${targetFile} okunamadı, devam ediliyor...\n`));
+    }
+  }
+
+  const session = createSession(bot.id, bot.name);
+  let conversationId = null;
+  let messagesCount = 0;
+  resetSessionStats();
+
+  // ── Header ──────────────────────────────────────────────────────────────────
+  console.clear();
+  console.log(centerText(chalk.green('⚡ NatureCo Code') + chalk.gray('  ·  ') + chalk.cyan(`${displayBotName}`) + chalk.gray(`  ·  v${version}`)));
+  console.log(sep());
+  if (targetFile) {
+    console.log(centerText(chalk.gray(`📄 ${targetFile}`)));
+    console.log(sep());
+  }
+  console.log(centerText(chalk.gray(`${shortModel}  ·  /help için yardım  ·  Ctrl+C çıkış`)));
+  console.log(sep());
+  console.log();
+
+  // ── Yükleme animasyonu ──────────────────────────────────────────────────────
+  const loadingFrames = ['●○○', '○●○', '○○●'];
+  let loadingFrame = 0;
+  let loadingTimer = null;
+
+  function startLoading() {
+    loadingFrame = 0;
+    process.stdout.write(chalk.gray('  ' + loadingFrames[0]));
+    loadingTimer = setInterval(() => {
+      process.stdout.write('\r' + chalk.gray('  ' + loadingFrames[loadingFrame]));
+      loadingFrame = (loadingFrame + 1) % loadingFrames.length;
+    }, 300);
+  }
+
+  function stopLoading() {
+    if (loadingTimer) { clearInterval(loadingTimer); loadingTimer = null; }
+    process.stdout.write('\r\x1b[2K');
+  }
+
+  // ── Session özeti ─────────────────────────────────────────────────────────
+  async function showSummary() {
+    const { filesChanged, commandsRun } = getSessionStats();
+    console.log(chalk.gray('\n─── Session Özeti ───'));
+    console.log(chalk.green(`  ✓ ${filesChanged} dosya değiştirildi`));
+    console.log(chalk.green(`  ✓ ${commandsRun} komut çalıştırıldı`));
+    console.log(chalk.cyan(`  ✓ ${messagesCount} mesaj gönderildi`));
+    console.log();
+  }
+
+  // ── Mesaj gönderme ──────────────────────────────────────────────────────────
+  async function handleMessage(userMessage) {
+    userMessage = userMessage.trim();
+    if (!userMessage) return;
+
+    if (userMessage.startsWith('/')) {
+      const [cmd] = userMessage.slice(1).split(' ');
+      switch (cmd.toLowerCase()) {
+        case 'help':
+          console.log(chalk.yellow('Code Komutları:'));
+          [
+            ['/clear', 'Ekranı temizle'],
+            ['/summary', 'Session özetini göster'],
+            ['/help', 'Bu yardım'],
+          ].forEach(([c, d]) => console.log('  ' + chalk.cyan(c.padEnd(16)) + chalk.gray(d)));
+          console.log(chalk.gray('  Ctrl+C'.padEnd(18) + 'Çıkış'));
+          console.log();
+          return;
+        case 'clear':
+          console.clear();
+          return;
+        case 'summary':
+          await showSummary();
+          return;
+        default:
+          console.log(chalk.red(`Bilinmeyen komut: /${cmd}`));
+          console.log();
+          return;
+      }
+    }
+
+    if (userMessage === 'exit' || userMessage === 'quit') {
+      await showSummary();
+      process.exit(0);
+    }
+
+    messagesCount++;
+    console.log(chalk.white('You  ') + userMessage);
+    startLoading();
+
+    try {
+      const toolDefinitions = getToolDefinitions();
+      let response = await _sendMessage(apiKey || config.providerApiKey, bot.id, userMessage, conversationId, systemPrompt, toolDefinitions);
+      stopLoading();
+
+      if (response.conversation_id) conversationId = response.conversation_id;
+
+      // Tool loop — agentMode: true ile onay + spinner
+      let iter = 0;
+      while (iter < 10) {
+        const toolCalls = extractToolCalls(response);
+        if (!toolCalls?.length) break;
+        console.log(chalk.yellow(`\n🔧 ${toolCalls.length} tool çalıştırılıyor...\n`));
+        const toolResults = await executeToolCalls(toolCalls, { agentMode: true });
+        const toolMsg = toolResults.map(tr =>
+          `Tool: ${tr.name}\nResult: ${tr.result.success ? (tr.result.output || JSON.stringify(tr.result)) : tr.result.error}`
+        ).join('\n\n');
+        startLoading();
+        response = await _sendMessage(apiKey || config.providerApiKey, bot.id, toolMsg, conversationId, systemPrompt, toolDefinitions);
+        stopLoading();
+        if (response.conversation_id) conversationId = response.conversation_id;
+        iter++;
+      }
+
+      const botReply = response.reply || response.message || 'No response';
+      console.log(chalk.cyan(`${displayBotName}  `) + botReply);
+      console.log();
+
+      addToHistory(bot.id, userMessage, botReply, conversationId);
+      addMessageToSession(bot.id, session.id, userMessage, botReply);
+
+    } catch (err) {
+      stopLoading();
+      const errMsg = err.message.split('"message":"')[1]?.split('"')[0] || err.message;
+      console.log(chalk.red(`Error: ${errMsg}`));
+      console.log();
+    }
+  }
+
+  // ── Input loop ───────────────────────────────────────────────────────────────
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
+
+  process.on('SIGINT', async () => {
+    rl.close();
+    await showSummary();
+    console.log(chalk.gray('👋 Goodbye!\n'));
+    process.exit(0);
+  });
+
+  rl.on('close', () => process.exit(0));
+
+  async function promptLoop() {
+    rl.question('', async (msg) => {
+      process.stdout.write('\x1b[1A\x1b[2K');
+      await handleMessage(msg);
+      promptLoop();
+    });
+  }
+
+  promptLoop();
+}
+
+module.exports = code;

package/src/utils/tool-runner.js

@@ -1,37 +1,78 @@
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
+const inquirer = require('inquirer');
 
-/**
- * Tool Runner - Execute tools locally
- */
+// ── Spinner ───────────────────────────────────────────────────────────────────
+const SPINNER_FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
 
-// Load all tools from src/tools/
+function startSpinner(label) {
+  let i = 0;
+  const timer = setInterval(() => {
+    process.stdout.write(`\r${chalk.cyan(SPINNER_FRAMES[i++ % SPINNER_FRAMES.length])} ${chalk.gray(label)}`);
+  }, 80);
+  return timer;
+}
+
+function stopSpinner(timer, label, success = true) {
+  clearInterval(timer);
+  if (success) {
+    process.stdout.write(`\r${chalk.green('✓')} ${chalk.gray(label)}\n`);
+  } else {
+    process.stdout.write(`\r${chalk.red('✗')} ${chalk.gray(label)}\n`);
+  }
+}
+
+// ── Diff view ─────────────────────────────────────────────────────────────────
+function showDiff(oldContent, newContent, filepath) {
+  const oldLines = (oldContent || '').split('\n');
+  const newLines = newContent.split('\n');
+  console.log(chalk.gray(`\n  📄 ${filepath}`));
+  newLines.forEach(line => {
+    if (line && !oldLines.includes(line)) {
+      console.log(chalk.green('  + ' + line));
+    }
+  });
+  oldLines.forEach(line => {
+    if (line && !newLines.includes(line)) {
+      console.log(chalk.red('  - ' + line));
+    }
+  });
+  console.log();
+}
+
+// ── Session stats (module-level counters) ─────────────────────────────────────
+let filesChanged = 0;
+let commandsRun = 0;
+
+function getSessionStats() {
+  return { filesChanged, commandsRun };
+}
+
+function resetSessionStats() {
+  filesChanged = 0;
+  commandsRun = 0;
+}
+
+// ── Load tools ────────────────────────────────────────────────────────────────
 function loadTools() {
   const toolsDir = path.join(__dirname, '..', 'tools');
   const tools = {};
-  
-  if (!fs.existsSync(toolsDir)) {
-    return tools;
-  }
-  
+
+  if (!fs.existsSync(toolsDir)) return tools;
+
   const files = fs.readdirSync(toolsDir).filter(f => f.endsWith('.js'));
-  
   for (const file of files) {
     try {
       const tool = require(path.join(toolsDir, file));
-      if (tool.name && tool.execute) {
-        tools[tool.name] = tool;
-      }
+      if (tool.name && tool.execute) tools[tool.name] = tool;
     } catch (err) {
       console.error(chalk.red(`Failed to load tool ${file}:`, err.message));
     }
   }
-  
   return tools;
 }
 
-// Get tool definitions for API
 function getToolDefinitions() {
   const tools = loadTools();
   return Object.values(tools).map(tool => ({
@@ -41,47 +82,74 @@ function getToolDefinitions() {
   }));
 }
 
-// Execute a single tool
-async function executeTool(toolName, params) {
+// ── Execute a single tool ─────────────────────────────────────────────────────
+async function executeTool(toolName, params, opts = {}) {
   const tools = loadTools();
   const tool = tools[toolName];
-  
+  const agentMode = opts.agentMode || false;
+
   if (!tool) {
-    return {
-      success: false,
-      error: `Tool '${toolName}' not found`
-    };
+    return { success: false, error: `Tool '${toolName}' not found` };
+  }
+
+  const label = `${toolName}${params.path ? ' — ' + params.path : params.command ? ' — ' + params.command : ''}`;
+
+  // ── Onay mekanizması (write_file ve tehlikeli bash) ───────────────────────
+  if (agentMode) {
+    const needsConfirm =
+      toolName === 'write_file' ||
+      (toolName === 'bash' && /\b(rm|mv|cp|chmod|chown|dd|mkfs|truncate)\b/.test(params.command || ''));
+
+    if (needsConfirm) {
+      if (toolName === 'write_file') {
+        // Diff göster
+        let oldContent = '';
+        try { oldContent = fs.readFileSync(path.resolve(params.path), 'utf-8'); } catch {}
+        showDiff(oldContent, params.content || '', params.path);
+      } else {
+        console.log(chalk.yellow(`\n  🖥️  Komut: ${chalk.white(params.command)}\n`));
+      }
+
+      const { confirm } = await inquirer.prompt([{
+        type: 'confirm',
+        name: 'confirm',
+        message: chalk.yellow(`  ${toolName === 'write_file' ? `✏️  ${params.path} dosyası değiştirilecek` : '⚠️  Bu komut çalıştırılacak'}. Onaylıyor musun?`),
+        default: true,
+      }]);
+
+      if (!confirm) {
+        console.log(chalk.gray('  İptal edildi.\n'));
+        return { success: false, error: 'Kullanıcı iptal etti.' };
+      }
+    }
   }
-  
-  console.log(chalk.blue(`\n🔧 Executing tool: ${toolName}`));
-  console.log(chalk.gray(`   Params: ${JSON.stringify(params)}`));
-  
+
+  // ── Spinner ile çalıştır ──────────────────────────────────────────────────
+  const spinner = startSpinner(label);
   try {
     const result = await tool.execute(params);
-    console.log(chalk.green(`   ✓ Success`));
+    stopSpinner(spinner, label, result.success !== false);
+
+    // İstatistik güncelle
+    if (result.success !== false) {
+      if (toolName === 'write_file') filesChanged++;
+      if (toolName === 'bash') commandsRun++;
+    }
+
     return result;
   } catch (error) {
-    console.log(chalk.red(`   ✗ Error: ${error.message}`));
-    return {
-      success: false,
-      error: error.message
-    };
+    stopSpinner(spinner, label, false);
+    return { success: false, error: error.message };
   }
 }
 
-// Execute multiple tool calls
-async function executeToolCalls(toolCalls) {
+// ── Execute multiple tool calls ───────────────────────────────────────────────
+async function executeToolCalls(toolCalls, opts = {}) {
   const results = [];
-  
   for (const call of toolCalls) {
-    const result = await executeTool(call.name, call.input);
-    results.push({
-      id: call.id,
-      name: call.name,
-      result
-    });
+    const result = await executeTool(call.name, call.input, opts);
+    results.push({ id: call.id, name: call.name, result });
   }
-  
   return results;
 }
 
@@ -89,5 +157,7 @@ module.exports = {
   loadTools,
   getToolDefinitions,
   executeTool,
-  executeToolCalls
+  executeToolCalls,
+  getSessionStats,
+  resetSessionStats,
 };