natureco-cli 2.23.18 → 2.23.20

package/package.json

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

package/src/commands/code.js

@@ -6,7 +6,7 @@ const { execSync } = require('child_process');
 const inquirer = require('../utils/inquirer-wrapper');
 const chalk = require('chalk');
 const { getApiKey, getConfig } = require('../utils/config');
-const { getBots, getProviderConfig, startMcpServers } = require('../utils/api');
+const { getBots, getProviderConfig, startMcpServers, sendMessageOpenAICompatible, streamProviderCompletion } = require('../utils/api');
 const { getMemoryPrompt, loadMemory } = require('../utils/memory');
 const { getAgentsPrompt } = require('../utils/agents');
 const { createSession, addMessageToSession } = require('../utils/sessions');
@@ -159,13 +159,8 @@ async function generateSummary(messages, providerConfig) {
   if (!recent.length) return 'Bu session boş geçti.';
   const prompt = `Bu kod session'ını 3-5 madde halinde Türkçe özetle. Ne yapıldı, hangi dosyalar değiştirildi, hangi sorunlar çözüldü:\n${JSON.stringify(recent).slice(0, 3000)}`;
   try {
-    const res = await fetch(`${providerConfig.url}/chat/completions`, {
-      method: 'POST',
-      headers: { 'Authorization': `Bearer ${providerConfig.apiKey}`, 'Content-Type': 'application/json' },
-      body: JSON.stringify({ model: providerConfig.model, messages: [{ role: 'user', content: prompt }], max_tokens: 400, stream: false }),
-    });
-    const data = await res.json();
-    return data.choices?.[0]?.message?.content || 'Özet oluşturulamadı.';
+    const result = await sendMessageOpenAICompatible(providerConfig, [{ role: 'user', content: prompt }], []);
+    return result.content || 'Özet oluşturulamadı.';
   } catch {
     return 'Özet oluşturulamadı.';
   }
@@ -185,106 +180,29 @@ async function saveProjectMemory(messages, providerConfig, workDir) {
 
 // ── Git helpers ───────────────────────────────────────────────────────────────
 async function generateCommitMessage(diff, providerConfig) {
-  const body = {
-    model: providerConfig.model,
-    messages: [
+  try {
+    const result = await sendMessageOpenAICompatible(providerConfig, [
       { role: 'system', content: 'Sen bir git commit mesajı üreticisin. Conventional Commits formatında (feat/fix/refactor/chore vb.) kısa ve açıklayıcı bir commit mesajı yaz. Sadece mesajı yaz, başka hiçbir şey yazma.' },
       { role: 'user', content: `Bu diff için commit mesajı üret:\n\n${diff}` },
-    ],
-    temperature: 0.3,
-    max_tokens: 100,
-    stream: false,
-  };
-  const res = await fetch(`${providerConfig.url}/chat/completions`, {
-    method: 'POST',
-    headers: { 'Authorization': `Bearer ${providerConfig.apiKey}`, 'Content-Type': 'application/json' },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  return (data.choices?.[0]?.message?.content || 'chore: update files').trim().replace(/^["']|["']$/g, '');
+    ], []);
+    return (result.content || 'chore: update files').trim().replace(/^["']|["']$/g, '');
+  } catch {
+    return 'chore: update files';
+  }
 }
 
 
 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 = {};
-
-  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;
-        if (delta.content) { process.stdout.write(delta.content); fullText += delta.content; }
-        if (delta.tool_calls) {
-          for (const tc of delta.tool_calls) {
-            const idx = tc.index ?? 0;
-            if (!toolCallsBuffer[idx]) {
-              toolCallsBuffer[idx] = { id: '', name: '', arguments: '' };
-            }
-            if (tc.id != null) {
-              toolCallsBuffer[idx].id = tc.id;
-            }
-            // OpenAI format: tc.function.name / tc.function.arguments
-            if (tc.function) {
-              if (tc.function.name != null) toolCallsBuffer[idx].name += tc.function.name;
-              if (tc.function.arguments != null) toolCallsBuffer[idx].arguments += tc.function.arguments;
-            }
-            // Alternate format (llama-4-scout etc.): tc.name / tc.arguments directly
-            if (tc.name != null) toolCallsBuffer[idx].name += tc.name;
-            if (tc.arguments != null) toolCallsBuffer[idx].arguments += tc.arguments;
-          }
-        }
-      } catch {}
-    }
+  const result = await streamProviderCompletion(providerConfig, messages, tools);
+  if (result.type === 'text') {
+    return { text: result.content, toolCalls: [] };
   }
-
-  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 };
+  const toolCalls = result.message.tool_calls.map(tc => ({
+    id: tc.id,
+    name: tc.function.name,
+    input: (() => { try { return JSON.parse(tc.function.arguments); } catch { return {}; } })(),
+  }));
+  return { text: result.message.content || '', toolCalls };
 }
 
 // ── Tool execution ────────────────────────────────────────────────────────────

package/src/utils/api.js

@@ -432,8 +432,6 @@ async function sendMessageOpenAICompatible(providerConfig, messages, tools) {
   const endpoint = baseUrl.includes('api.natureco.me')
     ? 'https://api.natureco.me/api/v1/chat/completions'
     : `${baseUrl}/chat/completions`;
-  console.error('DEBUG endpoint:', endpoint);
-
   const requestBody = {
     model: providerConfig.model,
     messages: messages,
@@ -464,13 +462,11 @@ async function sendMessageOpenAICompatible(providerConfig, messages, tools) {
   }
 
   const data = await response.json();
-  console.error('DEBUG response raw:', JSON.stringify(data).slice(0, 300));
   const content = data.choices?.[0]?.message?.content
     || data.choices?.[0]?.text
     || data.response
     || data.content
     || '';
-  console.error('DEBUG content:', content);
   return {
     role: 'assistant',
     content,
@@ -536,7 +532,6 @@ async function sendMessageAnthropic(providerConfig, messages, tools) {
  */
 async function sendMessageToProvider(apiKey, message, conversationId = null, systemPrompt = null, options = {}) {
   const providerConfig = getProviderConfig();
-  console.error('DEBUG sendMessageToProvider providerUrl:', providerConfig?.url);
   
   if (!providerConfig) {
     throw new Error(
@@ -737,8 +732,7 @@ async function sendMessage(apiKey, botId, message, conversationId = null, chatSy
   // Handle legacy 6th param (toolDefinitions array was passed)
   if (Array.isArray(options)) options = {};
   const providerConfig = getProviderConfig();
-  console.error('DEBUG providerUrl:', providerConfig?.url);
-  console.error('DEBUG provider type:', providerConfig?.isAnthropic ? 'anthropic' : 'openai');
+
   // Get user's home directory
   const homeDir = os.homedir();