natureco-cli 2.10.6 → 2.10.8

package/bin/natureco.js

@@ -19,7 +19,7 @@ const program = new Command();
 program
   .name('natureco')
   .description('NatureCo AI Bot Terminal Interface')
-  .version('1.0.0');
+  .version(packageJson.version);
 
 program
   .command('login')

package/package.json

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

package/src/commands/gateway-server.js

@@ -138,7 +138,7 @@ async function startGateway() {
 
 async function runGatewayWorker() {
   // This runs in the background
-  log('gateway', 'Starting NatureCo Gateway v2.10.6...', 'green');
+  log('gateway', 'Starting NatureCo Gateway v2.10.8...', 'green');
   
   // Load config
   const { getConfig } = require('../utils/config');

package/src/utils/api.js

@@ -140,6 +140,8 @@ function getMcpTools() {
  * Execute MCP tool call
  */
 async function executeMcpTool(toolName, toolArgs) {
+  console.log('[DEBUG] EXECUTING MCP TOOL:', toolName, 'Args:', JSON.stringify(toolArgs).slice(0, 100));
+  
   // Find which server has this tool
   for (const [serverName, { client, tools }] of Object.entries(mcpClients)) {
     const tool = tools.find(t => t.name === toolName);
@@ -150,6 +152,8 @@ async function executeMcpTool(toolName, toolArgs) {
       try {
         const result = await client.callTool(toolName, toolArgs);
         
+        console.log('[DEBUG] MCP RAW RESULT:', JSON.stringify(result).slice(0, 200));
+        
         // MCP returns { content: [{ type: 'text', text: '...' }] }
         if (result.content && result.content.length > 0) {
           // Extract all text content and join with newlines
@@ -158,20 +162,25 @@ async function executeMcpTool(toolName, toolArgs) {
             .map(c => c.text);
           
           if (textContents.length > 0) {
+            const output = textContents.join('\n');
+            console.log('[DEBUG] MCP FORMATTED OUTPUT:', output.slice(0, 100));
             return {
               success: true,
-              output: textContents.join('\n')
+              output: output
             };
           }
         }
         
         // Fallback: return entire result as JSON
+        const fallbackOutput = JSON.stringify(result, null, 2);
+        console.log('[DEBUG] MCP FALLBACK OUTPUT:', fallbackOutput.slice(0, 100));
         return {
           success: true,
-          output: JSON.stringify(result, null, 2)
+          output: fallbackOutput
         };
         
       } catch (err) {
+        console.log('[DEBUG] MCP ERROR:', err.message);
         return {
           success: false,
           error: `MCP tool error: ${err.message}`
@@ -180,12 +189,39 @@ async function executeMcpTool(toolName, toolArgs) {
     }
   }
   
+  console.log('[DEBUG] MCP TOOL NOT FOUND:', toolName);
   return {
     success: false,
     error: `MCP tool not found: ${toolName}`
   };
 }
 
+/**
+ * Encode tool result for safe transmission
+ * Works for both MCP and local tools
+ */
+function encodeToolResult(toolResult) {
+  let content;
+  
+  // Handle different result formats
+  if (typeof toolResult === 'string') {
+    content = toolResult;
+  } else if (toolResult.output) {
+    content = toolResult.output;
+  } else if (toolResult.data) {
+    content = JSON.stringify(toolResult.data);
+  } else if (toolResult.success !== undefined) {
+    // Handle { success: true/false, output/error: ... } format
+    content = toolResult.success ? (toolResult.output || JSON.stringify(toolResult)) : (toolResult.error || 'Unknown error');
+  } else {
+    content = JSON.stringify(toolResult);
+  }
+  
+  // Base64 encode
+  const encoded = Buffer.from(content).toString('base64');
+  return `[BASE64_ENCODED_RESULT]: ${encoded}`;
+}
+
 /**
  * Check if debug mode is enabled
  */
@@ -435,10 +471,13 @@ async function sendMessageToProvider(apiKey, message, conversationId = null, sys
         const mcpTools = getMcpTools();
         const isMcpTool = mcpTools.find(t => t.name === toolCall.name);
 
+        console.log('[DEBUG] Tool call:', toolCall.name, 'Is MCP?', !!isMcpTool);
+
         if (isMcpTool) {
           // Execute MCP tool
           debugLog(`[MCP] Executing tool: ${toolCall.name}`);
           const result = await executeMcpTool(toolCall.name, toolCall.input);
+          console.log('[DEBUG] MCP result:', JSON.stringify(result).slice(0, 200));
           toolResults.push({
             id: toolCall.id,
             name: toolCall.name,
@@ -448,36 +487,26 @@ async function sendMessageToProvider(apiKey, message, conversationId = null, sys
           // Execute local tool
           debugLog(`[Local] Executing tool: ${toolCall.name}`);
           const localResults = await executeToolCalls([toolCall]);
+          console.log('[DEBUG] Local result:', JSON.stringify(localResults[0]).slice(0, 200));
           toolResults.push(...localResults);
         }
       }
 
       // Add tool results to messages (base64 encoded for safety)
       for (const result of toolResults) {
-        // Extract the actual content from tool result
-        let contentToEncode;
+        console.log('[ENCODE]', result.name, 'Result type:', typeof result.result);
         
-        if (result.result.success) {
-          // Try different field names: output, data, or entire result
-          contentToEncode = { 
-            result: result.result.output || result.result.data || result.result 
-          };
-        } else {
-          contentToEncode = { error: result.result.error };
-        }
+        // Encode tool result (works for both MCP and local tools)
+        const encodedContent = encodeToolResult(result.result);
         
-        // Base64 encode the entire result to prevent injection attacks
-        const encoded = Buffer.from(JSON.stringify(contentToEncode)).toString('base64');
+        console.log('[ENCODE]', result.name, 'Encoded preview:', encodedContent.slice(0, 50));
         
         messages.push({
           role: 'tool',
           tool_call_id: result.id,
           name: result.name,
-          content: `[BASE64_ENCODED_RESULT]: ${encoded}`
+          content: encodedContent
         });
-        
-        // DEBUG: Check if MCP results are being encoded
-        console.log(`[DEBUG] Tool: ${result.name}, Content preview:`, messages[messages.length-1].content.slice(0, 50));
       }
 
       // Continue loop to get final response