natureco-cli 2.18.1 → 2.19.0

package/package.json

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

package/src/commands/chat.js

@@ -312,11 +312,10 @@ async function chat(botName, options = {}) {
 
       if (response.conversation_id) conversationId = response.conversation_id;
 
-      // Tool loop — DEBUG: api.js zaten tool loop yapıyor, bu loop çalışmamalı
+      // Tool loop — api.js zaten tool loop yapıyor, bu loop çalışmamalı
       let iter = 0;
       while (iter < 5) {
         const toolCalls = extractToolCalls(response);
-        console.log('[DEBUG] Tool calls:', JSON.stringify(toolCalls));
         if (!toolCalls?.length) break;
         console.log(chalk.yellow(`🔧 ${toolCalls.length} tool çalıştırılıyor...`));
         const toolResults = await executeToolCalls(toolCalls);

package/src/commands/code.js

@@ -5,14 +5,14 @@ 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 { getBots, getProviderConfig, startMcpServers } = 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 { getToolDefinitions, executeTool } = require('../utils/tool-runner');
 
+// ── Helpers ───────────────────────────────────────────────────────────────────
 const sep = () => chalk.gray('─'.repeat(process.stdout.columns || 120));
 
 function centerText(text) {
@@ -23,11 +23,141 @@ function centerText(text) {
   }).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()}`;
+const SPINNER_FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
 
+function startSpinner(label) {
+  let i = 0;
+  return setInterval(() => {
+    process.stdout.write(`\r  ${chalk.cyan(SPINNER_FRAMES[i++ % SPINNER_FRAMES.length])} ${chalk.gray(label)}`);
+  }, 80);
+}
+
+function stopSpinner(timer, label, success = true) {
+  clearInterval(timer);
+  process.stdout.write(`\r  ${success ? chalk.green('✓') : chalk.red('✗')} ${chalk.cyan(label)}\n`);
+}
+
+// ── Streaming fetch ───────────────────────────────────────────────────────────
+async function streamMessage(providerConfig, messages, tools) {
+  const endpoint = `${providerConfig.url}/chat/completions`;
+  const body = {
+    model: providerConfig.model,
+    messages,
+    tools,
+    tool_choice: 'auto',
+    temperature: 0.7,
+    max_tokens: 4000,
+    stream: true,
+  };
+
+  const response = await fetch(endpoint, {
+    method: 'POST',
+    headers: {
+      'Authorization': `Bearer ${providerConfig.apiKey}`,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(body),
+  });
+
+  if (!response.ok) {
+    const err = await response.text();
+    throw new Error(`API error: ${response.status} — ${err}`);
+  }
+
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  let fullText = '';
+  let toolCallsBuffer = {};  // id -> { name, arguments }
+
+  process.stdout.write('\n');
+
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+
+    const chunk = decoder.decode(value);
+    const lines = chunk.split('\n').filter(l => l.startsWith('data: '));
+
+    for (const line of lines) {
+      const data = line.slice(6).trim();
+      if (data === '[DONE]') continue;
+      try {
+        const json = JSON.parse(data);
+        const delta = json.choices?.[0]?.delta;
+        if (!delta) continue;
+
+        // Text content
+        if (delta.content) {
+          process.stdout.write(delta.content);
+          fullText += delta.content;
+        }
+
+        // Tool call deltas
+        if (delta.tool_calls) {
+          for (const tc of delta.tool_calls) {
+            const idx = tc.index ?? 0;
+            if (!toolCallsBuffer[idx]) {
+              toolCallsBuffer[idx] = { id: tc.id || '', name: '', arguments: '' };
+            }
+            if (tc.id) toolCallsBuffer[idx].id = tc.id;
+            if (tc.function?.name) toolCallsBuffer[idx].name += tc.function.name;
+            if (tc.function?.arguments) toolCallsBuffer[idx].arguments += tc.function.arguments;
+          }
+        }
+      } catch {}
+    }
+  }
+
+  process.stdout.write('\n');
+
+  const toolCalls = Object.values(toolCallsBuffer)
+    .filter(tc => tc.name)
+    .map(tc => ({
+      id: tc.id,
+      name: tc.name,
+      input: (() => { try { return JSON.parse(tc.arguments); } catch { return {}; } })(),
+    }));
+
+  return { text: fullText, toolCalls };
+}
+
+// ── Tool execution with spinner + confirm ─────────────────────────────────────
+const DANGEROUS = ['rm ', 'rmdir', 'delete', 'DROP', 'truncate'];
+
+async function runToolCall(toolCall, stats) {
+  const inputPreview = JSON.stringify(toolCall.input).slice(0, 60);
+  const label = `${toolCall.name}  ${chalk.gray(inputPreview)}`;
+
+  const needsConfirm =
+    toolCall.name === 'write_file' ||
+    (toolCall.name === 'bash' && DANGEROUS.some(d => toolCall.input.command?.includes(d)));
+
+  if (needsConfirm) {
+    console.log(chalk.yellow(`\n  ⚠️  ${toolCall.name}: ${inputPreview}`));
+    const { ok } = await inquirer.prompt([{
+      type: 'confirm', name: 'ok',
+      message: '  Devam edilsin mi?', default: true,
+    }]);
+    if (!ok) {
+      console.log(chalk.gray('  İptal edildi.\n'));
+      return { success: false, output: 'Kullanıcı iptal etti.' };
+    }
+  }
+
+  const spinner = startSpinner(`${toolCall.name}  ${inputPreview}`);
+  const result = await executeTool(toolCall.name, toolCall.input);
+  stopSpinner(spinner, toolCall.name, result.success !== false);
+
+  if (result.success !== false) {
+    if (toolCall.name === 'write_file') stats.filesChanged++;
+    if (toolCall.name === 'bash') stats.commandsRun++;
+    stats.toolCallCount++;
+  }
+
+  return result;
+}
+
+// ── Main ──────────────────────────────────────────────────────────────────────
 async function code(targetFile, options = {}) {
   const apiKey = getApiKey();
   const config = getConfig();
@@ -36,27 +166,25 @@ async function code(targetFile, options = {}) {
   // ── Bot seçimi ──────────────────────────────────────────────────────────────
   let botList;
   try {
-    botList = await (require('../utils/api').getBots)(apiKey || config.providerApiKey || '');
+    botList = await 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'));
+    console.log(chalk.gray('No bots found.\n'));
     process.exit(1);
   }
 
   let bot;
   if (config.botName) {
-    bot = botList.bots.find(b => b.name && b.name.toLowerCase() === config.botName.toLowerCase());
+    bot = botList.bots.find(b => b.name?.toLowerCase() === config.botName.toLowerCase());
   }
   if (!bot) {
     process.stdin.resume();
     const { selectedBot } = await inquirer.prompt([{
-      type: 'list',
-      name: 'selectedBot',
-      message: 'Bot seçin:',
+      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);
@@ -65,13 +193,35 @@ async function code(targetFile, options = {}) {
   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 providerConfig = getProviderConfig();
 
+  if (!providerConfig) {
+    console.log(chalk.red('\n❌ Provider yapılandırılmamış. natureco config set providerUrl ...\n'));
+    process.exit(1);
+  }
+
+  const shortModel = providerConfig.model.split('/').pop().split('-').slice(0, 3).join('-');
+
+  // ── Proje context — dizini otomatik tara ────────────────────────────────────
+  let projectContext = '';
+  try {
+    const dirResult = await executeTool('list_dir', { path: process.cwd() });
+    if (dirResult.success !== false) {
+      projectContext = `\nMevcut proje dizini: ${process.cwd()}\nDosyalar:\n${(dirResult.output || '').slice(0, 800)}`;
+    }
+  } catch {}
+
+  // ── Sistem prompt ────────────────────────────────────────────────────────────
   const agentsPrompt = getAgentsPrompt();
   const memoryPrompt = getMemoryPrompt(bot.id);
 
-  let systemPrompt = CODE_SYSTEM_PROMPT;
+  let systemPrompt = `Sen NatureCo Code Agent'sın — güçlü bir AI coding asistanı.
+Kullanıcının projesinde gerçekten çalış: dosyaları oku, değiştir, komutları çalıştır.
+Her adımı Türkçe açıkla. Değişiklik yapmadan önce ne yapacağını söyle.
+Hataları yakala ve düzelt. İş bitince özet sun.
+Mevcut dizin: ${process.cwd()}
+Kullanıcı: ${userName}${projectContext}`;
+
   if (agentsPrompt) systemPrompt += `\n\n## Project Instructions\n${agentsPrompt}`;
   if (memoryPrompt) systemPrompt += '\n\n' + memoryPrompt;
 
@@ -79,144 +229,170 @@ async function code(targetFile, options = {}) {
   if (targetFile) {
     try {
       const content = fs.readFileSync(path.resolve(targetFile), 'utf-8');
-      systemPrompt += `\n\n## Odak Dosyası: ${targetFile}\n\`\`\`\n${content}\n\`\`\``;
+      systemPrompt += `\n\n## Odak Dosyası: ${targetFile}\n\`\`\`\n${content.slice(0, 2000)}\n\`\`\``;
     } catch {
-      console.log(chalk.yellow(`  ⚠️  ${targetFile} okunamadı, devam ediliyor...\n`));
+      console.log(chalk.yellow(`  ⚠️  ${targetFile} okunamadı\n`));
     }
   }
 
+  // ── Session ──────────────────────────────────────────────────────────────────
   const session = createSession(bot.id, bot.name);
-  let conversationId = null;
-  let messagesCount = 0;
-  resetSessionStats();
+  const conversationMessages = [{ role: 'system', content: systemPrompt }];
+  const stats = { filesChanged: 0, commandsRun: 0, toolCallCount: 0, messageCount: 0 };
+
+  // ── MCP sunucularını başlat ──────────────────────────────────────────────────
+  await startMcpServers().catch(() => {});
+
+  // ── Tool definitions ─────────────────────────────────────────────────────────
+  const localTools = getToolDefinitions();
+  const tools = localTools.map(t => ({
+    type: 'function',
+    function: {
+      name: t.name,
+      description: t.description,
+      parameters: t.inputSchema || { type: 'object', properties: {} },
+    },
+  }));
 
   // ── Header ──────────────────────────────────────────────────────────────────
   console.clear();
-  console.log(centerText(chalk.green('⚡ NatureCo Code') + chalk.gray('  ·  ') + chalk.cyan(`${displayBotName}`) + chalk.gray(`  ·  v${version}`)));
+  const codeLogo = [
+    '███╗   ██╗ █████╗ ████████╗██╗   ██╗██████╗ ███████╗ ██████╗  ██████╗',
+    '████╗  ██║██╔══██╗╚══██╔══╝██║   ██║██╔══██╗██╔════╝██╔════╝ ██╔═══██╗',
+    '██╔██╗ ██║███████║   ██║   ██║   ██║██████╔╝█████╗  ██║      ██║   ██║',
+    '██║╚██╗██║██╔══██║   ██║   ██║   ██║██╔══██╗██╔══╝  ██║      ██║   ██║',
+    '██║ ╚████║██║  ██║   ██║   ╚██████╔╝██║  ██║███████╗╚██████╗ ╚██████╔╝',
+    '╚═╝  ╚═══╝╚═╝  ╚═╝   ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚══════╝ ╚═════╝  ╚═════╝',
+    '',
+    '█▀▀ █▀█ █▀▄ █▀▀',
+    '█▄▄ █▄█ █▄▀ ██▄',
+  ].join('\n');
+  console.log(centerText(chalk.green(codeLogo)));
+  console.log();
+  console.log(centerText(chalk.cyan(`(\\_/)  ${displayBotName} hazır`) + 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ış`)));
+  if (targetFile) console.log(centerText(chalk.gray(`📄 ${targetFile}`)));
+  console.log(centerText(chalk.gray(`${shortModel}  ·  /help  ·  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();
+  function showSummary() {
+    console.log(chalk.gray('\n─── Agent Session Özeti ───'));
+    console.log(`  ${chalk.green('✓')} ${stats.filesChanged} dosya değiştirildi`);
+    console.log(`  ${chalk.green('✓')} ${stats.commandsRun} komut çalıştırıldı`);
+    console.log(`  ${chalk.green('✓')} ${stats.toolCallCount} tool çağrısı yapıldı`);
+    console.log(`  ${chalk.cyan('◉')} ${stats.messageCount} mesaj\n`);
   }
 
-  // ── Mesaj gönderme ──────────────────────────────────────────────────────────
+  // ── Mesaj gönder + tool loop ──────────────────────────────────────────────
   async function handleMessage(userMessage) {
     userMessage = userMessage.trim();
     if (!userMessage) return;
 
+    // Slash komutları
     if (userMessage.startsWith('/')) {
       const [cmd] = userMessage.slice(1).split(' ');
       switch (cmd.toLowerCase()) {
         case 'help':
-          console.log(chalk.yellow('Code Komutları:'));
+          console.log(chalk.yellow('Code Agent Komutları:'));
           [
-            ['/clear', 'Ekranı temizle'],
+            ['/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ış'));
+            ['/done',    'Bitir ve özet göster'],
+            ['/help',    'Bu yardım'],
+          ].forEach(([c, d]) => console.log('  ' + chalk.cyan(c.padEnd(12)) + chalk.gray(d)));
+          console.log(chalk.gray('  Ctrl+C'.padEnd(14) + 'Çıkış'));
           console.log();
           return;
         case 'clear':
           console.clear();
           return;
         case 'summary':
-          await showSummary();
+        case 'done':
+          showSummary();
+          if (cmd === 'done') process.exit(0);
           return;
         default:
-          console.log(chalk.red(`Bilinmeyen komut: /${cmd}`));
-          console.log();
+          console.log(chalk.red(`Bilinmeyen komut: /${cmd}\n`));
           return;
       }
     }
 
     if (userMessage === 'exit' || userMessage === 'quit') {
-      await showSummary();
+      showSummary();
       process.exit(0);
     }
 
-    messagesCount++;
+    stats.messageCount++;
     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 — DEBUG: api.js zaten tool loop yapıyor, bu loop çalışmamalı
-      let iter = 0;
-      while (iter < 10) {
-        const toolCalls = extractToolCalls(response);
-        console.log('[DEBUG] Tool calls:', JSON.stringify(toolCalls));
-        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++;
+    // Mesajı history'e ekle
+    conversationMessages.push({ role: 'user', content: userMessage });
+
+    // ── Streaming + tool loop (max 20 iter) ──────────────────────────────────
+    let iter = 0;
+    while (iter < 20) {
+      iter++;
+
+      let streamResult;
+      try {
+        process.stdout.write(chalk.cyan(`${displayBotName}  `));
+        streamResult = await streamMessage(providerConfig, conversationMessages, tools);
+      } catch (err) {
+        console.log(chalk.red(`\nError: ${err.message}\n`));
+        conversationMessages.pop(); // başarısız user mesajını geri al
+        return;
       }
 
-      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);
+      // Assistant mesajını history'e ekle
+      const assistantMsg = { role: 'assistant', content: streamResult.text || '' };
+      if (streamResult.toolCalls?.length) {
+        assistantMsg.tool_calls = streamResult.toolCalls.map(tc => ({
+          id: tc.id || `call_${Date.now()}_${Math.random().toString(36).slice(2)}`,
+          type: 'function',
+          function: { name: tc.name, arguments: JSON.stringify(tc.input) },
+        }));
+      }
+      conversationMessages.push(assistantMsg);
+
+      // Tool call yoksa bitti
+      if (!streamResult.toolCalls?.length) break;
+
+      // Tool call'ları çalıştır
+      console.log(chalk.yellow(`\n🔧 ${streamResult.toolCalls.length} tool çalıştırılıyor...\n`));
+
+      for (const toolCall of streamResult.toolCalls) {
+        const result = await runToolCall(toolCall, stats);
+        const resultStr = result.success !== false
+          ? (result.output || JSON.stringify(result))
+          : `Hata: ${result.error}`;
+
+        conversationMessages.push({
+          role: 'tool',
+          tool_call_id: assistantMsg.tool_calls?.find(tc => tc.function.name === toolCall.name)?.id || toolCall.id,
+          name: toolCall.name,
+          content: resultStr.slice(0, 3000),
+        });
+      }
 
-    } catch (err) {
-      stopLoading();
-      const errMsg = err.message.split('"message":"')[1]?.split('"')[0] || err.message;
-      console.log(chalk.red(`Error: ${errMsg}`));
       console.log();
     }
+
+    // Session'a kaydet
+    const lastAssistant = [...conversationMessages].reverse().find(m => m.role === 'assistant');
+    if (lastAssistant?.content) {
+      addToHistory(bot.id, userMessage, lastAssistant.content, null);
+      addMessageToSession(bot.id, session.id, userMessage, lastAssistant.content);
+    }
   }
 
   // ── Input loop ───────────────────────────────────────────────────────────────
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
 
-  process.on('SIGINT', async () => {
+  process.on('SIGINT', () => {
     rl.close();
-    await showSummary();
+    showSummary();
     console.log(chalk.gray('👋 Goodbye!\n'));
     process.exit(0);
   });

package/src/utils/api.js

@@ -4,6 +4,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const chalk = require('chalk');
 const { getConfig } = require('./config');
 const { getToolDefinitions, executeToolCalls } = require('./tool-runner');
 const { MCPClient } = require('./mcp-client');
@@ -428,8 +429,7 @@ function formatToolsForAnthropic() {
  */
 async function sendMessageOpenAICompatible(providerConfig, messages, tools) {
   const endpoint = `${providerConfig.url}/chat/completions`;
-  
-  // Log request size before sending
+
   const requestBody = {
     model: providerConfig.model,
     messages: messages,
@@ -438,8 +438,12 @@ async function sendMessageOpenAICompatible(providerConfig, messages, tools) {
     temperature: 0.7,
     max_tokens: 2000,
   };
-  
-  const bodyStr = JSON.stringify(requestBody);
+
+  // NatureCo backend proxy — tool call'ları Groq'a iletmek için explicitly set
+  if (providerConfig.url.includes('api.natureco.me')) {
+    requestBody.tool_choice = 'auto';
+    requestBody.tools = tools;
+  }
   
   const response = await fetch(endpoint, {
     method: 'POST',
@@ -447,7 +451,7 @@ async function sendMessageOpenAICompatible(providerConfig, messages, tools) {
       'Authorization': `Bearer ${providerConfig.apiKey}`,
       'Content-Type': 'application/json',
     },
-    body: bodyStr,
+    body: JSON.stringify(requestBody),
   });
 
   if (!response.ok) {
@@ -588,27 +592,36 @@ async function sendMessageToProvider(apiKey, message, conversationId = null, sys
       }));
 
       const toolResults = [];
+      const SPINNER_FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
 
       for (const toolCall of toolCalls) {
+        // Spinner başlat
+        let frameIdx = 0;
+        const inputPreview = JSON.stringify(toolCall.input).slice(0, 50);
+        const spinner = setInterval(() => {
+          process.stdout.write(`\r  ${chalk.cyan(SPINNER_FRAMES[frameIdx++ % SPINNER_FRAMES.length])} ${chalk.gray(toolCall.name + ' — ' + inputPreview)}`);
+        }, 80);
+
         // Check if this is an MCP tool
         const mcpTools = getMcpTools();
         const isMcpTool = mcpTools.find(t => t.name === toolCall.name);
+        let result;
 
         if (isMcpTool) {
-          // Execute MCP tool
           debugLog(`[MCP] Executing tool: ${toolCall.name}`);
-          const result = await executeMcpTool(toolCall.name, toolCall.input);
-          toolResults.push({
-            id: toolCall.id,
-            name: toolCall.name,
-            result: result
-          });
+          result = await executeMcpTool(toolCall.name, toolCall.input);
+          toolResults.push({ id: toolCall.id, name: toolCall.name, result });
         } else {
-          // Execute local tool
           debugLog(`[Local] Executing tool: ${toolCall.name}`);
           const localResults = await executeToolCalls([toolCall]);
           toolResults.push(...localResults);
+          result = localResults[0]?.result;
         }
+
+        // Spinner durdur, sonucu göster
+        clearInterval(spinner);
+        const success = result?.success !== false;
+        process.stdout.write(`\r  ${success ? chalk.green('✓') : chalk.red('✗')} ${chalk.cyan(toolCall.name)} ${chalk.gray('— ' + inputPreview)}\n`);
       }
 
       // Add tool results to messages (base64 encoded for safety)