foliko 1.1.92 → 2.0.0

package/plugins/{session-plugin.js → core/session/index.js}

@@ -1,20 +1,16 @@
 /**
  * Session Plugin - Session management with JSONL tree structure
- * Rewritten to use pi-style SessionManager
  */
 
-const { Plugin } = require('../src/core/plugin-base');
-const { logger } = require('../src/utils/logger');
+const { Plugin } = require('../../../src/plugin/base');
+const { logger } = require('../../../src/common/logger');
 const log = logger.child('Session');
 const { z } = require('zod');
 const { EventEmitter } = require('events');
 const path = require('path');
-const { SessionManager } = require('../src/core/session-manager');
-const { buildSessionContext, EntryTypes } = require('../src/core/session-entry');
+const { SessionManager } = require('../../../src/session/session');
+const { buildSessionContext, EntryTypes } = require('../../../src/session/entry');
 
-/**
- * Get default session directory for a cwd
- */
 function getDefaultSessionDir(cwd) {
   const agentDir = path.join(cwd, '.foliko');
   const sessionDir = path.join(agentDir, 'sessions');
@@ -44,7 +40,7 @@ class SessionPlugin extends Plugin {
     };
 
     this._framework = null;
-    this._sessionManagers = new Map(); // sessionId -> SessionManager
+    this._sessionManagers = new Map();
     this._cleanupTimer = null;
     this._events = new EventEmitter();
   }
@@ -54,16 +50,10 @@ class SessionPlugin extends Plugin {
     return this;
   }
 
-  /**
-   * 获取当前工作目录(framework.getCwd() 优先, fallback 到 process.cwd())
-   */
   _defaultCwd() {
     return this._framework?.getCwd?.() ?? process.cwd();
   }
 
