natureco-cli 5.1.2 → 5.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "5.1.2",
+  "version": "5.2.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/tools/cron_create.js

@@ -78,11 +78,41 @@ async function createCron({ name, schedule, command, description = "" }) {
     }
   } catch {}
 
+  // v5.2.0: Gercek macOS crontab'a ekle (kullanici crontab, sudo gerekmez)
+  const marker = `# natureco:${name}`;
+  let crontabUpdated = false;
+  let crontabError = null;
+
+  try {
+    const { execSync } = require("child_process");
+    // Mevcut crontab'i oku
+    let existing = "";
+    try { existing = execSync("crontab -l 2>/dev/null", { encoding: "utf8" }); }
+    catch { existing = ""; }
+
+    // Ayni isimde var mi kontrol
+    if (existing.includes(marker)) {
+      crontabUpdated = false;
+    } else {
+      const newLine = `${resolvedSchedule} ${command} ${marker}`;
+      const updated = existing + (existing.endsWith("\n") || existing === "" ? "" : "\n") + newLine + "\n";
+      // Yeni crontab yukle (heredoc yerine - ile stdin)
+      execSync("crontab -", { input: updated, encoding: "utf8" });
+      crontabUpdated = true;
+    }
+  } catch (e) {
+    crontabError = e.message;
+  }
+
   return {
     success: true,
     cron: newCron,
-    message: `Cron olusturuldu: ${name} (${resolvedSchedule})`,
-    hint: systemCrontabInstalled ? undefined : `Sistem crontab'a eklemek icin: crontab -e ve ekleyin: ${resolvedSchedule} ${command}`,
+    message: crontabUpdated
+      ? `Cron olusturuldu VE macOS crontab'a eklendi: ${name} (${resolvedSchedule})`
+      : `Cron olusturuldu: ${name} (${resolvedSchedule})${crontabError ? ` - crontab eklenemedi: ${crontabError}` : ""}`,
+    crontabUpdated,
+    crontabError,
+    schedule: resolvedSchedule,
   };
 }
 

package/src/tools/delegate_task.js

@@ -9,9 +9,31 @@ const { spawn } = require("child_process");
 const path = require("path");
 const os = require("os");
 
