natureco-cli 5.6.20 → 5.6.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "5.6.20",
+  "version": "5.6.22",
   "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/code_v5.js

@@ -81,13 +81,159 @@ async function sendMessageWithTools(providerUrl, providerKey, model, messages, t
 function confirm(prompt) {
   return new Promise(resolve => {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(chalk.yellow("\n  ⚠ " + prompt + "\n  Devam edilsin mi? (Y/n) "), ans => {
+    rl.question(chalk.yellow("\n  ⚠ " + prompt + " "), ans => {
       rl.close();
       resolve(!ans || ans.toLowerCase().startsWith("y"));
     });
   });
 }
 
+/**
+ * v5.6.21: Risk seviyesi tespiti - sadece riskli işlemlerde onay iste
+ * @param {string} tool - tool adı
+ * @param {object} args - tool parametreleri
+ * @returns {{requiresApproval: boolean, reason: string, level: string}}
+ */
+function assessRisk(tool, args) {
+  const argsStr = JSON.stringify(args || {});
+
+  // ============================================================
+  // YÜKSEK RİSK - Mutlaka onay iste
+  // ============================================================
+
+  // bash / shell_command: Tehlikeli komutlar
+  if (tool === "bash" || tool === "shell_command") {
+    const cmd = (args.command || args.cmd || "").toLowerCase();
+
+    // Dosya/klasör silme
+    if (/\brm\s+(-[rf]+\s+)*/.test(cmd) || /rmdir/.test(cmd)) {
+      return { requiresApproval: true, level: "high", reason: `Dosya silme komutu: ${args.command}` };
+    }
+    if (cmd.includes("sudo ") || cmd.includes("doas ")) {
+      return { requiresApproval: true, level: "high", reason: `Yetki yükseltme: ${args.command}` };
+    }
+    if (cmd.includes("dd if=") || cmd.includes("mkfs") || cmd.includes("fdisk")) {
+      return { requiresApproval: true, level: "high", reason: `Disk işlemi: ${args.command}` };
+    }
+    if (cmd.match(/^\s*mv\s+.*\/(?:\.|\.\.)/)) {
+      return { requiresApproval: true, level: "medium", reason: `Üzerine yazma riski: ${args.command}` };
+    }
+    // chmod 777 veya chown -R
+    if (/chmod\s+(-[rR]+\s+)*777/.test(cmd) || /chown\s+-R/.test(cmd)) {
+      return { requiresApproval: true, level: "medium", reason: `İzin değişikliği: ${args.command}` };
+    }
+    // git push --force
+    if (/git\s+push.*--force/.test(cmd) || /git\s+push.*-f\s/.test(cmd)) {
+      return { requiresApproval: true, level: "high", reason: `Zorla push: ${args.command}` };
+    }
+    // git reset --hard
+    if (/git\s+reset\s+--hard/.test(cmd)) {
+      return { requiresApproval: true, level: "high", reason: `Hard reset: ${args.command}` };
+    }
+    // Üretim/kök dizin
+    if (cmd.includes("/etc/") || cmd.includes("/usr/") || cmd.includes("/var/") || cmd.includes("/System/")) {
+      return { requiresApproval: true, level: "high", reason: `Sistem dizinine erişim: ${args.command}` };
+    }
+    // curl/wget internet download
+    if (/curl.*\|\s*(bash|sh)/.test(cmd) || /wget.*\|\s*(bash|sh)/.test(cmd)) {
+      return { requiresApproval: true, level: "high", reason: `İnternet üzerinden script çalıştırma: ${args.command}` };
+    }
+    // mac_app_quit veya killall
+    if (cmd.includes("killall") || cmd.includes("pkill") || cmd.includes("kill -9")) {
+      return { requiresApproval: true, level: "high", reason: `Süreç sonlandırma: ${args.command}` };
+    }
+    // .natureco veya önemli dosyalara dokunma
+    if (cmd.includes(".natureco") && (cmd.includes("rm") || cmd.includes("mv"))) {
+      return { requiresApproval: true, level: "high", reason: `NatureCo dizininde tehlikeli işlem: ${args.command}` };
+    }
+  }
+
+  // ============================================================
+  // ORTA RİSK - Onay iste (bilgilendir)
+  // ============================================================
+
+  // mac_app_quit - uygulama kapatma
+  if (tool === "mac_app_quit") {
+    return { requiresApproval: true, level: "medium", reason: `Uygulama kapatma: ${args.app || args.name || "?"}` };
+  }
+
+  // write_file / edit_file - kritik yollara yazma
+  if (tool === "write_file" || tool === "edit_file") {
+    const path = (args.path || args.file || "").toLowerCase();
+    // Hassas dosyalar
+    if (path.includes(".env") || path.includes("credentials") || path.includes("secret")) {
+      return { requiresApproval: true, level: "high", reason: `Hassas dosya: ${args.path}` };
+    }
+    if (path.includes("/etc/") || path.includes("/usr/") || path.includes("~/.ssh/")) {
+      return { requiresApproval: true, level: "high", reason: `Sistem dosyası: ${args.path}` };
+    }
+    if (path.includes(".natureco/config.json") || path.includes(".natureco/soul/")) {
+      return { requiresApproval: true, level: "medium", reason: `NatureCo config dosyası: ${args.path}` };
+    }
+  }
+
+  // ============================================================
+  // GÜVENLİ - Onay isteme
+  // ============================================================
+
+  // Normal tool'lar (read_file, list_dir, grep_search, vs.)
+  return { requiresApproval: false, level: "low", reason: "" };
+}
+
+
+/**
+ * v5.6.21: Tool call sonucunu güvenli yazdir - yol/size gizle
+ * Sadece status, success/error ve kisaltilmis onizleme gosterir
+ */
+function printToolCallSafe(name, args, result) {
+  console.log("  " + tui.styled("🔧 Tool: " + name, { color: tui.PALETTE.accent, bold: true }));
+  // Args'dan sadece ana bilgiyi goster
+  const argsShort = summarizeArgs(name, args);
+  if (argsShort) {
+    console.log(tui.styled("     Args: " + argsShort, { color: tui.PALETTE.muted }));
+  }
+  // Result'tan sadece status goster, yol/size gizle
+  if (!result) return;
+  if (result.error) {
+    console.log(tui.styled("     ✗ Hata: " + result.error.slice(0, 100), { color: tui.PALETTE.danger }));
+  } else {
+    const success = result.success !== false;
+    const resultStr = typeof result.result === "string"
+      ? result.result.slice(0, 200)
+      : JSON.stringify(result.result || {}).slice(0, 200);
+    // Yol/size gizle
+    const cleanResult = resultStr
+      .replace(/\/?Users\/[^"\\\s]+/g, "~")
+      .replace(/\/?home\/[^"\\\s]+/g, "~")
+      .replace(/"\w:\\\[^"\\\s]*/g, "...")
+      .replace(/"size":\d+/g, "")
+      .replace(/"path":"[^"]*"/g, "")
+      .replace(/"fileCount":\d+/g, "");
+    const statusIcon = success ? "✓" : "✗";
+    const statusColor = success ? tui.PALETTE.success : tui.PALETTE.danger;
+    console.log(tui.styled(`     ${statusIcon} Sonuç: ${cleanResult.trim()}`, { color: statusColor }));
+  }
+}
+
+/**
+ * Tool args'dan ana bilgiyi özetle
+ */
+function summarizeArgs(name, args) {
+  if (!args || Object.keys(args).length === 0) return null;
+  // Path varsa ~ olarak kisalt
+  if (args.path) {
+    const shortPath = (args.path || "")
+      .replace(/\/Users\/[^\/]+/g, "~")
+      .replace(/\/home\/[^\/]+/g, "~")
+      .replace(/^[A-Z]:\\Users\\[^\\]+/, "~");
+    return JSON.stringify({...args, path: shortPath}).slice(0, 120);
+  }
+  if (args.command) {
+    return JSON.stringify({command: args.command.slice(0, 80)}).slice(0, 120);
+  }
+  return JSON.stringify(args).slice(0, 120);
+}
+
 function printToolCall(name, args, result) {
   const argsStr = JSON.stringify(args).slice(0, 100);
   console.log("\n  " + tui.styled("  🔧 Tool: " + name, { color: tui.PALETTE.accent, bold: true }));
@@ -189,12 +335,18 @@ async function codeV5(targetPath) {
     rl.question("", async (input) => {
       input = input.trim();
       if (!input) { process.stdout.write("  " + tui.styled("You  ", { color: tui.PALETTE.primary, bold: true })); return ask(); }
-      if (input === "/summary" || input === "/done") {
+      if (input === "/summary") {
+        printSummary(filesChanged, commandsRun, messages.length - 1, startTime);
+        // v5.6.22: /summary sadece gosterir, cikmaz
+        process.stdout.write("\n  " + tui.styled("You  ", { color: tui.PALETTE.primary, bold: true }));
+        return ask();
+      }
+      if (input === "/done" || input === "exit" || input === "quit") {
+        // v5.6.22: /done cikinca summary goster
         printSummary(filesChanged, commandsRun, messages.length - 1, startTime);
         rl.close();
         return;
       }
-      if (input === "exit" || input === "quit") { rl.close(); return; }
 
       messages.push({ role: "user", content: input });
       process.stdout.write("\n  " + tui.styled("AI   ", { color: tui.PALETTE.secondary, bold: true }));
@@ -215,13 +367,17 @@ async function codeV5(targetPath) {
           }
 
           if (reply.tool_calls && reply.tool_calls.length > 0) {
-            // Approval for dangerous tools
+            // v5.6.21: Akıllı onay - sadece riskli işlemlerde onay iste
             let approved = true;
-            const dangerous = ["bash", "write_file", "edit_file", "mac_app_quit"];
             for (const tc of reply.tool_calls) {
-              if (dangerous.includes(tc.function.name)) {
+              let args = {};
+              try { args = JSON.parse(tc.function.arguments || "{}"); } catch {}
+              const risk = assessRisk(tc.function.name, args);
+              if (risk.requiresApproval) {
                 process.stdout.write("\n");
-                approved = await confirm(tc.function.name + " çalıştırılsın mı?");
+                approved = await confirm(
+                  `⚠ ${tc.function.name}: ${risk.reason}\n  Devam edilsin mi? (Y/n) `
+                );
                 if (!approved) break;
               }
             }
@@ -239,7 +395,8 @@ async function codeV5(targetPath) {
               if (name === "bash" || name === "shell_command") commandsRun++;
               if (name === "write_file" || name === "edit_file") filesChanged++;
               const result = await executeTool(name, args, toolDefs);
-              printToolCall(name, args, result);
+              // v5.6.21: Sonuç gizleme - sadece status goster, yol/size gizle
+              printToolCallSafe(name, args, result);
               const out = result.error
                 ? "ERROR: " + result.error
                 : (typeof result.result === "string" ? result.result : JSON.stringify(result.result));

package/src/commands/repl.js

@@ -886,7 +886,14 @@ async function startRepl(args) {
               const resultStr = typeof toolEvent.result.result === 'string'
                 ? toolEvent.result.result.slice(0, 200)
                 : JSON.stringify(toolEvent.result.result).slice(0, 200);
-              console.log(tui.styled('     ✓ Sonuç: ' + resultStr, { color: tui.PALETTE.success }));
+              // v5.6.21: Yol gizleme
+              const cleanResult = (resultStr || '')
+                .replace(/\/?Users\/[^"\s]+/g, '~')
+                .replace(/\/?home\/[^"\s]+/g, '~')
+                .replace(/"size":\d+/g, '')
+                .replace(/"path":"[^"]*"/g, '')
+                .replace(/"fileCount":\d+/g, '');
+              console.log(tui.styled('     ✓ Sonuç: ' + cleanResult.trim(), { color: tui.PALETTE.success }));
             }
             process.stdout.write(tui.styled('  AI   ', { color: tui.PALETTE.secondary, bold: true }));
           }

package/src/tools/filesystem.js

@@ -3,5 +3,5 @@ const listDir = require('./list_dir');
 module.exports = {
   ...listDir,
   name: 'filesystem',
-  description: 'List files and directories',
+  description: 'List files and directories (NOT for reading single file content)',
 };

package/src/tools/git.js

@@ -18,7 +18,8 @@ module.exports = {
   },
 
   execute({ operation, args = '', message = '' }) {
-    const cwd = process.cwd();
+    // v5.6.22: Git repo otomatik bul - cwd'de yoksa ust dizinleri kontrol et
+    const cwd = this._findGitRepo();
     try {
       let cmd;
       switch (operation) {
@@ -35,5 +36,55 @@ module.exports = {
     } catch (err) {
       return { success: false, error: err.stderr?.toString() || err.message };
     }
+  },
+
+  /**
+   * v5.6.22: Git repo bul - cwd'de yoksa ~/Projects ve parent dizinleri tara
+   */
+  _findGitRepo() {
+    const fs = require('fs');
+    const path = require('path');
+    const os = require('os');
+    const { execSync } = require('child_process');
+
+    // 1. Mevcut cwd'de .git var mi?
+    if (fs.existsSync(path.join(process.cwd(), '.git'))) {
+      return process.cwd();
+    }
+
+    // 2. Bilinen yaygin konumlari kontrol et
+    const home = os.homedir();
+    const candidates = [
+      path.join(home, 'Projects', 'natureco-cli'),
+      path.join(home, 'Projects'),
+      path.join(home, 'projects'),
+      path.join(home, 'code'),
+      path.join(home, 'dev'),
+      path.join(home, 'src'),
+    ];
+
+    for (const dir of candidates) {
+      try {
+        if (fs.existsSync(path.join(dir, '.git'))) {
+          return dir;
+        }
+      } catch {}
+    }
+
+    // 3. cwd'den yukarı dogru 5 seviye tara
+    let current = process.cwd();
+    for (let i = 0; i < 5; i++) {
+      const parent = path.dirname(current);
+      if (parent === current) break;
+      try {
+        if (fs.existsSync(path.join(parent, '.git'))) {
+          return parent;
+        }
+      } catch {}
+      current = parent;
+    }
+
+    // 4. Bulamadi, cwd'yi don
+    return process.cwd();
   }
 };

package/src/tools/grep_search.js

@@ -19,7 +19,23 @@ const { spawn } = require('child_process');
 async function grepSearch({ pattern, path: searchPath = null, caseSensitive = false, includePattern = null, maxResults = 50 }) {
   if (!pattern) return { success: false, error: 'pattern gerekli' };
 
-  const cwd = searchPath || process.cwd();
+  // v5.6.22: ~ expansion fix
+  if (searchPath && searchPath.startsWith('~')) {
+    searchPath = path.join(require('os').homedir(), searchPath.slice(1));
+  }
+
+  // v5.6.22: Dosya yolu verildiyse, parent directory'yi kullan + filename pattern ekle
+  let cwd = searchPath || process.cwd();
+  if (searchPath && fs.existsSync(searchPath)) {
+    const stat = fs.statSync(searchPath);
+    if (stat.isFile()) {
+      // Dosya -> parent dir + includePattern
+      cwd = path.dirname(searchPath);
+      if (!includePattern) {
+        includePattern = path.basename(searchPath);
+      }
+    }
+  }
   // ripgrep varsa onu kullan, yoksa fallback grep
   const useRipgrep = await checkCommand('rg');
 
@@ -43,9 +59,12 @@ async function grepWithRipgrep(pattern, cwd, caseSensitive, includePattern, maxR
       '--json',
       '--line-number',
       caseSensitive ? '' : '--ignore-case',
-      includePattern ? `-g "${includePattern}"` : '',
       '--no-heading',
     ].filter(Boolean);
+    // v5.6.22: includePattern'i -g ve glob olarak ayri ekle (tirnak hatasini onler)
+    if (includePattern) {
+      args.push('-g', includePattern);
+    }
     args.push(pattern);
     args.push(cwd);
 
@@ -55,7 +74,10 @@ async function grepWithRipgrep(pattern, cwd, caseSensitive, includePattern, maxR
     proc.stdout.on('data', d => stdout += d.toString());
     proc.stderr.on('data', d => stderr += d.toString());
 
-    proc.on('close', (code) => {
+    let finished = false;
+    const finishOnce = () => {
+      if (finished) return;
+      finished = true;
       const results = [];
       const lines = stdout.split('\n').filter(Boolean);
       for (const line of lines) {
@@ -72,7 +94,22 @@ async function grepWithRipgrep(pattern, cwd, caseSensitive, includePattern, maxR
         } catch {}
       }
       resolve({ success: true, pattern, tool: 'ripgrep', count: results.length, results });
-    });
+    };
+
+    // v5.6.22: Promise ile stream okuma (race condition fix)
+    let stderrClosed = false;
+    let stdoutClosed = false;
+    let exitCode = null;
+    const checkFinish = () => {
+      if ((stdoutClosed || stderrClosed) && exitCode !== null) {
+        setTimeout(finishOnce, 100);
+      }
+    };
+    proc.stdout.on('data', d => stdout += d.toString());
+    proc.stderr.on('data', d => stderr += d.toString());
+    proc.stdout.on('end', () => { stdoutClosed = true; checkFinish(); });
+    proc.stderr.on('end', () => { stderrClosed = true; checkFinish(); });
+    proc.on('exit', (code) => { exitCode = code; checkFinish(); });
     proc.on('error', (e) => resolve({ success: false, error: e.message }));
   });
 }

package/src/tools/media_understanding.js

@@ -20,7 +20,17 @@ module.exports = {
     try {
       const config = getConfig();
       const prompt = params.prompt || 'Describe this image in detail';
-      const provider = params.provider || config.visionProvider || 'openai';
+      let provider = params.provider || config.visionProvider || 'openai';
+
+      // v5.6.22: MiniMax, Ollama, local provider'lar vision desteklemiyor olabilir
+      const providerUrl = (config.providerUrl || '').toLowerCase();
+      if (!params.provider && (providerUrl.includes('minimax') || providerUrl.includes('ollama') || providerUrl.includes('localhost'))) {
+        return {
+          success: false,
+          error: `Görsel analiz bu provider (${providerUrl}) için desteklenmiyor. Lütfen OpenAI, Anthropic, Gemini veya Groq provider'ı kullanın.`,
+          hint: 'natureco config set providerUrl https://api.openai.com/v1'
+        };
+      }
 
       if (!params.imagePath && !params.imageUrl) {
         return { success: false, error: 'imagePath veya imageUrl gerekli' };

package/src/tools/memory_search.js

@@ -55,16 +55,24 @@ async function searchMemory({ query, scope = "all", username = null, maxResults
 
   // Memory dosyalarini tara
   if (scope === "all" || scope === "memory") {
-    const memoryFile = path.join(MEMORY_DIR, (username || "default") + ".json");
-    if (fs.existsSync(memoryFile)) {
-      try {
-        const mem = JSON.parse(fs.readFileSync(memoryFile, "utf8"));
-        const matches = searchInObject(mem, q, "memory");
-        matches.forEach(m => {
-          results.push({ source: "memory", ...m });
-          sources.push("memory");
-        });
-      } catch {}
+    // v5.6.22: Username yoksa TÜM memory dosyalarini tara
+    const memoryDir = MEMORY_DIR;
+    if (fs.existsSync(memoryDir)) {
+      const memoryFiles = username
+        ? [(username || "default") + ".json"]
+        : listFiles(memoryDir);
+      for (const fname of memoryFiles) {
+        const memoryFile = path.join(memoryDir, fname);
+        if (!fs.existsSync(memoryFile)) continue;
+        try {
+          const mem = JSON.parse(fs.readFileSync(memoryFile, "utf8"));
+          const matches = searchInObject(mem, q, "memory");
+          matches.forEach(m => {
+            results.push({ source: "memory:" + fname, ...m });
+            sources.push("memory");
+          });
+        } catch {}
+      }
     }
   }
 

package/src/tools/read_file.js

@@ -4,7 +4,7 @@ const os = require('os');
 
 module.exports = {
   name: 'read_file',
-  description: 'Read content from a file',
+  description: 'PRIMARY TOOL: Read a specific file content. Use this when user wants to read/view/look at a single file. For listing directories use filesystem tool.',
   inputSchema: {
     type: 'object',
     properties: {

package/src/tools/write_file.js

@@ -21,7 +21,12 @@ module.exports = {
   
   async execute(params) {
     try {
-      const filePath = path.resolve(params.path);
+      // v5.6.22: ~ expansion fix
+      let rawPath = params.path;
+      if (rawPath && rawPath.startsWith('~')) {
+        rawPath = path.join(require('os').homedir(), rawPath.slice(1));
+      }
+      const filePath = path.resolve(rawPath);
       const dir = path.dirname(filePath);
       
       // Create directory if it doesn't exist