natureco-cli 2.0.1 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "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.0.1</div>
+      <div class="version-badge" id="version-badge">v2.1.1</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.0.1',
+          version: 'v2.1.1',
           bots: cfg.bots || [],
           telegramToken: cfg.telegramToken || null,
           whatsappConnected: cfg.whatsappConnected || false,

package/src/tools/bash.js

@@ -1,4 +1,5 @@
 const { execSync } = require('child_process');
+const os = require('os');
 
 module.exports = {
   name: 'bash',
@@ -16,10 +17,15 @@ module.exports = {
   
   async execute(params) {
     try {
-      const output = execSync(params.command, {
+      // Replace /home with actual home directory
+      let command = params.command;
+      command = command.replace(/\/home(?=\s|\/|$)/g, os.homedir());
+      
+      const output = execSync(command, {
         encoding: 'utf-8',
         maxBuffer: 10 * 1024 * 1024, // 10MB
-        timeout: 30000 // 30 seconds
+        timeout: 30000, // 30 seconds
+        shell: true // Use shell for command execution
       });
       
       return {

package/src/tools/list_dir.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 /**
  * List Directory Tool
@@ -22,14 +23,22 @@ module.exports = {
   
   async execute(params) {
     try {
-      const dirPath = params.path || '.';
+      // Expand ~ to home directory
+      let dirPath = params.path || '.';
+      dirPath = dirPath.replace(/^~/, os.homedir());
+      
+      // Fix /home path - replace with actual home directory
+      if (dirPath === '/home' || dirPath === 'home') {
+        dirPath = os.homedir();
+      }
+      
       const absolutePath = path.resolve(dirPath);
       
       // Check if directory exists
       if (!fs.existsSync(absolutePath)) {
         return {
           success: false,
-          error: `Directory not found: ${dirPath}`
+          error: `Directory not found: ${params.path}`
         };
       }
       
@@ -38,7 +47,7 @@ module.exports = {
       if (!stats.isDirectory()) {
         return {
           success: false,
-          error: `Not a directory: ${dirPath}`
+          error: `Not a directory: ${params.path}`
         };
       }
       

package/src/tools/read_file.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 module.exports = {
   name: 'read_file',
@@ -17,7 +18,9 @@ module.exports = {
   
   async execute(params) {
     try {
-      const filePath = path.resolve(params.path);
+      // Expand ~ to home directory
+      let filePath = params.path.replace(/^~/, os.homedir());
+      filePath = path.resolve(filePath);
       
       if (!fs.existsSync(filePath)) {
         return {
@@ -35,13 +38,32 @@ module.exports = {
         };
       }
       
+      // Check file size - if > 1MB, read only first 50KB
+      if (stats.size > 1024 * 1024) {
+        const fd = fs.openSync(filePath, 'r');
+        const buf = Buffer.alloc(50000);
+        fs.readSync(fd, buf, 0, 50000, 0);
+        fs.closeSync(fd);
+        
+        const content = '[Büyük dosya - ilk ~50KB gösteriliyor]\n' + buf.toString('utf8');
+        
+        return {
+          success: true,
+          path: filePath,
+          content,
+          size: stats.size,
+          truncated: true
+        };
+      }
+      
       const content = fs.readFileSync(filePath, 'utf-8');
       
       return {
         success: true,
         path: filePath,
         content,
-        size: stats.size
+        size: stats.size,
+        truncated: false
       };
     } catch (error) {
       return {

package/src/utils/api.js

@@ -1,5 +1,5 @@
-// NatureCo CLI v2.0.0 - Direct Groq Integration with Local Tool Execution
-// Bypass NatureCo backend, connect directly to Groq API
+// NatureCo CLI v2.1.0 - Universal LLM Provider Support
+// Supports: OpenAI, Groq, Together, Fireworks, Perplexity, Mistral, DeepSeek, OpenRouter, Ollama, LM Studio, Anthropic
 
 const { getConfig } = require('./config');
 const { getToolDefinitions, executeToolCalls } = require('./tool-runner');
@@ -8,17 +8,38 @@ const { getToolDefinitions, executeToolCalls } = require('./tool-runner');
 const conversationHistory = new Map();
 
 /**
- * Get Groq API key from config
+ * Get provider configuration from config
  */
-function getGroqApiKey() {
+function getProviderConfig() {
   const config = getConfig();
-  return config.groqApiKey || null;
+  
+  // Universal provider config (v2.1.0+)
+  if (config.providerUrl && config.providerApiKey) {
+    return {
+      url: config.providerUrl,
+      apiKey: config.providerApiKey,
+      model: config.providerModel || 'llama-3.1-8b-instant',
+      isAnthropic: config.providerUrl.includes('anthropic.com')
+    };
+  }
+  
+  // Legacy Groq config (v2.0.x)
+  if (config.groqApiKey) {
+    return {
+      url: 'https://api.groq.com/openai/v1',
+      apiKey: config.groqApiKey,
+      model: config.groqModel || 'llama-3.1-8b-instant',
+      isAnthropic: false
+    };
+  }
+  
+  return null;
 }
 
 /**
- * Format tool definitions for Groq API
+ * Format tool definitions for OpenAI-compatible APIs
  */
-function formatToolsForGroq() {
+function formatToolsForOpenAI() {
   const tools = getToolDefinitions();
   
   return tools.map(tool => ({
@@ -32,18 +53,116 @@ function formatToolsForGroq() {
 }
 
 /**
- * Send message to Groq with tool support
+ * Format tool definitions for Anthropic API
  */
-async function sendMessageToGroq(apiKey, message, conversationId = null, systemPrompt = null) {
-  const config = getConfig();
-  const groqApiKey = config.groqApiKey;
+function formatToolsForAnthropic() {
+  const tools = getToolDefinitions();
   
-  if (!groqApiKey) {
-    throw new Error('Groq API key not found. Set it with: natureco config set groqApiKey gsk_xxx');
+  return tools.map(tool => ({
+    name: tool.name,
+    description: tool.description,
+    input_schema: tool.inputSchema
+  }));
+}
+
+/**
+ * Send message to OpenAI-compatible provider (Groq, OpenAI, Together, etc.)
+ */
+async function sendMessageOpenAICompatible(providerConfig, messages, tools) {
+  const endpoint = `${providerConfig.url}/chat/completions`;
+  
+  const response = await fetch(endpoint, {
+    method: 'POST',
+    headers: {
+      'Authorization': `Bearer ${providerConfig.apiKey}`,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      model: providerConfig.model,
+      messages: messages,
+      tools: tools,
+      tool_choice: 'auto',
+      temperature: 0.7,
+      max_tokens: 2000,
+    }),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Provider API error: ${response.status} - ${errorText}`);
   }
 
-  // Get model from config (default: llama-3.1-8b-instant)
-  const model = config.groqModel || 'llama-3.1-8b-instant';
+  const data = await response.json();
+  return data.choices[0].message;
+}
+
+/**
+ * Send message to Anthropic API
+ */
+async function sendMessageAnthropic(providerConfig, messages, tools) {
+  const endpoint = `${providerConfig.url}/v1/messages`;
+  
+  // Anthropic requires system message separate
+  const systemMessage = messages.find(m => m.role === 'system');
+  const userMessages = messages.filter(m => m.role !== 'system');
+  
+  const response = await fetch(endpoint, {
+    method: 'POST',
+    headers: {
+      'x-api-key': providerConfig.apiKey,
+      'anthropic-version': '2023-06-01',
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      model: providerConfig.model,
+      max_tokens: 2000,
+      system: systemMessage?.content || '',
+      messages: userMessages,
+      tools: tools,
+    }),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Anthropic API error: ${response.status} - ${errorText}`);
+  }
+
+  const data = await response.json();
+  
+  // Convert Anthropic response to OpenAI format
+  const content = data.content.find(c => c.type === 'text')?.text || '';
+  const toolCalls = data.content
+    .filter(c => c.type === 'tool_use')
+    .map(c => ({
+      id: c.id,
+      type: 'function',
+      function: {
+        name: c.name,
+        arguments: JSON.stringify(c.input)
+      }
+    }));
+  
+  return {
+    role: 'assistant',
+    content: content,
+    tool_calls: toolCalls.length > 0 ? toolCalls : undefined
+  };
+}
+
+/**
+ * Send message with tool support (universal)
+ */
+async function sendMessageToProvider(apiKey, message, conversationId = null, systemPrompt = null) {
+  const providerConfig = getProviderConfig();
+  
+  if (!providerConfig) {
+    throw new Error(
+      'Provider not configured. Set with:\n' +
+      '  natureco config set providerUrl https://api.groq.com/openai/v1\n' +
+      '  natureco config set providerApiKey gsk_xxx\n' +
+      '  natureco config set providerModel llama-3.1-8b-instant'
+    );
+  }
 
   // Get or create conversation history
   const convId = conversationId || `conv_${Date.now()}`;
@@ -52,25 +171,25 @@ async function sendMessageToGroq(apiKey, message, conversationId = null, systemP
   }
   const history = conversationHistory.get(convId);
 
-  // Add system prompt if provided
+  // Build messages
   const messages = [];
   if (systemPrompt) {
     messages.push({ role: 'system', content: systemPrompt });
   }
-
-  // Add conversation history
   messages.push(...history);
-
-  // Add user message
   messages.push({ role: 'user', content: message });
 
   // Get tool definitions
-  const tools = formatToolsForGroq();
+  const tools = providerConfig.isAnthropic 
+    ? formatToolsForAnthropic() 
+    : formatToolsForOpenAI();
 
-  console.log('\n[Groq] Sending request...');
-  console.log('[Groq] Model:', model);
-  console.log('[Groq] Messages:', messages.length);
-  console.log('[Groq] Tools:', tools.length);
+  console.log('\n[Provider] Sending request...');
+  console.log('[Provider] URL:', providerConfig.url);
+  console.log('[Provider] Model:', providerConfig.model);
+  console.log('[Provider] Type:', providerConfig.isAnthropic ? 'Anthropic' : 'OpenAI-compatible');
+  console.log('[Provider] Messages:', messages.length);
+  console.log('[Provider] Tools:', tools.length);
 
   // Tool execution loop (max 10 iterations)
   let iteration = 0;
@@ -79,42 +198,21 @@ async function sendMessageToGroq(apiKey, message, conversationId = null, systemP
 
   while (iteration < maxIterations) {
     iteration++;
-    console.log(`\n[Groq] Iteration ${iteration}/${maxIterations}`);
-
-    // Call Groq API
-    const response = await fetch('https://api.groq.com/openai/v1/chat/completions', {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${groqApiKey}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        model: model,
-        messages: messages,
-        tools: tools,
-        tool_choice: 'auto',
-        temperature: 0.7,
-        max_tokens: 2000,
-      }),
-    });
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      console.error('[Groq] Error:', errorText);
-      throw new Error(`Groq API error: ${response.status} - ${errorText}`);
-    }
+    console.log(`\n[Provider] Iteration ${iteration}/${maxIterations}`);
 
-    const data = await response.json();
-    const assistantMessage = data.choices[0].message;
+    // Call provider API
+    const assistantMessage = providerConfig.isAnthropic
+      ? await sendMessageAnthropic(providerConfig, messages, tools)
+      : await sendMessageOpenAICompatible(providerConfig, messages, tools);
 
-    console.log('[Groq] Response type:', assistantMessage.tool_calls ? 'tool_calls' : 'text');
+    console.log('[Provider] Response type:', assistantMessage.tool_calls ? 'tool_calls' : 'text');
 
     // Add assistant message to history
     messages.push(assistantMessage);
 
     // Check for tool calls
     if (assistantMessage.tool_calls && assistantMessage.tool_calls.length > 0) {
-      console.log(`[Groq] Tool calls: ${assistantMessage.tool_calls.length}`);
+      console.log(`[Provider] Tool calls: ${assistantMessage.tool_calls.length}`);
 
       // Execute tools locally
       const toolCalls = assistantMessage.tool_calls.map(tc => ({
@@ -127,8 +225,6 @@ async function sendMessageToGroq(apiKey, message, conversationId = null, systemP
 
       // Add tool results to messages
       for (const result of toolResults) {
-        const toolCall = assistantMessage.tool_calls.find(tc => tc.id === result.id);
-        
         messages.push({
           role: 'tool',
           tool_call_id: result.id,
@@ -149,7 +245,7 @@ async function sendMessageToGroq(apiKey, message, conversationId = null, systemP
   }
 
   if (iteration >= maxIterations) {
-    console.log('\n[Groq] Max iterations reached');
+    console.log('\n[Provider] Max iterations reached');
     finalResponse = finalResponse || 'Max tool execution iterations reached.';
   }
 
@@ -186,30 +282,33 @@ function clearConversation(conversationId) {
  */
 async function sendMessage(apiKey, botId, message, conversationId = null, skillPrompts = '') {
   // System prompt for terminal assistant
-  const systemPrompt = "You are a terminal assistant. When users ask for file listing, command execution, or directory viewing, you MUST use the available tools (bash, read_file, write_file, list_dir). Never say 'run this command' - execute it yourself using tools and show the result.";
+  const systemPrompt = "You are a terminal assistant. When users ask for file listing, command execution, or directory viewing, you MUST use the available tools (bash, read_file, write_file, list_dir). Never say 'run this command' - execute it yourself using tools and show the result.\n\nIMPORTANT: For the user's home directory, always use the actual home path (e.g., /Users/username on Mac, /home/username on Linux), NOT /home. The tools automatically handle this conversion.";
   
-  return sendMessageToGroq(apiKey, message, conversationId, systemPrompt);
+  return sendMessageToProvider(apiKey, message, conversationId, systemPrompt);
 }
 
 /**
- * Validate API key (not used in v2.0.0, kept for compatibility)
+ * Validate API key (not used in v2.x, kept for compatibility)
  */
 async function validateApiKey(apiKey) {
-  const groqApiKey = getGroqApiKey();
-  return groqApiKey !== null;
+  const providerConfig = getProviderConfig();
+  return providerConfig !== null;
 }
 
 /**
- * Get bots (not used in v2.0.0, kept for compatibility)
+ * Get bots (not used in v2.x, kept for compatibility)
  */
 async function getBots(apiKey) {
+  const providerConfig = getProviderConfig();
+  const providerName = providerConfig?.isAnthropic ? 'Anthropic' : 'OpenAI-compatible';
+  
   return {
     bots: [
       {
-        id: 'groq-direct',
-        name: 'Groq Direct',
-        ai_provider: 'groq',
-        model: 'llama-3.3-70b-versatile'
+        id: 'universal-provider',
+        name: `Universal Provider (${providerName})`,
+        ai_provider: providerName,
+        model: providerConfig?.model || 'unknown'
       }
     ]
   };
@@ -217,10 +316,10 @@ async function getBots(apiKey) {
 
 module.exports = {
   sendMessage,
-  sendMessageToGroq,
+  sendMessageToProvider,
   validateApiKey,
   getBots,
   clearConversation,
-  getGroqApiKey,
+  getProviderConfig,
   _sendMessage: sendMessage, // Alias for compatibility
 };