natureco-cli 2.12.4 → 2.12.7

package/package.json

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

package/src/commands/cron.js

@@ -5,6 +5,17 @@ const os = require('os');
 
 const CRONS_FILE = path.join(os.homedir(), '.natureco', 'crons.json');
 
+/**
+ * Normalize WhatsApp number from JID format to clean phone number
+ * "905422842631:49@s.whatsapp.net" → "+905422842631"
+ */
+function normalizeWhatsAppNumber(target) {
+  if (!target) return target;
+  // Extract digits from JID format
+  const match = target.match(/^(\d+)/);
+  return match ? '+' + match[1] : target;
+}
+
 function loadCrons() {
   try {
     if (!fs.existsSync(CRONS_FILE)) {
@@ -113,12 +124,27 @@ function listCrons() {
     return;
   }
   
+  // Load config for fallback targets
+  const { getConfig } = require('../utils/config');
+  const config = getConfig();
+  const defaultWhatsappTarget = normalizeWhatsAppNumber(config.whatsappPhone) || 'N/A';
+  const defaultTelegramTarget = (config.telegramAllowedChats && config.telegramAllowedChats[0]) || 'N/A';
+  
   console.log(chalk.green(`\n📅 Kayıtlı Cron'lar (${crons.length})\n`));
   
   crons.forEach((c, i) => {
+    // Use target from cron or fallback to config
+    let target = c.target;
+    if (!target || target === 'undefined') {
+      target = c.action === 'telegram' ? defaultTelegramTarget : defaultWhatsappTarget;
+    } else if (c.action === 'whatsapp') {
+      // Normalize WhatsApp JID format
+      target = normalizeWhatsAppNumber(target);
+    }
+    
     console.log(chalk.cyan(`${i + 1}. ${c.name}`));
     console.log(chalk.gray(`   Zamanlama: ${c.schedule}`));
-    console.log(chalk.gray(`   Kanal: ${c.action} → ${c.target}`));
+    console.log(chalk.gray(`   Kanal: ${c.action} → ${target}`));
     console.log(chalk.gray(`   Prompt: ${c.prompt.substring(0, 60)}${c.prompt.length > 60 ? '...' : ''}`));
     console.log(chalk.gray(`   Durum: ${c.enabled ? '✅ Aktif' : '❌ Pasif'}`));
     console.log('');

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.12.4</div>
+      <div class="version-badge" id="version-badge">v2.12.7</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.12.4',
+          version: 'v2.12.7',
           bots: cfg.bots || [],
           telegramToken: cfg.telegramToken || null,
           whatsappConnected: cfg.whatsappConnected || false,

package/src/commands/migrate.js

@@ -4,6 +4,17 @@ const os = require('os');
 const chalk = require('chalk');
 const { getConfig, setConfig } = require('../utils/config');
 
+/**
+ * Normalize WhatsApp number from JID format to clean phone number
+ * "905422842631:49@s.whatsapp.net" → "+905422842631"
+ */
+function normalizeWhatsAppNumber(target) {
+  if (!target) return target;
+  // Extract digits from JID format
+  const match = target.match(/^(\d+)/);
+  return match ? '+' + match[1] : target;
+}
+
 async function migrate(options) {
   const from = options.from || 'openclaw';
   
@@ -32,6 +43,7 @@ async function migrate(options) {
     crons: { total: 0, active: 0, inactive: 0 },
     telegram: null,
     whatsapp: false,
+    scripts: 0,
   };
   
   // 1. Memory migration
@@ -79,6 +91,48 @@ async function migrate(options) {
     console.log(chalk.gray('⚠️  Memory migration atlandı:', err.message));
   }
   
+  // 1.5. Workspace scripts migration
+  try {
+    const scriptsSourceDir = path.join(openclawDir, 'workspace', 'scripts');
+    
+    if (fs.existsSync(scriptsSourceDir)) {
+      const scriptsDestDir = path.join(os.homedir(), '.natureco', 'workspace', 'scripts');
+      fs.mkdirSync(scriptsDestDir, { recursive: true });
+      
+      // Copy all files and fix paths
+      const files = fs.readdirSync(scriptsSourceDir);
+      
+      for (const file of files) {
+        const sourcePath = path.join(scriptsSourceDir, file);
+        const destPath = path.join(scriptsDestDir, file);
+        
+        // Skip directories
+        if (fs.statSync(sourcePath).isDirectory()) continue;
+        
+        // Read file content
+        let content = fs.readFileSync(sourcePath, 'utf8');
+        
+        // Fix Windows paths in .js files
+        if (file.endsWith('.js')) {
+          // C:\Users\user\.openclaw\ → ~/.natureco/
+          content = content.replace(/C:\\Users\\[^\\]+\\.openclaw\\/g, '~/.natureco/');
+          // E:\.openclaw\ → ~/.natureco/
+          content = content.replace(/E:\\.openclaw\\/g, '~/.natureco/');
+          // C:\Users\user\ → ~/
+          content = content.replace(/C:\\Users\\[^\\]+\\/g, '~/');
+          // General .openclaw path fix
+          content = content.replace(/\\.openclaw\\/g, '/.natureco/');
+        }
+        
+        // Write fixed content
+        fs.writeFileSync(destPath, content);
+        report.scripts++;
+      }
+    }
+  } catch (err) {
+    console.log(chalk.gray('⚠️  Workspace scripts migration atlandı:', err.message));
+  }
+  
   // 2. Cron jobs migration
   try {
     const cronJobsPath = path.join(openclawDir, 'cron', 'jobs.json');
@@ -90,7 +144,7 @@ async function migrate(options) {
       
       // Get WhatsApp target from config
       const config = getConfig();
-      const whatsappTarget = config.whatsappPhone || '+905422842631'; // fallback
+      const whatsappTarget = normalizeWhatsAppNumber(config.whatsappPhone) || '+905422842631'; // fallback
       
       const naturecoCrons = [];
       
@@ -122,6 +176,14 @@ async function migrate(options) {
         
         // Get prompt (max 300 chars)
         let prompt = job.payload?.message || '';
+        
+        // Fix Windows paths in prompts
+        // "node C:\Users\user\.openclaw\workspace\scripts\xxx.js" → "node ~/.natureco/workspace/scripts/xxx.js"
+        prompt = prompt.replace(/C:\\Users\\[^\\]+\\.openclaw\\/g, '~/.natureco/');
+        prompt = prompt.replace(/E:\\.openclaw\\/g, '~/.natureco/');
+        prompt = prompt.replace(/C:\\Users\\[^\\]+\\/g, '~/');
+        prompt = prompt.replace(/\\.openclaw\\/g, '/.natureco/');
+        
         if (prompt.length > 300) {
           prompt = prompt.slice(0, 300);
         }
@@ -130,7 +192,7 @@ async function migrate(options) {
           name: job.name || 'Unnamed Job',
           schedule: job.schedule.expr,
           action: action,
-          target: target,
+          target: target, // Already normalized for WhatsApp
           prompt: prompt,
           enabled: true, // Enable migrated crons
         });
@@ -139,14 +201,24 @@ async function migrate(options) {
       // Save to NatureCo crons
       const cronsFile = path.join(os.homedir(), '.natureco', 'crons.json');
       
-      // Merge with existing crons if any
+      // Load existing crons and check for duplicates by name
       let existingCrons = [];
       if (fs.existsSync(cronsFile)) {
         existingCrons = JSON.parse(fs.readFileSync(cronsFile, 'utf8'));
       }
       
-      const mergedCrons = [...existingCrons, ...naturecoCrons];
+      // Filter out duplicates (check by name)
+      const existingNames = existingCrons.map(c => c.name);
+      const toAdd = naturecoCrons.filter(c => !existingNames.includes(c.name));
+      
+      // Merge without duplicates
+      const mergedCrons = [...existingCrons, ...toAdd];
       fs.writeFileSync(cronsFile, JSON.stringify(mergedCrons, null, 2));
+      
+      // Update report with actual added count
+      if (toAdd.length < naturecoCrons.length) {
+        console.log(chalk.yellow(`⚠️  ${naturecoCrons.length - toAdd.length} cron zaten mevcut, atlandı`));
+      }
     }
   } catch (err) {
     console.log(chalk.gray('⚠️  Cron migration atlandı:', err.message));
@@ -197,6 +269,10 @@ async function migrate(options) {
     console.log(chalk.green('✅ Memory:'), chalk.white(`${report.memory.name || 'N/A'}${facts ? ', ' + facts : ''}`));
   }
   
+  if (report.scripts > 0) {
+    console.log(chalk.green('✅ Scripts:'), chalk.white(`${report.scripts} script kopyalandı ve path'ler güncellendi`));
+  }
+  
   if (report.crons.total > 0) {
     console.log(chalk.green('✅ Cron jobs:'), chalk.white(`${report.crons.total} job bulundu (${report.crons.active} aktif migrate edildi, ${report.crons.inactive} pasif atlandı)`));
   }