-  /**
-   * Get or create a SessionManager for a session
-   */
   _getSessionManager(sessionId, cwd) {
     cwd = cwd ?? this._defaultCwd();
     if (this._sessionManagers.has(sessionId)) {
@@ -77,9 +67,6 @@ class SessionPlugin extends Plugin {
     return manager;
   }
 
-  /**
-   * List all sessions for current cwd
-   */
   async listSessions(cwd = this._defaultCwd()) {
     const sessionDir = getDefaultSessionDir(cwd);
     const sessions = [];
@@ -103,7 +90,6 @@ class SessionPlugin extends Plugin {
             leafId: manager.getLeafId()
           });
         } catch {
-          // Skip invalid session files
         }
       }
     } catch (err) {
@@ -114,7 +100,6 @@ class SessionPlugin extends Plugin {
   }
 
   start(framework) {
-    // Register session management tools
     framework.registerTool({
       name: 'session_create',
       description: '创建新会话',
@@ -304,7 +289,6 @@ class SessionPlugin extends Plugin {
       }
     });
 
-    // Start auto cleanup if enabled
     if (this.config.autoCleanup) {
       this._startAutoCleanup();
     }
@@ -312,14 +296,10 @@ class SessionPlugin extends Plugin {
     return this;
   }
 
-  /**
-   * Add message to session
-   */
   addMessage(sessionId, message, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     const entryId = manager.appendMessage(message);
 
-    // Emit session event
     if (manager.getEntries().length === 1) {
       this._events.emit('session:created', { sessionId, manager });
     }
@@ -327,72 +307,45 @@ class SessionPlugin extends Plugin {
     return entryId;
   }
 
-  /**
-   * Get session context for LLM
-   */
   getSessionContext(sessionId, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.buildSessionContext();
   }
 
-  /**
-   * Get or create session (alias for getSessionContext)
-   */
   getOrCreateSession(sessionId, options = {}, cwd = this._defaultCwd()) {
     return this.getSessionContext(sessionId, cwd);
   }
 
-  /**
-   * Get specific entry
-   */
   getEntry(sessionId, entryId, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.getEntry(entryId);
   }
 
-  /**
-   * Get branch (path from root to leaf)
-   */
   getBranch(sessionId, fromId, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.getBranch(fromId);
   }
 
-  /**
-   * Append compaction entry
-   */
   appendCompaction(sessionId, summary, firstKeptEntryId, tokensBefore, details, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, false);
   }
 
-  /**
-   * Append thinking level change
-   */
   appendThinkingLevelChange(sessionId, thinkingLevel, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.appendThinkingLevelChange(thinkingLevel);
   }
 
-  /**
-   * Append model change
-   */
   appendModelChange(sessionId, provider, modelId, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.appendModelChange(provider, modelId);
   }
 
-  /**
-   * Set session label
-   */
   setLabel(sessionId, entryId, label, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     return manager.appendLabelChange(entryId, label);
   }
 
-  /**
-   * Get session info (compatible with external callers)
-   */
   getSession(sessionId, cwd = this._defaultCwd()) {
     const manager = this._getSessionManager(sessionId, cwd);
     const entries = manager.getEntries();
@@ -403,9 +356,6 @@ class SessionPlugin extends Plugin {
     };
   }
 
-  /**
-   * Start auto cleanup timer
-   */
   _startAutoCleanup() {
     if (this._cleanupTimer) {
       clearInterval(this._cleanupTimer);
@@ -413,12 +363,8 @@ class SessionPlugin extends Plugin {
     this._cleanupTimer = setInterval(async () => {
       await this._doCleanup();
     }, this.config.cleanupInterval);
-    //log.info(`Auto cleanup started (interval: ${this.config.cleanupInterval}ms)`);
   }
 
-  /**
-   * Perform cleanup of old sessions and message history
-   */
   async _doCleanup() {
     try {
       const fs = require('fs');
@@ -437,20 +383,17 @@ class SessionPlugin extends Plugin {
         try {
           const manager = SessionManager.open(filePath, sessionDir, cwd);
           const entries = manager.getEntries();
-          
-          // Clean up if exceeds maxHistoryLength
+
           if (entries.length > this.config.maxHistoryLength) {
-            const toRemove = entries.length - this.config.maxHistoryLength;
-            // Keep session header, remove oldest entries
             const entriesToKeep = manager.fileEntries.filter(e => e.type === 'session');
             const messagesToKeep = manager.fileEntries
               .filter(e => e.type !== 'session')
               .slice(-this.config.maxHistoryLength);
-            
+
             manager.fileEntries = [...entriesToKeep, ...messagesToKeep];
             manager._rewriteFile();
             cleanedCount++;
-            log.debug(`Cleaned ${file}: removed ${toRemove} entries, kept ${this.config.maxHistoryLength}`);
+            log.debug(`Cleaned ${file}: removed ${entries.length - this.config.maxHistoryLength} entries, kept ${this.config.maxHistoryLength}`);
           }
         } catch (err) {
           log.warn(`Failed to cleanup session ${file}: ${err.message}`);
@@ -458,23 +401,16 @@ class SessionPlugin extends Plugin {
       }
 
       if (cleanedCount > 0) {
-        //log.info(`Auto cleanup completed: cleaned ${cleanedCount} sessions`);
       }
     } catch (err) {
       log.error(`Auto cleanup error: ${err.message}`);
     }
   }
 
-  /**
-   * On session event listener
-   */
   on(event, listener) {
     this._events.on(event, listener);
   }
 
-  /**
-   * Off session event listener
-   */
   off(event, listener) {
     this._events.off(event, listener);
   }
@@ -494,4 +430,4 @@ class SessionPlugin extends Plugin {
   }
 }
 
-module.exports = { SessionPlugin };
+module.exports = { SessionPlugin };

package/{src/capabilities/skill-manager.js → plugins/core/skill-manager/index.js}

@@ -5,8 +5,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const { Plugin } = require('../core/plugin-base');
-const { logger } = require('../utils/logger');
+const { Plugin } = require('../../../src/plugin/base');
+const { logger } = require('../../../src/common/logger');
 const log = logger.child('SkillManager');
 const { z } = require('zod');
 const { Command } = require('commander');
@@ -550,19 +550,29 @@ class SkillManagerPlugin extends Plugin {
             }
           }
 
-          if (!skillPath) continue;
-          if (!isValidSkillName(entry.name)) continue;
-
-          // 跳过已加载的 skill
-          if (this._skills.has(entry.name)) {
+          if (skillPath) {
+            if (!isValidSkillName(entry.name)) continue;
+            if (this._skills.has(entry.name)) continue;
+            try {
+              this._loadSkill(entry.name, skillPath);
+              totalLoaded++;
+            } catch (err) {
+              log.error(` Failed to load skill '${entry.name}':`, err.message);
+            }
             continue;
           }
 
-          try {
-            this._loadSkill(entry.name, skillPath);
-            totalLoaded++;
-          } catch (err) {
-            log.error(` Failed to load skill '${entry.name}':`, err.message);
+          // 支持直接放在 skills 目录下的 .md 文件（如 workflows/*.md）
+          if (entry.isFile() && entry.name.endsWith('.md') && entry.name !== 'SKILL.md') {
+            const skillName = path.basename(entry.name, '.md');
+            if (!isValidSkillName(skillName)) continue;
+            if (this._skills.has(skillName)) continue;
+            try {
+              this._loadSkillFromStandaloneFile(skillName, entryPath);
+              totalLoaded++;
+            } catch (err) {
+              log.error(` Failed to load skill from file '${entry.name}':`, err.message);
+            }
           }
         }
       } catch (err) {
@@ -672,6 +682,27 @@ class SkillManagerPlugin extends Plugin {
     });
   }
 
+  /**
+   * 从独立 .md 文件加载技能（直接放在 skills 目录下，无子目录）
+   */
+  _loadSkillFromStandaloneFile(name, filePath) {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const frontmatter = parseFrontmatter(content);
+
+    const metadata = new SkillMetadata({
+      name: frontmatter?.name || name,
+      description: frontmatter?.description || '',
+    });
+
+    const skill = new Skill(metadata, stripFrontmatter(content));
+    skill.install(this._framework);
+
+    this._skills.set(name, {
+      name, metadata, content: skill.content, instance: skill,
+      path: path.dirname(filePath), references: new Map(), scripts: new Map(),
+    });
+  }
+
   /**
    * 递归查找 SKILL.md 或 AGENTS.md（支持多层嵌套目录）
    * @param {string} dir - 要搜索的目录
@@ -936,27 +967,42 @@ class SkillManagerPlugin extends Plugin {
   }
 
   reload(framework) {
-    // log.info(' Reloading...');
     this._skills.clear();
-    // 清空 this.tools,避免旧 skill 命令残留(否则 setCwd 后旧 cwd 的命令会留在 _extensions 中)
     this.tools = {};
     this._loaded = false;
     this._framework = framework;
-    this._loadAllSkills();
 
-    // 通知 extension-executor 重载 skill 命令（通过监听器自动处理）
-    // 注意：skill 命令已经在 registerCommands() 中直接注册到 extension-executor，
-    // 不需要再调用 _rescanPluginTools
+    // 清理 extension-executor 中的旧 skill 命令，避免重载后残留
+    const extExecutor = framework.pluginManager?.get('extension-executor');
+    if (extExecutor) {
+      extExecutor._extensions.delete('skill');
+    }
+
+    this._loadAllSkills();
 
     // 通知 UI 刷新 skill 命令（用于 autocomplete 热重载）
     framework.emit('skill:reloaded', { skills: Array.from(this._skills.keys()) });
   }
 
+  async onCwdChanged(oldCwd, newCwd, framework) {
+    // 切换工作目录前清理旧 skill 命令
+    const extExecutor = framework.pluginManager?.get('extension-executor');
+    if (extExecutor) {
+      extExecutor._extensions.delete('skill');
+    }
+  }
+
   uninstall(framework) {
     this._skills.clear();
     this._framework = null;
     this._loaded = false;
   }
+
+  setSearchDirs(dirs) {
+    if (Array.isArray(dirs)) {
+      this._skillsDirs = dirs;
+    }
+  }
 }
 
 module.exports = {

package/plugins/{storage-plugin.js → core/storage/index.js}

@@ -3,12 +3,12 @@
  * Supports delayed compaction to reduce file size
  */
 
-const { Plugin } = require('../src/core/plugin-base');
-const { logger } = require('../src/utils/logger');
+const { Plugin } = require('../../../src/plugin/base');
+const { logger } = require('../../../src/common/logger');
 const log = logger.child('Storage');
 const { z } = require('zod');
 const path = require('path');
-const { StorageManager } = require('../src/core/storage-manager');
+const { StorageManager } = require('../../../src/storage/manager');
 
 class StoragePlugin extends Plugin {
   constructor(config = {}) {
@@ -23,7 +23,6 @@ class StoragePlugin extends Plugin {
     this.config = {
       path: config.path || '.foliko/data',
       namespace: config.namespace || 'default',
-      // Compaction 配置
       compactionThreshold: config.compactionThreshold || 1000,
       compactionIntervalMs: config.compactionIntervalMs || 5000,
       autoCompact: config.autoCompact !== false,
@@ -38,16 +37,12 @@ class StoragePlugin extends Plugin {
     return this;
   }
 
-  /**
-   * Initialize storage manager with compaction settings
-   */
   _initStorage() {
     if (this._storageManager) return;
 
     const baseDir = path.resolve(this._framework?.getCwd?.() ?? process.cwd(), this.config.path);
     const filePath = path.join(baseDir, `${this.config.namespace}.jsonl`);
 
-    // 传递 compaction 配置
     this._storageManager = new StorageManager(filePath, true, {
       compactionThreshold: this.config.compactionThreshold,
       compactionIntervalMs: this.config.compactionIntervalMs,
@@ -55,25 +50,16 @@ class StoragePlugin extends Plugin {
     });
   }
 
-  /**
-   * Get storage store (for internal use)
-   */
   getStore() {
     this._initStorage();
     return this._storageManager;
   }
 
-  /**
-   * Set value directly (for internal use by other plugins)
-   */
   setDirect(key, value) {
     this._initStorage();
     return this._storageManager.set(key, value);
   }
 
-  /**
-   * Delete key directly (for internal use by other plugins)
-   */
   deleteDirect(key) {
     this._initStorage();
     return this._storageManager.delete(key);
@@ -82,7 +68,6 @@ class StoragePlugin extends Plugin {
   start(framework) {
     this._initStorage();
 
-    // Register storage tools
     framework.registerTool({
       name: 'storage_set',
       description: '存储数据到键值存储',
@@ -96,7 +81,7 @@ class StoragePlugin extends Plugin {
           this._initStorage();
           const ns = args.namespace ? `${args.namespace}:` : '';
           const fullKey = `${ns}${args.key}`;
-          const entry = this._storageManager.set(fullKey, args.value);
+          this._storageManager.set(fullKey, args.value);
 
           return {
             success: true,
@@ -244,11 +229,6 @@ class StoragePlugin extends Plugin {
       }
     });
 
-    /**
-     * 新增: 手动触发 compaction
-     * 当 tombstone 数量达到阈值时，compaction 会自动在后台执行
-     * 此工具可手动触发 compaction 立即清理
-     */
     framework.registerTool({
       name: 'storage_compact',
       description: '手动触发 compaction，清理已删除的墓碑记录并重写文件',
@@ -258,7 +238,6 @@ class StoragePlugin extends Plugin {
       execute: async (args) => {
         try {
           this._initStorage();
-
           const result = await this._storageManager.compact();
 
           return {
@@ -276,9 +255,6 @@ class StoragePlugin extends Plugin {
       }
     });
 
-    /**
-     * 新增: 获取存储统计信息
-     */
     framework.registerTool({
       name: 'storage_stats',
       description: '获取存储统计信息，包括条目数、墓碑数量、compaction 配置等',
@@ -321,4 +297,4 @@ class StoragePlugin extends Plugin {
   }
 }
 
-module.exports = { StoragePlugin };
+module.exports = { StoragePlugin };