+// v5.2.0: Agent alias mapping (Parton'un testinden — "review" diye bir agent yok)
+const AGENT_ALIASES = {
+  "review": "general",          // eskiden review diye bir vardi, simdi general
+  "analyze": "explore",
+  "scan": "security",
+  "audit": "security",
+  "check": "general",
+};
+
+const VALID_AGENTS = ["explore", "general", "seo", "content", "security", "debugger", "translator"];
+
 async function delegate({ task, agent = "general", timeoutMs = 60000 }) {
   if (!task) return { success: false, error: "task gerekli" };
 
+  // Alias cozumu
+  if (AGENT_ALIASES[agent]) {
+    agent = AGENT_ALIASES[agent];
+  }
+  if (!VALID_AGENTS.includes(agent)) {
+    return {
+      success: false,
+      error: `Gecersiz agent: ${agent}. Var olan agent tipleri: ${VALID_AGENTS.join(", ")}. Alias'lar: ${Object.keys(AGENT_ALIASES).join(", ")}`,
+    };
+  }
+
   // Bu basitlestirilmis versiyon: kendi agent sistemi yerine
   // natureco'nun REPL'ini sub-process olarak baslatip gorev verir
   return new Promise((resolve) => {

package/src/tools/document_extract.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const { expandPath } = require('../utils/paths');
 const path = require('path');
 const { execSync } = require('child_process');
 
@@ -16,7 +17,7 @@ module.exports = {
 
   async execute(params) {
     try {
-      const filePath = path.resolve(params.path.replace(/^~/, require('os').homedir()));
+      const filePath = path.resolve(expandPath(params.path));
       const maxChars = params.maxChars || 50000;
 
       if (!fs.existsSync(filePath)) {

package/src/tools/filesystem.js

@@ -1,7 +1,7 @@
-const listDir = require('./list_dir');
-
-module.exports = {
-  ...listDir,
-  name: 'filesystem',
-  description: 'List files and directories',
-};
+const listDir = require('./list_dir');
+
+module.exports = {
+  ...listDir,
+  name: 'filesystem',
+  description: 'List files and directories',
+};

package/src/tools/list_dir.js

@@ -1,127 +1,127 @@
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-/**
- * List Directory Tool
- * Lists files and directories in a given path
- */
-
-module.exports = {
-  name: 'list_dir',
-  description: 'List files and directories in a given path. Returns file names, sizes, and types.',
-  inputSchema: {
-    type: 'object',
-    properties: {
-      path: {
-        type: 'string',
-        description: 'Directory path to list (relative or absolute). Use "." for current directory.'
-      }
-    },
-    required: ['path']
-  },
-  
-  async execute(params) {
-    try {
-      // Expand ~ to home directory
-      let dirPath = params.path || '.';
-      dirPath = dirPath.replace(/^~/, os.homedir());
-      
-      // Fix /home path - replace with actual home directory (Unix only)
-      // Handles: /home, home, /home/Documents, /home/anything
-      if (process.platform !== 'win32') {
-        if (dirPath === '/home' || dirPath === 'home' || dirPath.startsWith('/home/')) {
-          dirPath = dirPath.replace(/^\/home/, os.homedir());
-        }
-      }
-      
-      const absolutePath = path.resolve(dirPath);
-      
-      // Check if directory exists
-      if (!fs.existsSync(absolutePath)) {
-        return {
-          success: false,
-          error: `Directory not found: ${params.path}`
-        };
-      }
-      
-      // Check if it's a directory
-      const stats = fs.statSync(absolutePath);
-      if (!stats.isDirectory()) {
-        return {
-          success: false,
-          error: `Not a directory: ${params.path}`
-        };
-      }
-      
-      // Read directory
-      const entries = fs.readdirSync(absolutePath, { withFileTypes: true });
-      
-      // Format entries
-      const items = entries.map(entry => {
-        const itemPath = path.join(absolutePath, entry.name);
-        let size = 0;
-        let type = 'unknown';
-        
-        try {
-          const itemStats = fs.statSync(itemPath);
-          size = itemStats.size;
-          
-          if (entry.isDirectory()) {
-            type = 'directory';
-          } else if (entry.isFile()) {
-            type = 'file';
-          } else if (entry.isSymbolicLink()) {
-            type = 'symlink';
-          }
-        } catch (err) {
-          // Ignore stat errors
-        }
-        
-        return {
-          name: entry.name,
-          type: type,
-          size: size
-        };
-      });
-      
-      // Sort: directories first, then files
-      items.sort((a, b) => {
-        if (a.type === 'directory' && b.type !== 'directory') return -1;
-        if (a.type !== 'directory' && b.type === 'directory') return 1;
-        return a.name.localeCompare(b.name);
-      });
-      
-      // Format output
-      let output = `Directory: ${absolutePath}\n`;
-      output += `Total items: ${items.length}\n\n`;
-      
-      items.forEach(item => {
-        const typeIcon = item.type === 'directory' ? '📁' : '📄';
-        const sizeStr = item.type === 'file' ? ` (${formatSize(item.size)})` : '';
-        output += `${typeIcon} ${item.name}${sizeStr}\n`;
-      });
-      
-      return {
-        success: true,
-        output: output,
-        items: items,
-        path: absolutePath
-      };
-      
-    } catch (error) {
-      return {
-        success: false,
-        error: error.message
-      };
-    }
-  }
-};
-
-function formatSize(bytes) {
-  if (bytes === 0) return '0 B';
-  const k = 1024;
-  const sizes = ['B', 'KB', 'MB', 'GB'];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  return Math.round(bytes / Math.pow(k, i) * 100) / 100 + ' ' + sizes[i];
-}
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+/**
+ * List Directory Tool
+ * Lists files and directories in a given path
+ */
+
+module.exports = {
+  name: 'list_dir',
+  description: 'List files and directories in a given path. Returns file names, sizes, and types.',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      path: {
+        type: 'string',
+        description: 'Directory path to list (relative or absolute). Use "." for current directory.'
+      }
+    },
+    required: ['path']
+  },
+  
+  async execute(params) {
+    try {
+      // Expand ~ to home directory
+      let dirPath = params.path || '.';
+      dirPath = dirPath.replace(/^~/, os.homedir());
+      
+      // Fix /home path - replace with actual home directory (Unix only)
+      // Handles: /home, home, /home/Documents, /home/anything
+      if (process.platform !== 'win32') {
+        if (dirPath === '/home' || dirPath === 'home' || dirPath.startsWith('/home/')) {
+          dirPath = dirPath.replace(/^\/home/, os.homedir());
+        }
+      }
+      
+      const absolutePath = path.resolve(dirPath);
+      
+      // Check if directory exists
+      if (!fs.existsSync(absolutePath)) {
+        return {
+          success: false,
+          error: `Directory not found: ${params.path}`
+        };
+      }
+      
+      // Check if it's a directory
+      const stats = fs.statSync(absolutePath);
+      if (!stats.isDirectory()) {
+        return {
+          success: false,
+          error: `Not a directory: ${params.path}`
+        };
+      }
+      
+      // Read directory
+      const entries = fs.readdirSync(absolutePath, { withFileTypes: true });
+      
+      // Format entries
+      const items = entries.map(entry => {
+        const itemPath = path.join(absolutePath, entry.name);
+        let size = 0;
+        let type = 'unknown';
+        
+        try {
+          const itemStats = fs.statSync(itemPath);
+          size = itemStats.size;
+          
+          if (entry.isDirectory()) {
+            type = 'directory';
+          } else if (entry.isFile()) {
+            type = 'file';
+          } else if (entry.isSymbolicLink()) {
+            type = 'symlink';
+          }
+        } catch (err) {
+          // Ignore stat errors
+        }
+        
+        return {
+          name: entry.name,
+          type: type,
+          size: size
+        };
+      });
+      
+      // Sort: directories first, then files
+      items.sort((a, b) => {
+        if (a.type === 'directory' && b.type !== 'directory') return -1;
+        if (a.type !== 'directory' && b.type === 'directory') return 1;
+        return a.name.localeCompare(b.name);
+      });
+      
+      // Format output
+      let output = `Directory: ${absolutePath}\n`;
+      output += `Total items: ${items.length}\n\n`;
+      
+      items.forEach(item => {
+        const typeIcon = item.type === 'directory' ? '📁' : '📄';
+        const sizeStr = item.type === 'file' ? ` (${formatSize(item.size)})` : '';
+        output += `${typeIcon} ${item.name}${sizeStr}\n`;
+      });
+      
+      return {
+        success: true,
+        output: output,
+        items: items,
+        path: absolutePath
+      };
+      
+    } catch (error) {
+      return {
+        success: false,
+        error: error.message
+      };
+    }
+  }
+};
+
+function formatSize(bytes) {
+  if (bytes === 0) return '0 B';
+  const k = 1024;
+  const sizes = ['B', 'KB', 'MB', 'GB'];
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  return Math.round(bytes / Math.pow(k, i) * 100) / 100 + ' ' + sizes[i];
+}

package/src/tools/mac_alarm.js

@@ -90,7 +90,20 @@ async function setAlarm({ time, label = "Alarm", calendarName = "Calendar" }) {
 
   // AppleScript ile macOS Calendar'a all-day etkinlik olarak alarm ekle
   // (Reminder ile ayni sonuc, daha guvenilir cunku Calendar otomasyon izni Reminders'dan once verilir)
-  // 2 adim: Reminders'a alarm ekle (ana mekanizma) + Calendar'a event (gorunurluk icin)
+  // Dual: Calendar event (gorunurluk) + Reminders (bildirim + alarm)
+  // Once Calendar'a basit etkinlik (alarm'siz, ama gorunur), sonra Reminders alarm
+  const calendarScript = `
+    tell application "Calendar"
+      set targetCal to first calendar whose writable is true
+      set startDate to date "${parsed.formattedDate} ${parsed.formattedTime}"
+      set endDate to startDate + (1 * minutes)
+      set newEvent to make new event at end of events of targetCal with properties {summary:"⏰ ${label.replace(/"/g, "'")} - NatureCo", start date:startDate, end date:endDate, allday event:false}
+      save
+      return id of newEvent
+    end tell
+  `;
+
+  // Reminders'a bildirim + sesli alarm
   const reminderScript = `
     tell application "Reminders"
       set targetList to default list
@@ -102,11 +115,13 @@ async function setAlarm({ time, label = "Alarm", calendarName = "Calendar" }) {
   `;
 
   try {
-    const eventId = await runAppleScript(reminderScript);
+    const calId = await runAppleScript(calendarScript);
+    const remId = await runAppleScript(reminderScript);
     return {
       success: true,
-      eventId,
-      message: `⏰ Alarm kuruldu: ${parsed.humanReadable} — "${label}"`,
+      eventId: remId,
+      calendarEventId: calId,
+      message: `⏰ Alarm kuruldu: ${parsed.humanReadable} — "${label}" (Calendar + Reminders)`,
       calendar: calendarName,
       targetTime: parsed.humanReadable,
       targetTimestamp: parsed.timestamp,

package/src/tools/macos_screenshot.js

@@ -0,0 +1,87 @@
+/**
+ * macos_screenshot - macOS native screenshot (v5.2.0)
+ *
+ * Playwright'a gerek kalmadan screencapture komutu ile
+ * ekran goruntusu alir. Sonra base64 olarak doner.
+ */
+
+const { spawn } = require("child_process");
+const os = require("os");
+const fs = require("fs");
+const path = require("path");
+
+const IS_MAC = os.platform() === "darwin";
+
+async function captureScreen({ outputPath = null, region = "full" } = {}) {
+  if (!IS_MAC) return { success: false, error: "Sadece macOS" };
+
+  const tmpFile = outputPath || path.join(os.tmpdir(), `screenshot-${Date.now()}.png`);
+  return new Promise((resolve) => {
+    // screencapture -x: ses yok, -t png: png format
+    const proc = spawn("screencapture", ["-x", "-t", "png", tmpFile]);
+    proc.on("close", (code) => {
+      if (code === 0 && fs.existsSync(tmpFile)) {
+        const buffer = fs.readFileSync(tmpFile);
+        const stats = fs.statSync(tmpFile);
+        resolve({
+          success: true,
+          path: tmpFile,
+          size: stats.size,
+          mime: "image/png",
+          base64: buffer.toString("base64"),
+          message: `Screenshot kaydedildi: ${tmpFile}`,
+        });
+      } else {
+        resolve({ success: false, error: `screencapture exit ${code}` });
+      }
+    });
+    proc.on("error", (e) => resolve({ success: false, error: e.message }));
+  });
+}
+
+async function captureWindow({ windowTitle = null, outputPath = null } = {}) {
+  if (!IS_MAC) return { success: false, error: "Sadece macOS" };
+
+  const tmpFile = outputPath || path.join(os.tmpdir(), `screenshot-${Date.now()}.png`);
+  return new Promise((resolve) => {
+    // screencapture -l <windowId> veya -w (interaktif, fare ile pencere seç)
+    const args = ["-x", "-t", "png", "-o"]; // -o: shadow yok
+    if (windowTitle) args.push("-l", String(windowTitle));
+    args.push(tmpFile);
+
+    const proc = spawn("screencapture", args);
+    proc.on("close", (code) => {
+      if (code === 0 && fs.existsSync(tmpFile)) {
+        const buffer = fs.readFileSync(tmpFile);
+        const stats = fs.statSync(tmpFile);
+        resolve({
+          success: true,
+          path: tmpFile,
+          size: stats.size,
+          mime: "image/png",
+          base64: buffer.toString("base64"),
+        });
+      } else {
+        resolve({ success: false, error: `screencapture exit ${code}` });
+      }
+    });
+    proc.on("error", (e) => resolve({ success: false, error: e.message }));
+  });
+}
+
+module.exports = {
+  name: "macos_screenshot",
+  description: "macOS native ekran goruntusu al (Playwright gerekmez). screencapture komutunu kullanir.",
+  inputSchema: {
+    type: "object",
+    properties: {
+      outputPath: { type: "string", description: "Kayit yolu (default: /tmp/screenshot-<ts>.png)" },
+      region: { type: "string", description: "full/window (default: full)", enum: ["full", "window"] },
+      windowTitle: { type: "string", description: "Pencere basligi (sadece region=window)" },
+    },
+  },
+  async execute(params) {
+    if (params.region === "window") return captureWindow(params);
+    return captureScreen(params);
+  },
+};

package/src/tools/read_file.js

@@ -1,75 +1,75 @@
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-module.exports = {
-  name: 'read_file',
-  description: 'Read content from a file',
-  inputSchema: {
-    type: 'object',
-    properties: {
-      path: {
-        type: 'string',
-        description: 'File path to read'
-      }
-    },
-    required: ['path']
-  },
-  
-  async execute(params) {
-    try {
-      // Expand ~ to home directory
-      let filePath = params.path.replace(/^~/, os.homedir());
-      filePath = path.resolve(filePath);
-      
-      if (!fs.existsSync(filePath)) {
-        return {
-          success: false,
-          error: 'File does not exist'
-        };
-      }
-      
-      const stats = fs.statSync(filePath);
-      
-      if (!stats.isFile()) {
-        return {
-          success: false,
-          error: 'Path is not a file'
-        };
-      }
-      
-      // 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,
-        truncated: false
-      };
-    } catch (error) {
-      return {
-        success: false,
-        error: error.message
-      };
-    }
-  }
-};
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+module.exports = {
+  name: 'read_file',
+  description: 'Read content from a file',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      path: {
+        type: 'string',
+        description: 'File path to read'
+      }
+    },
+    required: ['path']
+  },
+  
+  async execute(params) {
+    try {
+      // v5.2.0: Robust path expansion (~, ~/, relative)
+      const { expandPath } = require('../utils/paths');
+      const filePath = expandPath(params.path);
+      
+      if (!fs.existsSync(filePath)) {
+        return {
+          success: false,
+          error: 'File does not exist'
+        };
+      }
+      
+      const stats = fs.statSync(filePath);
+      
+      if (!stats.isFile()) {
+        return {
+          success: false,
+          error: 'Path is not a file'
+        };
+      }
+      
+      // 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,
+        truncated: false
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: error.message
+      };
+    }
+  }
+};

package/src/utils/paths.js

@@ -0,0 +1,66 @@
+/**
+ * paths.js — Path helper utilities (v5.2.0)
+ *
+ * Tum tool'larda ~/Desktop/test.txt gibi path'leri dogru handle etmek icin.
+ * Parton'un gercek testinde "File does not exist" bug'i duzeltildi.
+ */
+
+const os = require("os");
+const path = require("path");
+
+/**
+ * Path'i normalize et ve ~/ expansion yap.
+ * Mac/Windows/Linux'ta calisir.
+ *
+ * Ornek:
+ *   expandPath("~/Desktop/test.txt") -> "/Users/gencay/Desktop/test.txt"
+ *   expandPath("~")                  -> "/Users/gencay"
+ *   expandPath("/tmp/x")             -> "/tmp/x"
+ *   expandPath("Downloads/x.txt")    -> "<cwd>/Downloads/x.txt"
+ */
+function expandPath(inputPath) {
+  if (!inputPath) return inputPath;
+  let p = String(inputPath);
+
+  // ~ veya ~/foo -> home + foo
+  if (p === "~") return os.homedir();
+  if (p.startsWith("~/")) {
+    return path.join(os.homedir(), p.slice(2));
+  }
+  if (p.startsWith("~")) {
+    return path.join(os.homedir(), p.slice(1));
+  }
+
+  // Zaten absolut ise dokunma
+  if (path.isAbsolute(p)) return p;
+
+  // Relative ise cwd'ye gore resolve
+  return path.resolve(process.cwd(), p);
+}
+
+function isValidPath(p) {
+  if (!p) return false;
+  if (typeof p !== "string") return false;
+  if (p.includes("\0")) return false; // null byte
+  return true;
+}
+
+/**
+ * Path icin shell-safe quote (Parton'un "Downloads/adsiz klasor" gibi yollari icin)
+ * shlex.quote kullaniyor — universal
+ */
+function quotePath(p) {
+  if (!p) return p;
+  const { execSync } = require("child_process");
+  // shlex.quote Python'dan cagiriliyor cunku Node'da yok
+  // Veya: bash -c 'echo $1' ile quote edilmis halini al
+  try {
+    // macOS/Unix: shlex.quote'a benzer sekilde single-quote wrap
+    if (/^[\w\-\.\/=]+$/.test(p)) return p; // guvenli karakterler
+    return `'${p.replace(/'/g, "'\\''")}'`;
+  } catch {
+    return p;
+  }
+}
+
+module.exports = { expandPath, isValidPath, quotePath };