natureco-cli 2.23.30 → 2.23.32

package/src/commands/chat.js

@@ -3,6 +3,7 @@ const os = require('os');
 const fs = require('fs');
 const readline = require('readline');
 const inquirer = require('../utils/inquirer-wrapper');
+const TB = require('../utils/token-budget');
 const chalk = require('chalk');
 const { getApiKey, getConfig } = require('../utils/config');
 const { getBots, sendMessage, _sendMessage } = require('../utils/api');
@@ -14,7 +15,7 @@ const { getCommands, getCommandContent } = require('../utils/commands');
 const { runHooks } = require('../utils/hooks');
 const { createSession, loadSession, getLatestSession, addMessageToSession, loadLastSession, listSessions, saveSession } = require('../utils/sessions');
 const { NatureCoError, ApiError, handleError } = require('../utils/errors');
-const { getToolDefinitions, getSessionStats, resetSessionStats } = require('../utils/tool-runner');
+const { getSessionStats, resetSessionStats } = require('../utils/tool-runner');
 
 // ── ASCII Logo ────────────────────────────────────────────────────────────────
 const ASCII_LOGO = [
@@ -133,10 +134,7 @@ async function chat(botName, options = {}) {
     if (memoryPrompt) systemPrompt += '\n\n' + memoryPrompt;
   }
 
-  const estimatedTokens = Math.ceil(systemPrompt.length / 4);
-  if (estimatedTokens > 3000) {
-    systemPrompt = systemPrompt.slice(0, 12000);
-  }
+  systemPrompt = TB.trimSystemPrompt(systemPrompt);
 
   // ── Session ─────────────────────────────────────────────────────────────────
   let session;
@@ -189,7 +187,7 @@ async function chat(botName, options = {}) {
 
   // ── Önceki session mesajları ─────────────────────────────────────────────────
   if (options.resume && session.messages?.length) {
-    const last = session.messages.slice(-5);
+    const last = session.messages.slice(-(TB.load().conversationInContext));
     last.forEach(msg => {
       console.log(chalk.white('You  ') + msg.user);
       console.log(chalk.cyan(`${displayBotName}  `) + msg.bot);
@@ -334,8 +332,7 @@ async function chat(botName, options = {}) {
     startLoading();
 
     try {
-      const toolDefinitions = getToolDefinitions();
-      let response = await _sendMessage(apiKey ?? config.providerApiKey, bot.id, userMessage, conversationId, systemPrompt, toolDefinitions, options);
+      let response = await _sendMessage(apiKey ?? config.providerApiKey, bot.id, userMessage, conversationId, systemPrompt, { ...options, noTools: true });
       stopLoading();
 
       if (response?.conversation_id) conversationId = response.conversation_id;

package/src/commands/clawbot.js

@@ -0,0 +1,19 @@
+const chalk = require('chalk');
+
+function clawbot(args) {
+  const [action, ...params] = args || [];
+
+  if (action === 'qr') {
+    const qr = require('../commands/qr');
+    return qr(['--format', 'clawbot', ...params]);
+  }
+
+  console.log(chalk.cyan('\n  🤖 ClawBot\n'));
+  console.log(chalk.gray('  ' + '─'.repeat(48)));
+  console.log(chalk.gray('  Legacy namespace for ClawBot operations.\n'));
+  console.log(`  ${chalk.white('Subcommands:')}`);
+  console.log(`    ${chalk.cyan('qr')}     ${chalk.gray('Show QR pairing code for ClawBot')}`);
+  console.log();
+}
+
+module.exports = clawbot;

package/src/commands/code.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const readline = require('readline');
 const { execSync } = require('child_process');
 const inquirer = require('../utils/inquirer-wrapper');
+const TB = require('../utils/token-budget');
 const chalk = require('chalk');
 const { getApiKey, getConfig } = require('../utils/config');
 const { getBots, getProviderConfig, startMcpServers, sendMessageOpenAICompatible, streamProviderCompletion } = require('../utils/api');
@@ -376,14 +377,14 @@ ${indexPrompt}`;
   // ── Proje hafızası ────────────────────────────────────────────────────────
   const projectMemory = loadProjectMemory(workDir);
   if (projectMemory) {
-    systemPrompt += `\n\n## Proje Geçmişi (.natureco/project.md)\n${projectMemory.slice(0, 2000)}`;
+    systemPrompt += `\n\n## Proje Geçmişi (.natureco/project.md)\n${TB.trimProjectMemory(projectMemory)}`;
   }
 
   // Hedef dosya varsa context'e ekle
   if (targetFile) {
     try {
       const content = fs.readFileSync(path.resolve(targetFile), 'utf-8');
-      systemPrompt += `\n\n## Odak Dosyası: ${targetFile}\n\`\`\`\n${content.slice(0, 2000)}\n\`\`\``;
+      systemPrompt += `\n\n## Odak Dosyası: ${targetFile}\n\`\`\`\n${TB.trimFileContent(content)}\n\`\`\``;
     } catch {
       console.log(chalk.yellow(`  ⚠️  ${targetFile} okunamadı\n`));
     }

package/src/commands/commitments.js

@@ -1,32 +1,148 @@
 const chalk = require('chalk');
+const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
+const COMMITMENTS_FILE = path.join(os.homedir(), '.natureco', 'commitments.json');
+
+function load() {
+  if (!fs.existsSync(COMMITMENTS_FILE)) return [];
+  try { return JSON.parse(fs.readFileSync(COMMITMENTS_FILE, 'utf-8')); }
+  catch { return []; }
+}
+
+function save(items) {
+  const dir = path.dirname(COMMITMENTS_FILE);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(COMMITMENTS_FILE, JSON.stringify(items, null, 2), 'utf-8');
+}
+
+function genId() {
+  return Date.now().toString(36) + Math.random().toString(36).slice(2, 6);
+}
+
 function commitments(args) {
   const [action, ...params] = args || [];
 
-  if (!action || action === 'list') return listCommitments();
-  if (action === 'add') return addCommitment(params.join(' '));
+  if (!action || action === 'list') return listC();
+  if (action === 'add') return addC(params.join(' '));
+  if (action === 'check' || action === 'done') return checkC(params[0]);
+  if (action === 'resolve') return resolveC(params[0]);
+  if (action === 'pending') return pendingC();
+  if (action === 'summary') return summaryC();
+  if (action === 'delete') return deleteC(params[0]);
 
   console.log(chalk.red(`\n  ❌ Bilinmeyen komut: ${action}\n`));
-  console.log(chalk.gray('  Kullanım: natureco commitments [list|add]\n'));
+  console.log(chalk.gray('  Kullanım: natureco commitments [list|add|check|resolve|pending|summary|delete]\n'));
   process.exit(1);
 }
 
-function listCommitments() {
+function listC() {
+  const items = load();
   console.log(chalk.cyan('\n  📋 Commitments\n'));
   console.log(chalk.gray('  ' + '─'.repeat(48)));
-  console.log(chalk.gray('  No inferred commitments.\n'));
-  console.log(chalk.gray('  Commitments track follow-up tasks across sessions.'));
-  console.log(chalk.gray('  They are automatically inferred when running agents.\n'));
+  if (items.length === 0) {
+    console.log(chalk.gray('  Henüz commitment yok.\n'));
+    return;
+  }
+  for (const c of items) {
+    const icon = c.status === 'resolved' ? '✅' : c.status === 'checked' ? '☑️ ' : '⬜';
+    console.log(`  ${icon} ${chalk[c.status === 'resolved' ? 'gray' : 'white'](c.text)}`);
+    console.log(chalk.gray(`     [${c.id}] ${c.createdAt.slice(0, 10)}`));
+  }
+  console.log();
 }
 
-function addCommitment(text) {
+function addC(text) {
   if (!text) {
     console.log(chalk.red('\n  ❌ Commitment text gerekli\n'));
     process.exit(1);
   }
-  console.log(chalk.green(`\n  ✅ Commitment added: ${text}\n`));
+  const items = load();
+  const c = { id: genId(), text, status: 'pending', createdAt: new Date().toISOString(), resolvedAt: null };
+  items.push(c);
+  save(items);
+  console.log(chalk.green(`\n  ✅ Commitment eklendi: ${c.id}\n`));
+  console.log(`  ${chalk.white(c.text)}`);
+  console.log();
+}
+
+function checkC(id) {
+  if (!id) {
+    console.log(chalk.red('\n  ❌ Commitment ID gerekli\n'));
+    process.exit(1);
+  }
+  const items = load();
+  const c = items.find(x => x.id === id);
+  if (!c) { console.log(chalk.red(`\n  ❌ Commitment bulunamadı: ${id}\n`)); process.exit(1); }
+  if (c.status === 'resolved') { console.log(chalk.yellow(`\n  ⚠️  "${c.text}" zaten çözülmüş\n`)); return; }
+  c.status = 'checked';
+  save(items);
+  console.log(chalk.green(`\n  ☑️  "${c.text}" tamamlandı olarak işaretlendi\n`));
+}
+
+function resolveC(id) {
+  if (!id) {
+    const items = load();
+    const pending = items.filter(x => x.status !== 'resolved');
+    if (pending.length === 0) { console.log(chalk.gray('\n  Çözülecek commitment yok\n')); return; }
+    for (const c of pending) {
+      c.status = 'resolved';
+      c.resolvedAt = new Date().toISOString();
+    }
+    save(items);
+    console.log(chalk.green(`\n  ✅ ${pending.length} commitment çözüldü\n`));
+    return;
+  }
+  const items = load();
+  const c = items.find(x => x.id === id);
+  if (!c) { console.log(chalk.red(`\n  ❌ Commitment bulunamadı: ${id}\n`)); process.exit(1); }
+  c.status = 'resolved';
+  c.resolvedAt = new Date().toISOString();
+  save(items);
+  console.log(chalk.green(`\n  ✅ "${c.text}" çözüldü\n`));
+}
+
+function pendingC() {
+  const items = load().filter(c => c.status !== 'resolved');
+  console.log(chalk.cyan('\n  ⏳ Bekleyen Commitments\n'));
+  console.log(chalk.gray('  ' + '─'.repeat(48)));
+  if (items.length === 0) {
+    console.log(chalk.gray('  Bekleyen commitment yok.\n'));
+    return;
+  }
+  for (const c of items) {
+    console.log(`  ${chalk.white(c.text)}`);
+    console.log(chalk.gray(`     [${c.id}] ${c.createdAt.slice(0, 10)}\n`));
+  }
+}
+
+function summaryC() {
+  const items = load();
+  const total = items.length;
+  const resolved = items.filter(c => c.status === 'resolved').length;
+  const checked = items.filter(c => c.status === 'checked').length;
+  const pending = total - resolved - checked;
+  console.log(chalk.cyan('\n  📊 Commitments Summary\n'));
+  console.log(chalk.gray('  ' + '─'.repeat(48)));
+  console.log(`  ${chalk.white('Toplam:')}   ${total}`);
+  console.log(`  ${chalk.green('Çözülen:')}  ${resolved}`);
+  console.log(`  ${chalk.yellow('Kontrol:')}  ${checked}`);
+  console.log(`  ${chalk.cyan('Kalan:')}    ${pending}`);
+  console.log();
+}
+
+function deleteC(id) {
+  if (!id) {
+    console.log(chalk.red('\n  ❌ Commitment ID gerekli\n'));
+    process.exit(1);
+  }
+  let items = load();
+  const idx = items.findIndex(x => x.id === id);
+  if (idx === -1) { console.log(chalk.red(`\n  ❌ Commitment bulunamadı: ${id}\n`)); process.exit(1); }
+  const removed = items.splice(idx, 1)[0];
+  save(items);
+  console.log(chalk.gray(`\n  🗑️  "${removed.text}" silindi\n`));
 }
 
 module.exports = commitments;

package/src/commands/completion.js

@@ -1,18 +1,5 @@
 const chalk = require('chalk');
 
-function completion(args) {
-  const shell = (args[0] || '').toLowerCase();
-
-  if (!shell || shell === 'bash') return generateBash();
-  if (shell === 'zsh') return generateZsh();
-  if (shell === 'fish') return generateFish();
-  if (shell === 'powershell') return generatePowershell();
-
-  console.log(chalk.red(`\n  ❌ Desteklenmeyen shell: ${shell}\n`));
-  console.log(chalk.gray('  Supported: bash, zsh, fish, powershell\n'));
-  process.exit(1);
-}
-
 function getCommands() {
   return [
     'agent', 'agents', 'approvals', 'ask', 'backup', 'bonjour', 'bots',
@@ -26,29 +13,41 @@ function getCommands() {
     'proxy', 'qr', 'reset', 'run', 'sandbox', 'secrets', 'security', 'sessions',
     'setup', 'signal', 'skills', 'slack', 'sms', 'status', 'system', 'tasks',
     'telegram', 'terminal', 'thread-ownership', 'transcripts', 'ultrareview',
-    'uninstall', 'update', 'voice', 'vydra', 'webhooks', 'whatsapp', 'workboard'
+    'uninstall', 'update', 'voice', 'vydra', 'webhooks', 'whatsapp', 'workboard',
   ];
 }
 
-function generateBash() {
+function completion(params) {
+  try {
+    const [shell] = params || [];
+
+    if (!shell || shell === 'bash') return printBash();
+    if (shell === 'zsh') return printZsh();
+    if (shell === 'fish') return printFish();
+    if (shell === 'install') return printInstall();
+
+    console.log(chalk.red(`\n  Unknown shell: ${shell}\n`));
+    console.log(chalk.gray('  Usage: natureco completion [bash|zsh|fish|install]\n'));
+  } catch (err) {
+    console.log(chalk.red(`\n  Completion error: ${err.message}\n`));
+  }
+}
+
+function printBash() {
   const cmds = getCommands().join(' ');
-  console.log(`_natureco_completion() {
+  console.log(`# natureco bash completion
+_natureco() {
   local cur prev opts
   COMPREPLY=()
   cur="\${COMP_WORDS[COMP_CWORD]}"
-  prev="\${COMP_WORDS[COMP_CWORD-1]}"
   opts="${cmds}"
-
-  if [[ \${cur} == * ]] ; then
-    COMPREPLY=( $(compgen -W "\${opts}" -- \${cur}) )
-    return 0
-  fi
+  COMPREPLY=( $(compgen -W "\${opts}" -- \${cur}) )
+  return 0
 }
-complete -F _natureco_completion natureco`);
+complete -F _natureco natureco`);
 }
 
-function generateZsh() {
-  const cmds = getCommands().join(' ');
+function printZsh() {
   console.log(`#compdef natureco
 _natureco() {
   local -a commands
@@ -60,17 +59,26 @@ _natureco() {
 _natureco "$@"`);
 }
 
-function generateFish() {
+function printFish() {
   const cmds = getCommands().join(' ');
   console.log(`complete -c natureco -f -a "${cmds}"`);
 }
 
-function generatePowershell() {
-  console.log(`Register-ArgumentCompleter -Native -CommandName natureco -ScriptBlock {
-  param($wordToComplete, $commandAst, $cursorPosition)
-  $commands = @(${getCommands().map(c => `'${c}'`).join(', ')})
-  $commands | Where-Object { $_ -like "$wordToComplete*" } | ForEach-Object { "'$_'" }
-}`);
+function printInstall() {
+  console.log(chalk.cyan('\n  Shell Completion Installation\n'));
+  console.log(chalk.white('  Bash:'));
+  console.log(chalk.gray('    natureco completion bash >> ~/.bashrc'));
+  console.log(chalk.gray('    source ~/.bashrc'));
+  console.log('');
+  console.log(chalk.white('  Zsh:'));
+  console.log(chalk.gray('    mkdir -p ~/.zsh/completion'));
+  console.log(chalk.gray('    natureco completion zsh > ~/.zsh/completion/_natureco'));
+  console.log(chalk.gray('    echo "fpath=(~/.zsh/completion \$fpath)" >> ~/.zshrc'));
+  console.log(chalk.gray('    echo "autoload -Uz compinit && compinit" >> ~/.zshrc'));
+  console.log('');
+  console.log(chalk.white('  Fish:'));
+  console.log(chalk.gray('    natureco completion fish > ~/.config/fish/completions/natureco.fish'));
+  console.log('');
 }
 
 module.exports = completion;