natureco-cli 2.23.31 → 2.23.32

package/bin/natureco.js

@@ -182,11 +182,11 @@ program
   .action(login);
 
 program
-  .command('setup')
-  .description('Run initial setup wizard')
-  .action(async () => {
+  .command('setup [action]')
+  .description('Run initial setup wizard (wizard|config|workspace|dirs|status)')
+  .action(async (action) => {
     const setup = require('../src/commands/setup');
-    await setup();
+    await setup(action ? [action] : []);
   });
 
 program
@@ -877,17 +877,25 @@ program
 // === OpenClaw uyumlu alias komutlar ===
 
 program
-  .command('acp [file]')
+  .command('acp [file]')
   .description('Alias for code command')
   .action((file) => {
     const codeCmd = require('../src/commands/code');
     codeCmd(file, { dir: process.cwd() });
   });
 
+program
+  .command('web-fetch [url]')
+  .description('Fetch a URL and convert to markdown')
+  .action(async (url) => {
+    const webFetch = require('../src/commands/web-fetch');
+    await webFetch(url);
+  });
+
 program
   .command('help')
   .description('Show help information')
-  .action(help);
+  .action(help);
 
 // Komut verilmezse gateway göster
 if (!process.argv.slice(2).length) {

package/package.json

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

package/src/commands/ask.js

@@ -41,7 +41,7 @@ async function ask(question) {
   }, 80);
 
   try {
-    const response = await sendMessage(apiKey, defaultBotId, question, null, systemPrompt);
+    const response = await sendMessage(apiKey, defaultBotId, question, null, systemPrompt, { stream: false });
     
     clearInterval(loadingInterval);
     process.stdout.write('\r');

package/src/commands/config.js

@@ -13,12 +13,21 @@ function config(args) {
     process.exit(1);
   }
 
+  const SENSITIVE_KEYS = ['apiKey', 'providerApiKey', 'providerApiKey1', 'providerApiKey2', 'secret', 'token', 'password', 'webhookSecret'];
+
+  function maskSensitive(key, value) {
+    if (typeof value !== 'string' || value.length < 8) return value;
+    const lower = key.toLowerCase();
+    if (!SENSITIVE_KEYS.some(sk => lower.includes(sk.toLowerCase()))) return value;
+    return value.slice(0, 4) + '*'.repeat(Math.min(value.length - 8, 16)) + value.slice(-4);
+  }
+
   if (action === 'list') {
     const cfg = getAllConfig();
     F.header('Configuration');
     const rows = Object.entries(cfg).map(([k, v]) => [
       k,
-      typeof v === 'string' ? v : JSON.stringify(v),
+      maskSensitive(k, typeof v === 'string' ? v : JSON.stringify(v)),
     ]);
     F.table(['Key', 'Value'], rows);
     return;
@@ -38,7 +47,7 @@ function config(args) {
     if (value === undefined) {
       F.info(`${key}: (tanımlı değil)`);
     } else {
-      F.kv(key, JSON.stringify(value, null, 2));
+      F.kv(key, maskSensitive(key, JSON.stringify(value, null, 2)));
     }
     return;
   }

package/src/commands/nodes.js

@@ -352,7 +352,7 @@ function nodeDescribe(nodeId) {
     ['Key', node.key ? node.key.substring(0, 8) + '...' : 'none'],
     ['Paired At', node.pairedAt ? new Date(node.pairedAt).toLocaleString() : 'unknown'],
     ['OS', 'linux (mock)'],
-    ['Version', '2.23.31 (mock)'],
+    ['Version', '2.23.32 (mock)'],
     ['CPU', '4 vCPU (mock)'],
     ['Memory', '8 GB (mock)'],
     ['Services', 'gateway, mcp, file-sync (mock)'],

package/src/commands/setup.js

@@ -2,28 +2,147 @@ const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const readline = require('readline');
+const inquirer = require('../utils/inquirer-wrapper');
 
 const BASE_DIR = path.join(os.homedir(), '.natureco');
 const CONFIG_FILE = path.join(BASE_DIR, 'config.json');
 
 const DIRS = ['sources', 'concepts', 'cache', 'skills', 'memory', 'sessions', 'backups'];
 
-function setup(params) {
+const PROVIDER_PRESETS = {
+  groq:     { url: 'https://api.groq.com/openai/v1',                 model: 'llama-3.3-70b-versatile' },
+  openai:   { url: 'https://api.openai.com/v1',                      model: 'gpt-4o' },
+  anthropic:{ url: 'https://api.anthropic.com',                      model: 'claude-sonnet-4-6' },
+  deepseek: { url: 'https://api.deepseek.com/v1',                    model: 'deepseek-chat' },
+  ollama:   { url: 'http://localhost:11434/v1',                      model: 'llama3.3' },
+};
+
+function rlQuestion(query) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise(resolve => {
+    rl.question(query, answer => { rl.close(); resolve(answer.trim()); });
+  });
+}
+
+function getConfig() {
+  if (!fs.existsSync(CONFIG_FILE)) return {};
+  try { return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8')); }
+  catch { return {}; }
+}
+
+function saveConfig(data) {
+  if (!fs.existsSync(BASE_DIR)) fs.mkdirSync(BASE_DIR, { recursive: true });
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8');
+}
+
+async function setup(params) {
   try {
     const [action] = params || [];
 
-    if (!action || action === 'status') return cmdStatus();
+    if (!action || action === 'wizard') return await cmdWizard();
+    if (action === 'status') return cmdStatus();
     if (action === 'config') return cmdConfig();
     if (action === 'workspace') return cmdWorkspace();
     if (action === 'dirs') return cmdDirs();
 
-    console.log(chalk.red(`\n  Unknown setup action: ${action}\n`));
-    console.log(chalk.gray('  Usage: natureco setup [config|workspace|dirs|status]\n'));
+    console.log(chalk.yellow('\n  Usage:'));
+    console.log(chalk.gray('    natureco setup               Interactive setup wizard'));
+    console.log(chalk.gray('    natureco setup config         Create default config'));
+    console.log(chalk.gray('    natureco setup workspace      Create workspace directories'));
+    console.log(chalk.gray('    natureco setup dirs           Create data directories'));
+    console.log(chalk.gray('    natureco setup status         Show setup status\n'));
   } catch (err) {
     console.log(chalk.red(`\n  Setup error: ${err.message}\n`));
   }
 }
 
+async function cmdWizard() {
+  console.clear();
+  console.log('');
+  console.log(chalk.green.bold('  (\\_/)'));
+  console.log(chalk.green.bold('  (•ᴥ•)'));
+  console.log(chalk.green('  />🌿'));
+  console.log('');
+  console.log(chalk.green.bold('  NatureCo CLI — Setup Wizard'));
+  console.log(chalk.gray('  Choose your AI provider and enter your API key.\n'));
+
+  // Ensure directories
+  if (!fs.existsSync(BASE_DIR)) fs.mkdirSync(BASE_DIR, { recursive: true });
+  for (const dir of DIRS) {
+    const p = path.join(BASE_DIR, dir);
+    if (!fs.existsSync(p)) fs.mkdirSync(p, { recursive: true });
+  }
+
+  const cfg = getConfig();
+
+  // Step 1: Provider selection
+  console.log(chalk.white('  Step 1: Provider'));
+  console.log(chalk.gray('  ─────────────────────────────────────────────'));
+  const providerKeys = Object.keys(PROVIDER_PRESETS);
+  const { provider } = await inquirer.prompt([{
+    type: 'list',
+    name: 'provider',
+    message: '  AI Provider:',
+    choices: [
+      ...providerKeys.map(k => ({
+        name: `${k.charAt(0).toUpperCase() + k.slice(1)} (${PROVIDER_PRESETS[k].model})`,
+        value: k,
+      })),
+      { name: 'Custom URL', value: 'custom' },
+    ],
+  }]);
+
+  let providerUrl, providerModel;
+  if (provider === 'custom') {
+    providerUrl = await rlQuestion(`  Provider URL (${cfg.providerUrl || 'https://api.openai.com/v1'}): `);
+    providerModel = await rlQuestion(`  Model (${cfg.providerModel || 'gpt-4o'}): `);
+    providerUrl = providerUrl || cfg.providerUrl || 'https://api.openai.com/v1';
+    providerModel = providerModel || cfg.providerModel || 'gpt-4o';
+  } else {
+    const preset = PROVIDER_PRESETS[provider];
+    providerUrl = preset.url;
+    providerModel = preset.model;
+    console.log(chalk.gray(`  URL:   ${providerUrl}`));
+    console.log(chalk.gray(`  Model: ${providerModel}`));
+  }
+
+  // Step 2: API Key
+  console.log('');
+  console.log(chalk.white('  Step 2: API Key'));
+  console.log(chalk.gray('  ─────────────────────────────────────────────'));
+  console.log(chalk.gray('  Get a key from: ') + chalk.cyan('developers.natureco.me'));
+  console.log(chalk.gray('  Or use your own provider API key.\n'));
+
+  const currentKey = cfg.providerApiKey || '';
+  const apiKey = await rlQuestion(`  API Key ${currentKey ? '(leave blank to keep current)' : ''}: `);
+  if (apiKey) {
+    cfg.providerApiKey = apiKey;
+  }
+
+  // Step 3: Save
+  cfg.providerUrl = providerUrl;
+  cfg.providerModel = providerModel;
+  cfg.setupCompleted = true;
+  cfg.updated = new Date().toISOString();
+  if (!cfg.created) cfg.created = new Date().toISOString();
+  if (!cfg.version) cfg.version = 1;
+  if (cfg.skills === undefined) cfg.skills = { enabled: true, list: [] };
+  if (cfg.mcpServers === undefined) cfg.mcpServers = {};
+
+  saveConfig(cfg);
+
+  console.log('');
+  console.log(chalk.green('  ✓ Setup complete!\n'));
+  console.log(chalk.white('  Config saved to: ') + chalk.gray(CONFIG_FILE));
+  console.log('');
+  console.log(chalk.white('  Next steps:'));
+  console.log(chalk.cyan('    natureco chat              Start chatting'));
+  console.log(chalk.cyan('    natureco login             Login with API key'));
+  console.log(chalk.cyan('    natureco help              View all commands'));
+  console.log('');
+}
+
 function cmdStatus() {
   console.log(chalk.cyan('\n  Setup Status\n'));
 
@@ -33,6 +152,14 @@ function cmdStatus() {
   console.log(chalk.white('  Config:     ') + (configExists ? chalk.green('exists') : chalk.yellow('missing')));
   console.log(chalk.white('  Directory:  ') + (dirExists ? chalk.green('exists') : chalk.yellow('missing')));
 
+  if (configExists) {
+    const cfg = getConfig();
+    console.log(chalk.white('  Provider:   ') + chalk.gray(cfg.providerUrl || 'not set'));
+    console.log(chalk.white('  Model:      ') + chalk.gray(cfg.providerModel || 'not set'));
+    console.log(chalk.white('  API Key:    ') + (cfg.providerApiKey ? chalk.green('set') : chalk.yellow('not set')));
+    console.log(chalk.white('  Setup:      ') + (cfg.setupCompleted ? chalk.green('completed') : chalk.yellow('incomplete')));
+  }
+
   if (dirExists) {
     const existing = fs.readdirSync(BASE_DIR).filter(f => fs.statSync(path.join(BASE_DIR, f)).isDirectory());
     const present = DIRS.filter(d => existing.includes(d));

package/src/commands/web-fetch.js

@@ -0,0 +1,34 @@
+const { fetchAsMarkdown } = require('../utils/web-fetch');
+const chalk = require('chalk');
+
+async function webFetch(url) {
+  if (!url) {
+    console.log(chalk.yellow('\n  Usage: natureco web-fetch <url>\n'));
+    console.log(chalk.gray('  Fetches a URL and converts it to clean markdown.\n'));
+    return;
+  }
+
+  console.log(chalk.gray(`  Fetching: ${url}\n`));
+
+  const result = await fetchAsMarkdown(url);
+
+  if (result.error) {
+    console.log(chalk.red(`  ❌ ${result.error}\n`));
+    return;
+  }
+
+  if (result.title) {
+    console.log(chalk.white('  Title: ') + chalk.cyan(result.title));
+  }
+  console.log(chalk.gray(`  Source: ${result.url}`));
+  console.log(chalk.gray(`  Fetched: ${result.fetchedAt}`));
+  console.log('');
+
+  if (result.content) {
+    console.log(result.content);
+  } else {
+    console.log(chalk.yellow('  No content extracted.\n'));
+  }
+}
+
+module.exports = webFetch;

package/src/utils/api.js

@@ -558,7 +558,7 @@ async function sendMessageToProvider(apiKey, message, conversationId = null, sys
   const augmentedPrompt = agentsMd.injectIntoPrompt(systemPrompt || '', options?.cwd || process.cwd());
 
   // Build messages
-  const messages = [];
+  let messages = [];
   if (augmentedPrompt) {
     messages.push({ role: 'system', content: augmentedPrompt });
   }