natureco-cli 2.23.4 → 2.23.5

package/src/utils/sessions.js

@@ -1,109 +1,170 @@
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-function getSessionsDir(botId) {
-  return path.join(os.homedir(), '.natureco', 'history', botId, 'sessions');
-}
-
-function ensureSessionsDir(botId) {
-  const dir = getSessionsDir(botId);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-}
-
-function createSession(botId, botName) {
-  ensureSessionsDir(botId);
-  
-  const sessionId = Date.now().toString(36) + Math.random().toString(36).slice(2, 7);
-  const session = {
-    id: sessionId,
-    botId,
-    botName,
-    createdAt: new Date().toISOString(),
-    messages: [],
-  };
-  
-  saveSession(botId, session);
-  return session;
-}
-
-function saveSession(botId, session) {
-  ensureSessionsDir(botId);
-  const sessionFile = path.join(getSessionsDir(botId), `${session.id}.json`);
-  fs.writeFileSync(sessionFile, JSON.stringify(session, null, 2), 'utf-8');
-}
-
-function loadSession(botId, sessionId) {
-  const sessionFile = path.join(getSessionsDir(botId), `${sessionId}.json`);
-  if (!fs.existsSync(sessionFile)) {
-    return null;
-  }
-  try {
-    const data = fs.readFileSync(sessionFile, 'utf-8');
-    return JSON.parse(data);
-  } catch {
-    return null;
-  }
-}
-
-function getLatestSession(botId) {
-  ensureSessionsDir(botId);
-  const sessionsDir = getSessionsDir(botId);
-  const files = fs.readdirSync(sessionsDir).filter(f => f.endsWith('.json'));
-  
-  if (files.length === 0) return null;
-  
-  // Sort by modification time
-  const sorted = files
-    .map(f => ({
-      file: f,
-      mtime: fs.statSync(path.join(sessionsDir, f)).mtime.getTime(),
-    }))
-    .sort((a, b) => b.mtime - a.mtime);
-  
-  const latestFile = sorted[0].file;
-  const sessionId = path.basename(latestFile, '.json');
-  return loadSession(botId, sessionId);
-}
-
-function listSessions(botId) {
-  ensureSessionsDir(botId);
-  const sessionsDir = getSessionsDir(botId);
-  const files = fs.readdirSync(sessionsDir).filter(f => f.endsWith('.json'));
-  
-  const sessions = files.map(f => {
-    const sessionId = path.basename(f, '.json');
-    const session = loadSession(botId, sessionId);
-    return session;
-  }).filter(Boolean);
-  
-  // Sort by creation time
-  sessions.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-  
-  return sessions;
-}
-
-function addMessageToSession(botId, sessionId, userMessage, botReply) {
-  const session = loadSession(botId, sessionId);
-  if (!session) return false;
-  
-  session.messages.push({
-    user: userMessage,
-    bot: botReply,
-    timestamp: new Date().toISOString(),
-  });
-  
-  saveSession(botId, session);
-  return true;
-}
-
-module.exports = {
-  createSession,
-  saveSession,
-  loadSession,
-  getLatestSession,
-  listSessions,
-  addMessageToSession,
-};
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+// ── Legacy botId-based sessions ─────────────────────────────────────────────────
+
+const HISTORY_DIR = path.join(os.homedir(), '.natureco', 'history');
+
+function getSessionsDir(botId) {
+  return path.join(HISTORY_DIR, botId, 'sessions');
+}
+
+function ensureSessionsDir(botId) {
+  const dir = getSessionsDir(botId);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+}
+
+function createSession(botId, botName) {
+  ensureSessionsDir(botId);
+
+  const sessionId = Date.now().toString(36) + Math.random().toString(36).slice(2, 7);
+  const session = {
+    id: sessionId,
+    botId,
+    botName,
+    createdAt: new Date().toISOString(),
+    messages: [],
+  };
+
+  _saveBotSession(botId, session);
+  return session;
+}
+
+function _saveBotSession(botId, session) {
+  ensureSessionsDir(botId);
+  const sessionFile = path.join(getSessionsDir(botId), `${session.id}.json`);
+  fs.writeFileSync(sessionFile, JSON.stringify(session, null, 2), 'utf-8');
+}
+
+function loadSession(botId, sessionId) {
+  const sessionFile = path.join(getSessionsDir(botId), `${sessionId}.json`);
+  if (!fs.existsSync(sessionFile)) {
+    return null;
+  }
+  try {
+    const data = fs.readFileSync(sessionFile, 'utf-8');
+    return JSON.parse(data);
+  } catch {
+    return null;
+  }
+}
+
+function getLatestSession(botId) {
+  ensureSessionsDir(botId);
+  const sessionsDir = getSessionsDir(botId);
+  const files = fs.readdirSync(sessionsDir).filter(f => f.endsWith('.json'));
+
+  if (files.length === 0) return null;
+
+  const sorted = files
+    .map(f => ({
+      file: f,
+      mtime: fs.statSync(path.join(sessionsDir, f)).mtime.getTime(),
+    }))
+    .sort((a, b) => b.mtime - a.mtime);
+
+  const latestFile = sorted[0].file;
+  const sessionId = path.basename(latestFile, '.json');
+  return loadSession(botId, sessionId);
+}
+
+function listSessionsForBot(botId) {
+  ensureSessionsDir(botId);
+  const sessionsDir = getSessionsDir(botId);
+  const files = fs.readdirSync(sessionsDir).filter(f => f.endsWith('.json'));
+
+  const sessions = files.map(f => {
+    const sessionId = path.basename(f, '.json');
+    return loadSession(botId, sessionId);
+  }).filter(Boolean);
+
+  sessions.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
+
+  return sessions;
+}
+
+function addMessageToSession(botId, sessionId, userMessage, botReply) {
+  const session = loadSession(botId, sessionId);
+  if (!session) return false;
+
+  session.messages.push({
+    user: userMessage,
+    bot: botReply,
+    timestamp: new Date().toISOString(),
+  });
+
+  _saveBotSession(botId, session);
+  return true;
+}
+
+// ── Command-based sessions ──────────────────────────────────────────────────────
+
+const SESSIONS_DIR = path.join(os.homedir(), '.natureco', 'sessions');
+
+function saveSession(commandName, messages, metadata = {}) {
+  if (!fs.existsSync(SESSIONS_DIR)) {
+    fs.mkdirSync(SESSIONS_DIR, { recursive: true });
+  }
+  const id = Date.now().toString(36);
+  const filename = path.join(SESSIONS_DIR, `${commandName}-${id}.json`);
+  fs.writeFileSync(filename, JSON.stringify({
+    id, commandName, messages, metadata,
+    savedAt: new Date().toISOString()
+  }, null, 2));
+  return filename;
+}
+
+function loadLastSession(commandName) {
+  if (!fs.existsSync(SESSIONS_DIR)) return null;
+  const files = fs.readdirSync(SESSIONS_DIR)
+    .filter(f => f.startsWith(commandName + '-') && f.endsWith('.json'))
+    .sort()
+    .reverse();
+  if (!files.length) return null;
+  return JSON.parse(
+    fs.readFileSync(path.join(SESSIONS_DIR, files[0]), 'utf8')
+  );
+}
+
+function listSessions(commandName) {
+  if (!fs.existsSync(SESSIONS_DIR)) return [];
+  return fs.readdirSync(SESSIONS_DIR)
+    .filter(f => !commandName || f.startsWith(commandName + '-'))
+    .map(f => {
+      const data = JSON.parse(
+        fs.readFileSync(path.join(SESSIONS_DIR, f), 'utf8')
+      );
+      return {
+        id: data.id,
+        commandName: data.commandName,
+        savedAt: data.savedAt,
+        messageCount: data.messages.length,
+        preview: data.messages
+          .find(m => m.role === 'user')?.content?.slice(0, 60)
+      };
+    })
+    .sort((a, b) => b.savedAt.localeCompare(a.savedAt));
+}
+
+function deleteSession(id) {
+  if (!fs.existsSync(SESSIONS_DIR)) return false;
+  const files = fs.readdirSync(SESSIONS_DIR)
+    .filter(f => f.includes(id));
+  files.forEach(f => fs.unlinkSync(path.join(SESSIONS_DIR, f)));
+  return files.length > 0;
+}
+
+module.exports = {
+  createSession,
+  loadSession,
+  getLatestSession,
+  listSessionsForBot,
+  addMessageToSession,
+  saveSession,
+  loadLastSession,
+  listSessions,
+  deleteSession,
+};

