natureco-cli 5.62.0 → 5.64.0

package/src/utils/tools.js

@@ -5,18 +5,16 @@
  * v5.7.17: Emoji + toolset + check_fn + registry entegrasyonu.
  */
 
-const fs = require('fs');
-const path = require('path');
-const { globalRegistry } = require('./registry');
-const sandbox = require('./sandbox');
+const { globalRegistry } = require('./registry');
+const sandbox = require('./sandbox');
+const { executeThroughGateway } = require('./tool-execution-gateway');
+const { loadToolManifest } = require('./tool-manifest');
 
 // Lazy config read — avoids circular deps
 function _getSandboxLevel() {
   try { return sandbox.getLevel(require('./config').getConfig()); } catch { return 'none'; }
 }
 
-const TOOLS_DIR = path.join(__dirname, '..', 'tools');
-
 // ── Emoji map (central, tek kaynak) ──────────────────────────────────────
 const EMOJI_MAP = {
   // File operations
@@ -174,7 +172,7 @@ function getToolsForProvider(allTools, providerUrl) {
 
 function loadToolDefinitions() {
   const tools = [];
-  const files = fs.readdirSync(TOOLS_DIR).filter(f => f.endsWith('.js'));
+  const manifest = loadToolManifest();
 
   let isGroq = false;
   try {
@@ -197,20 +195,19 @@ function loadToolDefinitions() {
     'soul', 'memory', 'memory_write', 'memory_search', 'filesystem', 'grep_search'
   ]);
 
-  for (const file of files) {
-    try {
-      const toolPath = path.join(TOOLS_DIR, file);
-      const mod = require(toolPath);
-      const toolName = mod.name || path.basename(file, '.js');
+  for (const entry of manifest.values()) {
+    try {
+      const mod = entry.module;
+      const toolName = entry.name;
 
       if (isGroq && !GROQ_ALLOWED.has(toolName)) continue;
       if (disabledTools.has(toolName)) continue;
 
       const meta = {
         name: toolName,
-        description: mod.description || `${path.basename(file, '.js')} tool`,
-        parameters: mod.parameters || mod.inputSchema || { type: 'object', properties: {} },
-        execute: mod.execute || (mod.default && mod.default.execute) || null,
+        description: entry.description,
+        parameters: entry.inputSchema,
+        execute: entry.execute,
         emoji: EMOJI_MAP[toolName] || '',
         toolset: TOOLSET_MAP[toolName] || 'general',
         checkFn: CHECK_FN_MAP[toolName] || null,
@@ -290,33 +287,24 @@ function toOpenAIFormat(toolDefs) {
     });
 }
 
-async function executeTool(toolName, args, toolDefs) {
-  const tool = toolDefs.find(t => t.name === toolName);
-  if (!tool) return { error: `Tool bulunamadı: ${toolName}` };
-  if (!tool.execute) return { error: `Tool execute fonksiyonu yok: ${toolName}` };
-  // checkFn — tool disabled? (re-check at runtime with cache)
-  if (tool.checkFn) {
-    if (!_cachedCheckFn(tool.checkFn, tool.name)) {
-      return { error: `${toolName} şu anda kullanılamıyor (check_fn engelledi)` };
-    }
-  }
-
-  // Sandbox restrictions for bash/shell_command
-  if (toolName === 'bash' || toolName === 'shell_command') {
-    const level = _getSandboxLevel();
-    const cmd = (args && args.command) || '';
-    if (level === 'strict' && sandbox.isNetworkCommand(cmd)) {
-      return { error: 'strict sandbox: network komutları engellendi. Daha düşük sandbox seviyesi kullanın.' };
-    }
-  }
-
-  try {
-    const result = await tool.execute(args || {});
-    return { result };
-  } catch (e) {
-    return { error: e.message || String(e) };
-  }
-}
+async function executeTool(toolName, args, toolDefs) {
+  return executeThroughGateway({
+    toolName,
+    args: args || {},
+    resolveTool: name => (toolDefs || []).find(tool => tool.name === name),
+    checkAvailability: ({ tool }) => !tool.checkFn || _cachedCheckFn(tool.checkFn, tool.name)
+      ? true
+      : { allowed: false, reason: `${toolName} şu anda kullanılamıyor (check_fn engelledi)` },
+    policyChecks: [({ args: safeArgs }) => {
+      if (toolName !== 'bash' && toolName !== 'shell_command') return true;
+      const level = _getSandboxLevel();
+      if (level === 'strict' && sandbox.isNetworkCommand(safeArgs.command || '')) {
+        return { allowed: false, reason: 'strict sandbox: network komutları engellendi. Daha düşük sandbox seviyesi kullanın.' };
+      }
+      return true;
+    }],
+  });
+}
 
 module.exports = {
   loadToolDefinitions, toOpenAIFormat, executeTool, getToolsForProvider,