foliko 2.0.2 → 2.0.4

package/src/plugin/base.js

@@ -20,10 +20,30 @@ class Plugin {
 
   _framework = null;
   _subAgents = [];
-  _promptParts = [];
-  _deferredPromptParts = null;
   tools = {};
 
+  /**
+   * 声明式 prompt parts（推荐使用，替代 start() 中的 registerPromptPart 调用）
+   *
+   * 用法：
+   *   prompts = [
+   *     {
+   *       name: 'my-part',
+   *       slot: 'BEHAVIOR',       // 可选，PROMPT_SLOT 中的一个；默认 CUSTOM
+   *       order: 50,              // 可选，覆盖 slot 默认 order
+   *       description: '描述',     // 可选
+   *       provider() {            // 'this' 绑定到 plugin 实例；不要用箭头函数
+   *         return this._buildSomething();
+   *       },
+   *     },
+   *   ];
+   *
+   * 生命周期：
+   *   - Plugin.start() 时自动注册到 framework.prompts
+   *   - Plugin.uninstall() / Plugin.reload() 时自动清理（clearOwner(this.name)）
+   */
+  prompts = [];
+
   install(framework) {
     this._framework = framework;
     return this;
@@ -56,9 +76,51 @@ class Plugin {
 
   start(framework) {
     this._autoRegisterSubAgents();
+    this._autoRegisterPrompts();
     return this;
   }
 
+  /**
+   * 自动注册 this.prompts 声明的所有 part 到 framework.prompts
+   * - 失败一个不影响其他
+   * - 'this' 在 provider 中绑定到 plugin 实例（必须用普通 function，箭头函数的 this 是词法的）
+   */
+  _autoRegisterPrompts() {
+    const reg = this._framework?.prompts;
+    if (!reg) return;
+    if (!Array.isArray(this.prompts) || this.prompts.length === 0) return;
+
+    for (const entry of this.prompts) {
+      if (!entry || !entry.name || typeof entry.provider !== 'function') {
+        log.warn(`[${this.name}] Invalid prompt entry: missing name or provider`);
+        continue;
+      }
+      try {
+        // bind 让 provider 中的 this 指向 plugin 实例
+        const boundProvider = entry.provider.bind(this);
+        reg.register(this.name, entry.name, boundProvider, {
+          slot: entry.slot,
+          order: entry.order,
+          description: entry.description,
+        });
+      } catch (err) {
+        log.error(`[${this.name}] Failed to register prompt part "${entry.name}":`, err.message);
+      }
+    }
+  }
+
+  /**
+   * 清理当前 plugin 在 framework.prompts 中注册的所有 part
+   */
+  _cleanupPrompts() {
+    const reg = this._framework?.prompts;
+    if (!reg) return;
+    const removed = reg.clearOwner(this.name);
+    if (removed > 0) {
+      log.debug(`[${this.name}] cleared ${removed} prompt part(s)`);
+    }
+  }
+
   _autoRegisterSubAgents() {
     const agentsToRegister = this._deferredSubAgents || this.agents;
     if (!agentsToRegister || !Array.isArray(agentsToRegister) || agentsToRegister.length === 0) {
@@ -139,15 +201,10 @@ class Plugin {
   reload(framework) {
     this._framework = framework;
     this._deferredSubAgents = null;
-    this._deferredPromptParts = null;
 
-    for (const part of this._promptParts) {
-      try {
-        framework._mainAgent?.registerPromptPart(part.name, part.priority, part.provider);
-      } catch (err) {
-        log.error(` Failed to re-register prompt part ${part.name}:`, err.message);
-      }
-    }
+    // 先清理旧的，再重新注册 declarative prompts
+    this._cleanupPrompts();
+    this._autoRegisterPrompts();
 
     this._autoRegisterSubAgents();
   }
@@ -157,15 +214,8 @@ class Plugin {
   }
 
   uninstall(framework) {
-    for (const part of this._promptParts) {
-      try {
-        framework._mainAgent?.unregisterPromptPart(part.name);
-      } catch (err) {
-        // ignore
-      }
-    }
-    this._promptParts = [];
-    this._deferredPromptParts = null;
+    // 清理 framework.prompts 中该插件注册的所有 part
+    this._cleanupPrompts();
 
     for (const plugin of this._subAgents) {
       try {
@@ -178,42 +228,6 @@ class Plugin {
     this._framework = null;
   }
 
-  registerPromptPart(name, priority = 100, provider) {
-    if (!this._framework) return;
-
-    this._promptParts.push({ name, priority, provider });
-
-    const mainAgent = this._framework.getMainAgent();
-    if (mainAgent) {
-      mainAgent.registerPromptPart(name, priority, provider);
-      this._framework.syncPromptPartsToSubagents();
-      return;
-    }
-
-    if (!this._deferredPromptParts) {
-      this._deferredPromptParts = [];
-    }
-    this._deferredPromptParts.push({ name, priority, provider });
-
-    const alreadyListening = this._framework._events?.['framework:ready']?.length > 0;
-    this._framework.once('framework:ready', () => {
-      setTimeout(() => {
-        if (this._deferredPromptParts) {
-          for (const part of this._deferredPromptParts) {
-            try {
-              const mainAgent = this._framework.getMainAgent();
-              mainAgent?.registerPromptPart(part.name, part.priority, part.provider);
-            } catch (err) {
-              log.error(` Failed to register prompt part ${part.name}:`, err.message);
-            }
-          }
-          this._deferredPromptParts = null;
-          this._framework.syncPromptPartsToSubagents();
-        }
-      }, 100);
-    });
-  }
-
   getInfo() {
     return {
       name: this.name,

package/src/plugin/loader.js

@@ -5,66 +5,10 @@
  */
 
 const path = require('path');
-const fs = require('fs');
+const { resolvePluginPath, scanPluginNames } = require('../utils/plugin-helpers');
 const { logger } = require('../common/logger');
 const log = logger.child('plugin-loader');
 
-/**
- * Resolve plugin path from name
- * @param {string} pluginName
- * @param {Object} options
- * @returns {string|null}
- */
-function resolvePluginPath(pluginName, options = {}) {
-  const { pluginDirs = [], searchPaths = [] } = options;
-
-  // Check explicit paths first
-  const allPaths = [...pluginDirs, ...searchPaths];
-  for (const dir of allPaths) {
-    const fullPath = path.resolve(dir, pluginName);
-    if (fs.existsSync(fullPath)) {
-      return fullPath;
-    }
-    const indexJs = path.join(fullPath, 'index.js');
-    if (fs.existsSync(indexJs)) {
-      return fullPath;
-    }
-  }
-
-  // Check node_modules
-  try {
-    const resolved = require.resolve(pluginName);
-    return resolved;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Scan directory for plugin names
- * @param {string} dir
- * @returns {string[]}
- */
-function scanPluginNames(dir) {
-  if (!fs.existsSync(dir)) return [];
-
-  try {
-    return fs.readdirSync(dir)
-      .filter(f => {
-        const fullPath = path.join(dir, f);
-        const stat = fs.statSync(fullPath);
-        if (stat.isDirectory()) {
-          return fs.existsSync(path.join(fullPath, 'index.js'));
-        }
-        return f.endsWith('.js');
-      })
-      .map(f => f.replace(/\.js$/, ''));
-  } catch (err) {
-    log.warn(`Failed to scan plugin directory ${dir}: ${err.message}`);
-    return [];
-  }
-}
-
 /**
  * Load a plugin from a file path
  * @param {string} pluginPath

package/src/session/chat.js

@@ -225,7 +225,7 @@ class ChatSession extends EventEmitter {
           messageStore.messages = messages;
           messageStore.historyLoaded = true;
           messageStore._hasMoreHistory = allMessages.length > MAX_INITIAL_LOAD;
-          logger.debug(`Loaded ${messages.length} msgs for session ${sessionId} (total: ${allMessages.length})`);
+          //logger.debug(`Loaded ${messages.length} msgs for session ${sessionId} (total: ${allMessages.length})`);
         }
       }
     }

package/src/session/entry.js

@@ -4,6 +4,7 @@
  */
 
 const { randomUUID } = require('crypto');
+const { generateEntryId } = require('../common/id');
 
 /**
  * Entry types for session tree entries
@@ -21,17 +22,6 @@ const EntryTypes = {
   LEAF: 'leaf'
 };
 
-/**
- * Generate a unique short ID (8 hex chars, collision-checked)
- */
-function generateEntryId(byId) {
-  for (let i = 0; i < 100; i++) {
-    const id = randomUUID().slice(0, 8);
-    if (!byId.has(id)) return id;
-  }
-  return randomUUID();
-}
-
 /**
  * Generate UUID v7 for session IDs
  */

package/src/storage/manager.js

@@ -5,18 +5,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { randomUUID } = require('crypto');
-
-/**
- * Generate unique entry ID
- */
-function generateEntryId(existingIds) {
-  for (let i = 0; i < 100; i++) {
-    const id = randomUUID().slice(0, 8);
-    if (!existingIds.has(id)) return id;
-  }
-  return randomUUID();
-}
+const { generateEntryId } = require('../common/id');
 
 class StorageEntry {
   constructor(key, value, timestamp) {

package/src/tool/executor.js

@@ -35,7 +35,7 @@ class ToolExecutor extends EventEmitter {
       return;
     }
     this._tools.set(tool.name, tool);
-    logger.debug('ToolExecutor', `Registered tool: ${tool.name}`);
+    //logger.debug('ToolExecutor', `Registered tool: ${tool.name}`);
   }
 
   unregisterTool(name) {
@@ -71,7 +71,8 @@ class ToolExecutor extends EventEmitter {
   }
 
   validateToolCalls(messages) {
-    return validateToolCalls(messages);
+    const registeredTools = new Set(this._tools.keys());
+    return validateToolCalls(messages, { availableTools: registeredTools });
   }
 
   getStats() {

package/src/tool/router.js

@@ -23,7 +23,7 @@ const INTENT_PATTERNS = {
       '写代码', '开发', '编程', '创建插件', '编写函数',
       'code', 'develop', 'plugin', '编程',
     ],
-    tools: ['loadSkill', 'read_file', 'write_file', 'execute_command', 'shell'],
+    tools: ['skill_load', 'read_file', 'write_file', 'execute_command', 'shell_exec'],
   },
   system_info: {
     keywords: [
@@ -34,19 +34,19 @@ const INTENT_PATTERNS = {
   },
   data_analysis: {
     keywords: ['分析', '数据', '统计', '查询', 'analyze', 'data', 'statistics', 'query'],
-    tools: ['execute_command', 'python', 'search_file'],
+    tools: ['execute_command', 'py_execute', 'search_file'],
   },
   plugin_management: {
     keywords: ['插件', '重载', '加载插件', 'plugin', 'reload', 'load plugin'],
-    tools: ['reload_plugins', 'list_plugins', 'loadSkill'],
+    tools: ['reload_plugins', 'list_plugins', 'skill_load'],
   },
   shell_command: {
     keywords: ['命令', '终端', 'shell', '执行', 'command', 'terminal', 'bash', 'cmd'],
-    tools: ['shell', 'powershell', 'execute_command'],
+    tools: ['shell_exec', 'powershell', 'execute_command'],
   },
   skill_usage: {
     keywords: ['技能', 'skill', '使用技能', '加载技能'],
-    tools: ['loadSkill'],
+    tools: ['skill_load'],
   },
   scheduling: {
     keywords: [

package/src/utils/data-splitter.js

@@ -168,13 +168,14 @@ class DataSplitter {
     const processChunk = async (chunk) => {
       const chunkIndex = chunk.index;
 
-      // 为当前块创建子 Agent
+      // 为当前块创建子 Agent（隐藏，不在指令系统中显示）
       const subagent = this.framework.createSubAgent({
         name: `${agentName}-chunk-${chunkIndex}`,
         role: agentRole,
         systemPrompt: `你是${agentRole}，负责处理大数据中的第 ${chunkIndex + 1}/${totalChunks} 块。`,
         maxRetries: this.maxRetries,
         disableTools: true, // 分拆处理只做文本分析，不需要额外工具
+        hidden: true, // 隐藏子Agent，不在指令系统中显示
       });
 
       try {

package/src/utils/index.js

@@ -47,6 +47,80 @@ const {
   combineBoundaries,
 } = require('../common/errors');
 
+/**
+ * 解析 YAML frontmatter
+ * @param {string} content
+ * @returns {Object|null}
+ */
+function parseFrontmatter(content) {
+  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!match) return null;
+
+  const frontmatter = {};
+  const lines = match[1].split('\n');
+  let currentKey = null;
+
+  for (const line of lines) {
+    // 处理 metadata 嵌套
+    if (currentKey === 'metadata') {
+      if (line.match(/^ {2}[a-zA-Z]/)) {
+        const colonIndex = line.indexOf(':');
+        if (colonIndex > 0) {
+          const key = line.substring(2, colonIndex).trim();
+          const value = line
+            .substring(colonIndex + 1)
+            .trim()
+            .replace(/^["']|["']$/g, '');
+          frontmatter[currentKey][key] = value;
+          continue;
+        }
+      } else if (line.match(/^[a-zA-Z]/)) {
+        currentKey = null;
+        continue;
+      }
+    }
+
+    const colonIndex = line.indexOf(':');
+    if (colonIndex === -1) continue;
+
+    const key = line.substring(0, colonIndex).trim();
+    let value = line.substring(colonIndex + 1).trim();
+
+    // 移除引号
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+
+    if (key === 'metadata') {
+      currentKey = 'metadata';
+      frontmatter.metadata = {};
+    } else if (key === 'allowed-tools' || key === 'skills' || key === 'tools' || key === 'tags') {
+      // 去除首尾空白和方括号
+      value = value.trim().replace(/^\[|\]$/g, '');
+      frontmatter[key] = value
+        .split(',')
+        .map((v) => v.trim().replace(/^["']|["']$/g, ''))
+        .filter(Boolean);
+    } else {
+      frontmatter[key] = value;
+    }
+  }
+
+  return frontmatter;
+}
+
+/**
+ * 移除 frontmatter，只保留正文内容
+ * @param {string} content
+ * @returns {string}
+ */
+function stripFrontmatter(content) {
+  return content.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n/, '');
+}
+
 /**
  * 清理 LLM 回复中的思考标记
  * @param {string} text
@@ -530,6 +604,8 @@ module.exports = {
   // 工具函数
   cleanResponse,
   safeJsonParse,
+  parseFrontmatter,
+  stripFrontmatter,
   deepClone,
   debounce,
   throttle,
@@ -539,4 +615,78 @@ module.exports = {
 
   // Edit/Diff
   editDiff: require('../common/diff'),
+
+  // 插件发布/安装相关
+  DEFAULT_REPO: 'https://github.com/chnak/foliko-plugins.git',
+
+  IGNORE_PATTERNS: [
+    'node_modules',
+    '.git',
+    '.env',
+    '.DS_Store',
+    'Thumbs.db',
+    '*.log',
+    '*.lock',
+    '*.bak',
+    '.claude',
+    '.foliko',
+    'examples',
+    'dist',
+    'build',
+    'coverage',
+    'tests',
+    '__tests__',
+    '*.test.js',
+    '*.spec.js',
+    'package-lock.json',
+    'yarn.lock',
+    'pnpm-lock.yaml',
+  ],
+
+  shouldIgnore(name) {
+    return this.IGNORE_PATTERNS.some((pattern) => {
+      if (pattern.startsWith('*.')) {
+        return name.endsWith(pattern.slice(1));
+      }
+      return name === pattern;
+    });
+  },
+
+  copyDirRecursive(src, dest) {
+    const fs = require('fs');
+    if (!fs.existsSync(src)) return;
+    fs.mkdirSync(dest, { recursive: true });
+    const entries = fs.readdirSync(src, { withFileTypes: true });
+    for (const entry of entries) {
+      const srcPath = path.join(src, entry.name);
+      const destPath = path.join(dest, entry.name);
+      if (this.shouldIgnore(entry.name)) continue;
+      if (entry.isDirectory()) {
+        this.copyDirRecursive(srcPath, destPath);
+      } else {
+        fs.copyFileSync(srcPath, destPath);
+      }
+    }
+  },
+
+  parseGitUrl(url) {
+    const patterns = [
+      /^https:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/,
+      /^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/,
+    ];
+    for (const pattern of patterns) {
+      const match = url.match(pattern);
+      if (match) return { owner: match[1], repo: match[2] };
+    }
+    return null;
+  },
+
+  gitCommand(args, cwd) {
+    const { execSync } = require('child_process');
+    try {
+      return execSync(`git ${args}`, { cwd, encoding: 'utf-8', stdio: 'pipe' });
+    } catch (err) {
+      return err.stdout || err.stderr || '';
+    }
+  },
 };

package/src/utils/message-validator.js

@@ -53,24 +53,28 @@ function validateMessagesPairing(messages, options = {}) {
   let removedToolResultCount = 0;
 
   for (const msg of messages) {
-    if (msg.role !== 'tool' || !Array.isArray(msg.content)) continue;
+    if (msg.role !== 'tool') continue;
 
-    const originalLength = msg.content.length;
-    msg.content = msg.content.filter((item) => {
-      if (
-        item &&
-        (item.type === 'tool-result' || item.type === 'tool_result') &&
-        item.toolCallId &&
-        !validToolCallIds.has(item.toolCallId)
-      ) {
-        removedToolResultCount++;
-        return false;
+    if (Array.isArray(msg.content)) {
+      const originalLength = msg.content.length;
+      msg.content = msg.content.filter((item) => {
+        if (
+          item &&
+          (item.type === 'tool-result' || item.type === 'tool_result') &&
+          item.toolCallId &&
+          !validToolCallIds.has(item.toolCallId)
+        ) {
+          removedToolResultCount++;
+          return false;
+        }
+        return true;
+      });
+      // content 全被删除了，标记整个消息待删除
+      if (msg.content.length === 0 && originalLength > 0) {
+        msg._orphaned = true;
       }
-      return true;
-    });
-
-    // content 全被删除了，标记整个消息待删除
-    if (msg.content.length === 0 && originalLength > 0) {
+    } else if (msg.tool_call_id && !validToolCallIds.has(msg.tool_call_id)) {
+      // OpenAI 兼容格式：整条消息无对应 tool_calls，标记为 orphaned
       msg._orphaned = true;
     }
   }
@@ -280,4 +284,4 @@ module.exports = {
   validateToolCalls,
   validateAll,
   filterPairedMessages,
-};
+};

package/src/utils/plugin-helpers.js

@@ -70,15 +70,20 @@ function resolvePluginPath(pluginsDir, name, options = {}) {
 }
 
 /**
- * 扫描插件目录，返回所有插件名称
+ * 扫描插件目录，返回所有插件名称（支持嵌套目录）
  * @param {string} pluginsDir - 插件目录
+ * @param {string} baseDir - 基础目录（用于计算相对路径）
  * @returns {string[]} 插件名称列表
  */
-function scanPluginNames(pluginsDir) {
+function scanPluginNames(pluginsDir, baseDir = null) {
   if (!fs.existsSync(pluginsDir)) {
     return [];
   }
 
+  if (baseDir === null) {
+    baseDir = pluginsDir;
+  }
+
   // 忽略的目录/文件（无意义或系统文件）
   const IGNORE_PATTERNS = new Set([
     '__pycache__',
@@ -105,13 +110,22 @@ function scanPluginNames(pluginsDir) {
     const isDir = entry.isSymbolicLink() ? isDirectory(fullPath) : entry.isDirectory();
 
     if (isDir) {
-      // 文件夹插件（包括 Junction 和 Symbolic Link）
-      names.add(entry.name);
+      const indexPath = path.join(fullPath, 'index.js');
+      if (fs.existsSync(indexPath)) {
+        // 这是一个插件目录
+        const relativePath = path.relative(baseDir, fullPath);
+        names.add(relativePath.replace(/\\/g, '/'));
+      } else {
+        // 不是插件目录，递归扫描子目录
+        const subNames = scanPluginNames(fullPath, baseDir);
+        subNames.forEach(n => names.add(n));
+      }
     } else if (entry.isFile() && entry.name.endsWith('.js')) {
       // 单文件插件（排除与文件夹同名的）
       const baseName = entry.name.replace(/\.js$/, '');
       if (!names.has(baseName)) {
-        names.add(baseName);
+        const relativePath = path.relative(baseDir, fullPath);
+        names.add(relativePath.replace(/\\/g, '/').replace(/\.js$/, ''));
       }
     }
   }

package/subagent.md

@@ -111,7 +111,7 @@
 ## 【Extensions】扩展插件
 
 **使用流程（必须按顺序执行）：**
-1. 调用  `ext_skill({ plugin: "<plugin_name>" })` 或 `loadSkill({ skill: "<skill_name>" })` 获取目标扩展的详细工具参数
+1. 调用  `ext_skill({ plugin: "<plugin_name>" })` 或 `skill_load({ skill: "<skill_name>" })` 获取目标扩展的详细工具参数
 2. 根据返回的参数定义，使用 `ext_call({ plugin, tool, args })` 调用扩展
 
 > **警告**：禁止在未执行第1步获取参数的情况下直接调用 `ext_call`！
@@ -167,4 +167,4 @@ MCP (Model Context Protocol) 执行器
 **工具:** `designmd_search_design_kits`, `designmd_get_design_kit`, `designmd_download_design_kit`, `designmd_upload_design_kit`, `designmd_delete_design_kit`, `designmd_list_popular_kits`, `designmd_list_tags`
 
 ## 禁止事项
-- 不先调用 `ext_skill/loadSkill` 获取参数就直接使用 `ext_call`
+- 不先调用 `ext_skill/skill_load` 获取参数就直接使用 `ext_call`