package/src/utils/skills.js

@@ -6,7 +6,20 @@ const { CONFIG_DIR } = require('./config');
 
 const BUILTIN_SKILLS_DIR = path.join(__dirname, '..', '..', 'skills');
 const USER_SKILLS_DIR = path.join(CONFIG_DIR, 'skills');
-const PROJECT_SKILLS_DIR = path.join(process.cwd(), '.natureco', 'skills');
+
+function getProjectSkillsDir() {
+  return path.join(process.cwd(), '.natureco', 'skills');
+}
+
+// Scan built-in skill slugs at module load time
+let BUILTIN_SKILL_SLUGS = [];
+try {
+  if (fs.existsSync(BUILTIN_SKILLS_DIR)) {
+    BUILTIN_SKILL_SLUGS = fs.readdirSync(BUILTIN_SKILLS_DIR, { withFileTypes: true })
+      .filter(d => d.isDirectory())
+      .map(d => d.name);
+  }
+} catch {}
 
 // Skill metadata parser
 function parseSkillMetadata(content) {
@@ -120,12 +133,13 @@ function getSkills() {
   }
 
   // Project skills
-  if (fs.existsSync(PROJECT_SKILLS_DIR)) {
-    const projectDirs = fs.readdirSync(PROJECT_SKILLS_DIR, { withFileTypes: true })
+  const projectSkillsDir = getProjectSkillsDir();
+  if (fs.existsSync(projectSkillsDir)) {
+    const projectDirs = fs.readdirSync(projectSkillsDir, { withFileTypes: true })
       .filter(d => d.isDirectory());
     
     for (const dir of projectDirs) {
-      const skillFile = path.join(PROJECT_SKILLS_DIR, dir.name, 'SKILL.md');
+      const skillFile = path.join(projectSkillsDir, dir.name, 'SKILL.md');
       if (fs.existsSync(skillFile)) {
         const content = fs.readFileSync(skillFile, 'utf8');
         const metadata = parseSkillMetadata(content);
@@ -134,7 +148,7 @@ function getSkills() {
             ...metadata,
             slug: dir.name,
             source: 'project',
-            path: path.join(PROJECT_SKILLS_DIR, dir.name),
+            path: path.join(projectSkillsDir, dir.name),
           });
         }
       }
@@ -202,12 +216,15 @@ async function installSkill(slug) {
   }
 }
 
-// Remove skill (from user, project, or builtin)
+// Remove skill (from user or project — built-in skills cannot be removed)
 function removeSkill(slug) {
+  if (BUILTIN_SKILL_SLUGS.includes(slug)) {
+    throw new Error(`Built-in skill "${slug}" silinemez`);
+  }
+
   const candidates = [
     { path: path.join(USER_SKILLS_DIR, slug), label: 'user' },
-    { path: path.join(PROJECT_SKILLS_DIR, slug), label: 'project' },
-    { path: path.join(BUILTIN_SKILLS_DIR, slug), label: 'builtin' },
+    { path: path.join(getProjectSkillsDir(), slug), label: 'project' },
   ];
 
   for (const { path: skillPath, label } of candidates) {

package/src/utils/tool-runner.js

@@ -84,6 +84,7 @@ function getToolDefinitions() {
 
 // ── Execute a single tool ─────────────────────────────────────────────────────
 async function executeTool(toolName, params, opts = {}) {
+  const safeParams = params ?? {};
   const tools = loadTools();
   const tool = tools[toolName];
   const agentMode = opts.agentMode || false;
@@ -92,28 +93,28 @@ async function executeTool(toolName, params, opts = {}) {
     return { success: false, error: `Tool '${toolName}' not found` };
   }
 
-  const label = `${toolName}${params.path ? ' — ' + params.path : params.command ? ' — ' + params.command : ''}`;
+  const label = `${toolName}${safeParams.path ? ' — ' + safeParams.path : safeParams.command ? ' — ' + safeParams.command : ''}`;
 
   // ── Onay mekanizması (write_file ve tehlikeli bash) ───────────────────────
   if (agentMode) {
     const needsConfirm =
       toolName === 'write_file' ||
-      (toolName === 'bash' && /\b(rm|mv|cp|chmod|chown|dd|mkfs|truncate)\b/.test(params.command || ''));
+      (toolName === 'bash' && /\b(rm|mv|cp|chmod|chown|dd|mkfs|truncate)\b/.test(safeParams.command || ''));
 
     if (needsConfirm) {
       if (toolName === 'write_file') {
         // Diff göster
         let oldContent = '';
-        try { oldContent = fs.readFileSync(path.resolve(params.path), 'utf-8'); } catch {}
-        showDiff(oldContent, params.content || '', params.path);
+        try { oldContent = fs.readFileSync(path.resolve(safeParams.path), 'utf-8'); } catch {}
+        showDiff(oldContent, safeParams.content || '', safeParams.path);
       } else {
-        console.log(chalk.yellow(`\n  🖥️  Komut: ${chalk.white(params.command)}\n`));
+        console.log(chalk.yellow(`\n  🖥️  Komut: ${chalk.white(safeParams.command)}\n`));
       }
 
       const { confirm } = await inquirer.prompt([{
         type: 'confirm',
         name: 'confirm',
-        message: chalk.yellow(`  ${toolName === 'write_file' ? `✏️  ${params.path} dosyası değiştirilecek` : '⚠️  Bu komut çalıştırılacak'}. Onaylıyor musun?`),
+        message: chalk.yellow(`  ${toolName === 'write_file' ? `✏️  ${safeParams.path} dosyası değiştirilecek` : '⚠️  Bu komut çalıştırılacak'}. Onaylıyor musun?`),
         default: true,
       }]);
 
@@ -127,7 +128,7 @@ async function executeTool(toolName, params, opts = {}) {
   // ── Spinner ile çalıştır ──────────────────────────────────────────────────
   const spinner = startSpinner(label);
   try {
-    const result = await tool.execute(params);
+    const result = await tool.execute(safeParams);
     stopSpinner(spinner, label, result.success !== false);
 
     // İstatistik güncelle