natureco-cli 5.25.0 → 5.27.0

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to NatureCo CLI will be documented in this file.
 
+## [5.27.0] - 2026-07-04 — "GEMINI DÜZELTMESİ + DÖNGÜ BİRLEŞTİRME (2 sağlayıcı E2E)"
+
+### 🐛 Düzeltme / ✨ İyileştirme
+- **Gemini artik calisiyor**: `supportsToolCalls()` Gemini'yi robust agentic-runner yoluna aldi. Neden: `gemini-2.5-flash` bir "thinking" modeli — plan-bazli yoldaki dusuk `max_tokens` (orn. 20) cagrilarinda tum butceyi ic dusunmede harcayip BOS donuyordu. Agentic yol (yuksek max_tokens + native tool_calls/XML parse) bunu cozer. (Kod yorumu zaten "Gemini desteklemez" diyordu ama uygulanmamisti — tutarsizlik giderildi.)
+- **Dongu birlestirme (dogrulanmis)**: `agentic-runner` artik 2 farkli saglayici ailesinde E2E dogrulandi — **MiniMax** (native XML tool-call) + **Gemini** (OpenAI-compat, gercek key ile dosya olusturma + memory recall "Gencay"). Groq/Ollama/localhost da bu yolu kullanir. OpenAI/Anthropic native `tool_calls` yolunda kalir (standart, dokunulmadi).
+
+Doğrulama: Gemini gercek key ile E2E (dosya olusturma + hafiza); **484 test yeşil**, ESLint temiz.
+
+## [5.26.0] - 2026-07-04 — "CANLI STREAMING + KEŞFET→DÜZENLE→DOĞRULA"
+
+### ✨ Yeni
+- **Canlı streaming (TTY)**: yanit artik token token akarak gelir (Hermes/Claude Code hissi). SSE → tool-call/skill XML'ini gizleyen filtre → model-adi sanitizer ("Ben MiniMax"→"Ben {bot}") zinciri; kelime chunk sinirinda bolunse bile sizinti yok. Non-TTY (pipe/CI) bloklu yola duser. `makeStreamFilter` + `makeSanitizeStream` (birim testli).
+- **Keşfet→düzenle→doğrula**: ajana `file_search` (glob), `list_dir` ve MEVCUT dosyayi hedefli degistiren `edit_file` eklendi; sistem prompt'u "once oku, sonra edit_file ile duzenle, sonra calistirip dogrula" akisini ogretir. E2E dogrulandi (dosyayi oku→edit→node ile calistir→sonucu raporla).
+
+### 🐛 Düzeltme
+- **Okuma araclari icerigi modele donmuyordu**: `read_file`/`list_dir`/`file_search`/`bash` sonucu ajana sadece "OK" olarak donuyordu → model icerigi goremeyip "okudum ama bos" diye takiliyordu. Feedback artik gercek ciktiyi (content/output/results) modele verir.
+
+Doğrulama: MiniMax ile E2E (oku→edit→calistir; streaming XML/model-adi sizintisiz); **484 test yeşil**, ESLint temiz.
+
 ## [5.25.0] - 2026-07-04 — "PROVIDER-AGNOSTİK + STREAMING ALTYAPISI"
 
 ### ✨ İyileştirme

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "5.25.0",
+  "version": "5.27.0",
   "description": "OpenClaw'dan daha güvenli, daha hızlı, daha ucuz AI agent CLI. Multi-agent, self-evolving skills, audit log, maliyet optimizasyonu ve NatureCo platform-native.",
   "bin": {
     "natureco": "bin/natureco.js"

package/src/commands/repl.js

@@ -1493,16 +1493,20 @@ async function startRepl(args) {
       messages[0] = { role: 'system', content: systemPrompt, _internal: true };
 
       // v5.13.0: Run workflow FIRST for every request
-      process.stdout.write(tui.styled('\r  🔧 workflow...  ', { color: tui.PALETTE.muted }));
+      // v5.26: TTY'de canli streaming — spinner yerine yanit akarak gelir (workflow stdout'a akitir)
+      const wantStream = !!(process.stdout && process.stdout.isTTY);
+      if (!wantStream) process.stdout.write(tui.styled('\r  🔧 workflow...  ', { color: tui.PALETTE.muted }));
       const wfToolDefs = getToolDefs();
       const recentHistory = messages.length > 1 ? messages.slice(-10) : [];
-      const wfResult = await executeTool('workflow', { action: 'run', task: line, conversationHistory: recentHistory }, wfToolDefs);
+      const wfResult = await executeTool('workflow', { action: 'run', task: line, conversationHistory: recentHistory, stream: wantStream }, wfToolDefs);
       const wf = wfResult?.result || {};
-      if (wf.success !== false) {
-        const loaded = wf.skillsLoaded && wf.skillsLoaded.length > 0 ? ` [skill: ${wf.skillsLoaded.join(', ')}]` : '';
-        process.stdout.write(tui.styled(`  ✓ workflow${loaded}\n`, { color: tui.PALETTE.success }));
-      } else {
-        process.stdout.write(tui.styled('  ✗ workflow\n', { color: tui.PALETTE.danger }));
+      if (!wf.streamed) {
+        if (wf.success !== false) {
+          const loaded = wf.skillsLoaded && wf.skillsLoaded.length > 0 ? ` [skill: ${wf.skillsLoaded.join(', ')}]` : '';
+          process.stdout.write(tui.styled(`  ✓ workflow${loaded}\n`, { color: tui.PALETTE.success }));
+        } else {
+          process.stdout.write(tui.styled('  ✗ workflow\n', { color: tui.PALETTE.danger }));
+        }
       }
 
       if (wf.passthrough && wf.reply !== undefined && wf.reply !== null) {
@@ -1522,7 +1526,9 @@ async function startRepl(args) {
         fixedReply = fixedReply.replace(/Ben\s+GPT[^.!?,;:\n]*/gi, 'Ben ' + displayBotName);
         fixedReply = fixedReply.replace(/Ben\s+Asistan[\s\w\.]*/gi, 'Ben ' + displayBotName);
         fixedReply = fixedReply.replace(/\*\*(?:MiniMax|Claude|GPT|M2\.5|M2)[^\*]*\*\*/gi, '**' + displayBotName + '**');
-        process.stdout.write('\n' + fixedReply + '\n');
+        // streamed ise yanit zaten canli basildi (sanitize edilerek) — tekrar basma
+        if (wf.streamed) process.stdout.write('\n');
+        else process.stdout.write('\n' + fixedReply + '\n');
         messages.push({ role: 'assistant', content: fixedReply });
         totalInputTokens += Math.ceil(line.length / 4);
         totalOutputTokens += Math.ceil(fullReply.length / 4);

package/src/tools/agentic-runner.js

@@ -21,7 +21,7 @@ const os = require('os');
 // icinde approvals politikasini uyguluyor (isSafeCommand → direkt; tehlikeli → red;
 // digerleri → allowlist/full moda gore). Yani keyfi/yikici komut calismaz.
 // Diger ~85 arac (discord, telegram, cron, browser...) bilerek DISARIDA.
-const DEFAULT_ALLOWED = ['write_file', 'read_file', 'edit_file', 'skill_view', 'bash'];
+const DEFAULT_ALLOWED = ['write_file', 'read_file', 'edit_file', 'skill_view', 'bash', 'file_search', 'list_dir'];
 
 const TOOL_ALIASES = {
   write_file: 'write_file', create_file: 'write_file', writefile: 'write_file', write: 'write_file', create: 'write_file', save_file: 'write_file', new_file: 'write_file',
@@ -29,6 +29,8 @@ const TOOL_ALIASES = {
   edit_file: 'edit_file', editfile: 'edit_file', str_replace: 'edit_file', str_replace_editor: 'edit_file', replace_in_file: 'edit_file',
   skill_view: 'skill_view', skillview: 'skill_view', load_skill: 'skill_view', view_skill: 'skill_view', skill: 'skill_view',
   bash: 'bash', run_command: 'bash', shell: 'bash', shell_command: 'bash', exec: 'bash', run_terminal: 'bash', terminal: 'bash', run: 'bash', command: 'bash',
+  file_search: 'file_search', glob: 'file_search', find_files: 'file_search', search_files: 'file_search', find: 'file_search',
+  list_dir: 'list_dir', ls: 'list_dir', dir: 'list_dir', list_directory: 'list_dir', filesystem: 'list_dir',
 };
 
 function expandHome(p) {
@@ -136,6 +138,35 @@ function makeStreamFilter(onText, onTool) {
   };
 }
 
+/**
+ * Streaming model-adi temizleyici: canli akarken model kendi adini soylerse
+ * (MiniMax/Claude/GPT...) persona adiyla degistir. Kelime sinirinda (bosluk)
+ * emit eder — boylece bir chunk'ta "Mini", digerinde "Max" gelse bile kelime
+ * tam olusmadan gonderilmez, sizinti olmaz. onText'e temizlenmis metin gider.
+ */
+function makeSanitizeStream(botName, onText) {
+  const name = botName || 'Asistan';
+  let buf = '';
+  const clean = (s) => s
+    .replace(/\bMiniMaxi?\b/gi, name)
+    .replace(/\bChatGPT\b/gi, name)
+    .replace(/\bGPT-?[0-9.]*\b/gi, name)
+    .replace(/\bClaude(?:\s*[0-9.]+)?\b/gi, name)
+    .replace(/\bM2\.5\b/gi, name);
+  return {
+    push(chunk) {
+      buf += (chunk || '');
+      const lastWs = Math.max(buf.lastIndexOf(' '), buf.lastIndexOf('\n'), buf.lastIndexOf('\t'));
+      if (lastWs >= 0) {
+        const safe = buf.slice(0, lastWs + 1);
+        buf = buf.slice(lastWs + 1);
+        if (onText) onText(clean(safe));
+      }
+    },
+    end() { if (buf && onText) onText(clean(buf)); buf = ''; },
+  };
+}
+
 function sanitizeArgs(args) {
   const a = { ...args };
   if (typeof a.content === 'string' && a.content.length > 160) a.content = `[${a.content.length} chars]`;
@@ -143,6 +174,24 @@ function sanitizeArgs(args) {
   return a;
 }
 
+// Modele geri beslenecek metin. KRITIK: read_file/list_dir/file_search/bash gibi
+// araclarda modelin GORMESI gereken asil cikti (content/output/results/items) geri
+// verilmeli — yoksa model "okudum ama icerik yok" diye takilir.
+function buildFeedback(norm, res) {
+  if (typeof res === 'string') return `${norm} sonucu:\n` + res.slice(0, 2500);
+  const ok = res && res.success !== false;
+  if (!ok) return `${norm} HATA: ${(res && res.error) || 'bilinmeyen hata'}`;
+  if (norm === 'write_file') return `write_file OK: ${res.path || ''} (${res.size != null ? res.size : '?'} bytes)`;
+  let body = '';
+  if (res.content != null) body = String(res.content).slice(0, 2500);
+  else if (res.output != null) body = String(res.output).slice(0, 2000);
+  else if (res.stdout != null) body = String(res.stdout).slice(0, 2000);
+  else if (res.results != null) body = JSON.stringify(res.results).slice(0, 2000);
+  else if (res.items != null) body = JSON.stringify(res.items).slice(0, 2000);
+  const head = `${norm} OK` + (res.path ? ` (${res.path})` : '');
+  return body ? `${head}:\n${body}` : head;
+}
+
 /**
  * Tek bir parse edilmis cagriyi calistir.
  * Donus: { records: [...], feedback: '...' }
@@ -214,17 +263,9 @@ async function executeCall(call, opts = {}) {
   }
   try {
     const res = await fn(args);
-    let feedback, status;
-    if (typeof res === 'string') {
-      status = 'done';
-      feedback = `${norm} sonucu:\n` + res.slice(0, 1500);
-    } else {
-      const ok = res && res.success !== false;
-      status = ok ? 'done' : 'error';
-      feedback = ok
-        ? `${norm} OK` + (res.path ? `: ${res.path} (${res.size != null ? res.size : '?'} bytes)` : (res.output ? ': ' + String(res.output).slice(0, 300) : ''))
-        : `${norm} HATA: ${res && res.error}`;
-    }
+    const ok = typeof res === 'string' ? true : (res && res.success !== false);
+    const status = ok ? 'done' : 'error';
+    const feedback = buildFeedback(norm, res);
     records.push({ tool: norm, status, args: sanitizeArgs(args), result: res });
     return { records, feedback };
   } catch (e) {
@@ -278,4 +319,4 @@ async function runAgentic({ callModel, systemPrompt, historyMessages, task, tool
   return { records: allRecords, reply: finalReply, iterations };
 }
 
-module.exports = { parseAgenticCalls, stripProtocolTokens, executeCall, runAgentic, expandHome, makeStreamFilter, TOOL_ALIASES, DEFAULT_ALLOWED };
+module.exports = { parseAgenticCalls, stripProtocolTokens, executeCall, runAgentic, expandHome, makeStreamFilter, makeSanitizeStream, TOOL_ALIASES, DEFAULT_ALLOWED };

package/src/tools/workflow.js

@@ -117,6 +117,58 @@ function apiCall(providerUrl, apiKey, body) {
   });
 }
 
+// Streaming (SSE) varyanti — onDelta(token) canli cagirilir; sonunda {content, toolCalls} doner.
+// OpenAI-uyumlu delta formati (MiniMax chatcompletion_v2, Gemini /openai, OpenAI, ...).
+function apiCallStream(providerUrl, apiKey, body, onDelta) {
+  return new Promise((resolve, reject) => {
+    const base = providerUrl.replace(/\/+$/, '');
+    const endpoint = isMiniMax(base)
+      ? base + '/v1/text/chatcompletion_v2'
+      : isGemini(base)
+        ? base + '/openai/chat/completions'
+        : base + '/chat/completions';
+    const req = https.request(endpoint, {
+      method: 'POST',
+      headers: { 'Authorization': 'Bearer ' + apiKey, 'Content-Type': 'application/json' },
+      timeout: 120000,
+    }, (res) => {
+      if (res.statusCode < 200 || res.statusCode >= 300) {
+        let data = '';
+        res.on('data', c => data += c);
+        res.on('end', () => reject(new Error('HTTP ' + res.statusCode + ': ' + data.slice(0, 300))));
+        return;
+      }
+      res.setEncoding('utf8');
+      let sseBuf = '';
+      let content = '';
+      const toolCalls = [];
+      res.on('data', (chunk) => {
+        sseBuf += chunk;
+        const parts = sseBuf.split('\n');
+        sseBuf = parts.pop(); // eksik son satiri buffer'da tut
+        for (const line of parts) {
+          const l = line.trim();
+          if (!l.startsWith('data:')) continue;
+          const payload = l.slice(5).trim();
+          if (!payload || payload === '[DONE]') continue;
+          try {
+            const parsed = JSON.parse(payload);
+            const delta = parsed.choices?.[0]?.delta;
+            if (!delta) continue;
+            if (delta.content) { content += delta.content; if (onDelta) onDelta(delta.content); }
+            if (Array.isArray(delta.tool_calls)) { for (const tc of delta.tool_calls) toolCalls.push(tc); }
+          } catch { /* eksik/parcali JSON — atla */ }
+        }
+      });
+      res.on('end', () => resolve({ content, toolCalls }));
+    });
+    req.on('error', reject);
+    req.on('timeout', () => { req.destroy(); reject(new Error('Timeout')); });
+    req.write(JSON.stringify(body));
+    req.end();
+  });
+}
+
 async function workflow(params) {
   const { action, task, steps, name, workflowId, regenerateStep, conversationHistory } = params;
   const cfg = loadConfig();
@@ -149,8 +201,10 @@ async function workflow(params) {
   // Non-tool-calling model tespiti
   function supportsToolCalls() {
     const url = (providerUrl || '').toLowerCase();
-    // MiniMax, Gemini (direct), Ollama, Mistral (direct) tool calling'i desteklemez
+    // Bu saglayicilar OpenAI-tarzi tool_calls JSON'unu guvenilir uretmiyor (ya native
+    // XML uretiyor ya da dusuk max_tokens'ta bos donuyor) → robust agentic-runner yolu.
     if (url.includes('minimax')) return false;
+    if (url.includes('generativelanguage') || url.includes('gemini')) return false; // Gemini 2.5 "thinking" — plan yolundaki dusuk max_tokens'ta bos doner
     if (url.includes('ollama')) return false;
     if (url.includes('localhost')) return false;
     if (url.includes('groq')) return false;
@@ -176,11 +230,15 @@ async function workflow(params) {
         '\n\nKullanabilecegin araclar:',
         '- write_file: dosya olustur/uzerine yaz. parametreler: path (TAM yol), content (dosyanin TAM icerigi). Kod/oyun/site isteniyorsa TUM icerigi content icine yaz, kisaltma.',
         '- read_file: dosya oku. parametre: path',
-        '- edit_file: dosyada metin degistir. parametreler: path, old_string, new_string',
-        '- bash: kabuk komutu calistir (npm, git, node, python, test, ls, mkdir...). parametre: command. Guvenli komutlar dogrudan calisir; yikici/tehlikeli komutlar guvenlik politikasiyla engellenir.',
+        '- edit_file: MEVCUT dosyada metin degistir. parametreler: path, old_string (birebir mevcut metin), new_string. Bir dosyanin bir kismini degistirirken write_file yerine bunu kullan (tum dosyayi yeniden yazma).',
+        '- file_search: glob ile dosya bul. parametre: pattern (orn. "**/*.js", "src/**/*.json").',
+        '- list_dir: dizin icerigini listele. parametre: path',
+        '- bash: kabuk komutu calistir (npm, git, node, python, test, ls, grep/findstr, mkdir...). parametre: command. Guvenli komutlar dogrudan calisir; yikici/tehlikeli komutlar guvenlik politikasiyla engellenir. Icerik aramasi icin grep/findstr kullan.',
         '- skill_view: gorevle ilgili bir skill yukle. parametre: name',
         '\nKurallar:',
-        '- Kod yazdiktan sonra gerektiginde bash ile calistir/test et (orn. "node dosya.js", "npm test"); hata cikarsa duzelt.',
+        '- MEVCUT bir dosyayi degistirmeden ONCE read_file ile oku; sonra edit_file ile hedefli degisiklik yap (tum dosyayi write_file ile ezme).',
+        '- Bir seyi nerede oldugunu bilmiyorsan once file_search/list_dir/bash(grep) ile kesfet.',
+        '- Kod yazdiktan/degistirdikten sonra gerektiginde bash ile calistir/test et (orn. "node dosya.js", "npm test"); hata cikarsa duzelt.',
         '- Birden fazla dosya gerekiyorsa her biri icin AYRI write_file cagir.',
         '- Kullanici "masaustu"/"desktop" dediyse ve tam yol vermediyse dosyayi buraya yaz: ' + desktop,
         '- Goreceli yol yerine TAM yol kullan.',
@@ -194,7 +252,21 @@ async function workflow(params) {
         for (const hm of conversationHistory) { if (hm._internal) continue; historyMessages.push({ role: hm.role, content: hm.content || '' }); }
       }
 
+      // Streaming: yalnizca TTY'de ve caller (repl) stream:true gecince. SSE token'lari
+      // XML-gizleyen filtre + model-adi sanitizer zincirinden gecip stdout'a canli akar.
+      const streamOn = params.stream === true && !!(process.stdout && process.stdout.isTTY);
+      const botName = cfg.botName || 'Asistan';
+      const { makeStreamFilter, makeSanitizeStream } = require('./agentic-runner');
+
       async function callModel(msgs) {
+        if (streamOn) {
+          const sani = makeSanitizeStream(botName, t => process.stdout.write(t));
+          const filter = makeStreamFilter(t => sani.push(t), null);
+          const body = { model, stream: true, messages: msgs, temperature: 0.3, max_tokens: 16000 };
+          const out = await apiCallStream(providerUrl, providerApiKey, body, d => filter.push(d));
+          filter.end(); sani.end();
+          return { content: out.content || '', toolCalls: out.toolCalls || [] };
+        }
         const body = { model, stream: false, messages: msgs, temperature: 0.3, max_tokens: 16000 };
         const r = await apiCall(providerUrl, providerApiKey, body);
         const msg = r.choices?.[0]?.message || {};
@@ -210,7 +282,9 @@ async function workflow(params) {
         let finalReply = reply || '';
         if (fileWrites.length > 0) {
           const lines = fileWrites.map(r => `  ✓ ${path.basename((r.result && r.result.path) || (r.args && r.args.path) || '')} olusturuldu (${(r.result && r.result.size != null) ? r.result.size : '?'} bytes)`).join('\n');
-          finalReply = (finalReply ? finalReply + '\n\n' : '') + 'Dosya(lar):\n' + lines;
+          const fileSummary = 'Dosya(lar):\n' + lines;
+          finalReply = (finalReply ? finalReply + '\n\n' : '') + fileSummary;
+          if (streamOn) process.stdout.write('\n\n' + fileSummary + '\n');
         }
         const done = records.filter(r => r.status === 'done').length;
         return {
@@ -222,6 +296,7 @@ async function workflow(params) {
           completedSteps: done,
           results: records.map((r, i) => ({ step: i + 1, ...r })),
           passthrough: true,
+          streamed: streamOn,
           reply: finalReply || 'Tamamlandi.',
         };
       } catch (e) {