natureco-cli 2.23.30 → 2.23.32

package/src/commands/approvals.js

@@ -1,6 +1,39 @@
 const chalk = require('chalk');
+const F = require('../utils/format');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 const { getConfig, saveConfig } = require('../utils/config');
 
+const APPROVALS_FILE = path.join(os.homedir(), '.natureco', 'approvals.json');
+const ALLOWLIST_FILE = path.join(os.homedir(), '.natureco', 'approval-allowlist.json');
+
+function loadQueue() {
+  if (!fs.existsSync(APPROVALS_FILE)) return [];
+  try { return JSON.parse(fs.readFileSync(APPROVALS_FILE, 'utf-8')); }
+  catch { return []; }
+}
+
+function saveQueue(items) {
+  const dir = path.dirname(APPROVALS_FILE);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(APPROVALS_FILE, JSON.stringify(items, null, 2), 'utf-8');
+}
+
+function genId() { return Date.now().toString(36) + Math.random().toString(36).slice(2, 6); }
+
+function loadAllowlist() {
+  if (!fs.existsSync(ALLOWLIST_FILE)) return [];
+  try { return JSON.parse(fs.readFileSync(ALLOWLIST_FILE, 'utf-8')); }
+  catch { return []; }
+}
+
+function saveAllowlist(patterns) {
+  const dir = path.dirname(ALLOWLIST_FILE);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(ALLOWLIST_FILE, JSON.stringify(patterns, null, 2), 'utf-8');
+}
+
 function approvals(args) {
   const [action, ...params] = args || [];
 
@@ -9,34 +42,103 @@ function approvals(args) {
   if (action === 'approve') return approveReq(params[0]);
   if (action === 'reject') return rejectReq(params[0]);
   if (action === 'set-policy') return setPolicy(params[0]);
+  if (action === 'add') return addReq(params.join(' '));
+  if (action === 'get') return getReq(params[0]);
+  if (action === 'set') return setPolicy(params[0]);
+  if (action === 'allowlist' && params[0] === 'add') return allowlistAdd(params.slice(1).join(' '));
+  if (action === 'allowlist' && params[0] === 'remove') return allowlistRemove(params.slice(1).join(' '));
+  if (action === 'allowlist') return listAllowlist();
 
   console.log(chalk.red(`\n  ❌ Bilinmeyen komut: ${action}\n`));
-  console.log(chalk.gray('  Kullanım: natureco approvals [list|pending|approve|reject|set-policy]\n'));
+  console.log(chalk.gray('  Kullanım: natureco approvals [list|pending|approve|reject|set-policy|set|add|get|allowlist]\n'));
   process.exit(1);
 }
 
 function listApprovals() {
   const config = getConfig();
   const policy = config.execApprovalPolicy || 'auto';
-  console.log(chalk.cyan('\n  📋 Exec Approvals\n'));
-  console.log(chalk.gray('  ' + '─'.repeat(48)));
-  console.log(`  ${chalk.white('Policy:')} ${chalk.cyan(policy)}`);
-  console.log(chalk.gray('\n  Pending: use') + chalk.cyan(' natureco approvals pending'));
-  console.log();
+  const queue = loadQueue();
+
+  F.header('Approvals');
+  F.kv('Policy', policy);
+  F.kv('Queue', `${queue.filter(r => r.status === 'pending').length} pending`);
+
+  const rows = queue.map(r => [
+    r.id,
+    r.source || 'cli',
+    r.text,
+    r.status,
+  ]);
+  F.table(['ID', 'Requester', 'Command', 'Status'], rows);
 }
 
 function listPending() {
-  console.log(chalk.cyan('\n  ⏳ Pending Approvals\n'));
-  console.log(chalk.gray('  ' + '─'.repeat(48)));
-  console.log(chalk.gray('  No pending approvals.\n'));
+  const queue = loadQueue().filter(r => r.status === 'pending');
+  if (queue.length === 0) {
+    F.info('No pending approvals.');
+    return;
+  }
+
+  const rows = queue.map(r => [
+    r.id,
+    r.source || 'cli',
+    r.text,
+    r.status,
+  ]);
+  F.table(['ID', 'Requester', 'Command', 'Status'], rows);
+}
+
+function addReq(text) {
+  if (!text) {
+    console.log(chalk.red('\n  ❌ Request text gerekli\n'));
+    process.exit(1);
+  }
+  const queue = loadQueue();
+  const r = { id: genId(), text, status: 'pending', source: 'cli', createdAt: new Date().toISOString(), resolvedAt: null };
+  queue.push(r);
+  saveQueue(queue);
+  console.log(chalk.yellow(`\n  ⏳ Onay beklemede: ${r.id}\n`));
+  console.log(`  ${chalk.white(text)}`);
+  console.log(chalk.gray(`  Onaylamak için: natureco approvals approve ${r.id}`));
+  console.log();
 }
 
 function approveReq(id) {
-  console.log(chalk.green(`\n  ✅ Approved: ${id || 'all pending'}\n`));
+  const queue = loadQueue();
+  if (id) {
+    const r = queue.find(x => x.id === id);
+    if (!r) { console.log(chalk.red(`\n  ❌ Request bulunamadı: ${id}\n`)); process.exit(1); }
+    if (r.status !== 'pending') { console.log(chalk.yellow(`\n  ⚠️  "${id}" zaten ${r.status}\n`)); return; }
+    r.status = 'approved';
+    r.resolvedAt = new Date().toISOString();
+    saveQueue(queue);
+    F.success(`Approved: ${r.text}`);
+    return;
+  }
+  const pending = queue.filter(r => r.status === 'pending');
+  if (pending.length === 0) { console.log(chalk.gray('\n  Bekleyen onay yok\n')); return; }
+  for (const r of pending) { r.status = 'approved'; r.resolvedAt = new Date().toISOString(); }
+  saveQueue(queue);
+  F.success(`${pending.length} requests approved`);
 }
 
 function rejectReq(id) {
-  console.log(chalk.gray(`\n  ❌ Rejected: ${id || 'all pending'}\n`));
+  const queue = loadQueue();
+  if (id) {
+    const r = queue.find(x => x.id === id);
+    if (!r) { console.log(chalk.red(`\n  ❌ Request bulunamadı: ${id}\n`)); process.exit(1); }
+    if (r.status !== 'pending') { console.log(chalk.yellow(`\n  ⚠️  "${id}" zaten ${r.status}\n`)); return; }
+    r.status = 'rejected';
+    r.resolvedAt = new Date().toISOString();
+    saveQueue(queue);
+    F.error(`Rejected: ${r.text}`);
+    return;
+  }
+  const pending = queue.filter(r => r.status === 'pending');
+  if (pending.length === 0) { console.log(chalk.gray('\n  Bekleyen onay yok\n')); return; }
+  for (const r of pending) { r.status = 'rejected'; r.resolvedAt = new Date().toISOString(); }
+  saveQueue(queue);
+  F.error(`${pending.length} requests rejected`);
 }
 
 function setPolicy(policy) {
@@ -50,4 +152,63 @@ function setPolicy(policy) {
   console.log(chalk.green(`\n  ✅ Approval policy: ${policy}\n`));
 }
 
+function getReq(id) {
+  if (!id) {
+    console.log(chalk.red('\n  ❌ Request ID gerekli\n'));
+    process.exit(1);
+  }
+  const queue = loadQueue();
+  const r = queue.find(x => x.id === id);
+  if (!r) {
+    console.log(chalk.red(`\n  ❌ Request bulunamadı: ${id}\n`));
+    process.exit(1);
+  }
+  F.kv('ID', r.id);
+  F.kv('Text', r.text);
+  F.kv('Status', r.status);
+  F.kv('Source', r.source || 'cli');
+  F.kv('Created', r.createdAt ? new Date(r.createdAt).toLocaleString() : '-');
+  F.kv('Resolved', r.resolvedAt ? new Date(r.resolvedAt).toLocaleString() : '-');
+}
+
+function listAllowlist() {
+  const patterns = loadAllowlist();
+  if (patterns.length === 0) {
+    F.info('No patterns in allowlist.');
+    return;
+  }
+  F.list(patterns);
+}
+
+function allowlistAdd(pattern) {
+  if (!pattern) {
+    console.log(chalk.red('\n  ❌ Pattern gerekli\n'));
+    process.exit(1);
+  }
+  const patterns = loadAllowlist();
+  if (patterns.includes(pattern)) {
+    F.warning(`Pattern already in allowlist: ${pattern}`);
+    return;
+  }
+  patterns.push(pattern);
+  saveAllowlist(patterns);
+  F.success(`Added to allowlist: ${pattern}`);
+}
+
+function allowlistRemove(pattern) {
+  if (!pattern) {
+    console.log(chalk.red('\n  ❌ Pattern gerekli\n'));
+    process.exit(1);
+  }
+  let patterns = loadAllowlist();
+  const initial = patterns.length;
+  patterns = patterns.filter(p => p !== pattern);
+  if (patterns.length === initial) {
+    F.warning(`Pattern not found in allowlist: ${pattern}`);
+    return;
+  }
+  saveAllowlist(patterns);
+  F.success(`Removed from allowlist: ${pattern}`);
+}
+
 module.exports = approvals;

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');