foliko 1.1.92 → 2.0.0

package/plugins/{qq-plugin.js → messaging/qq/index.js}

@@ -8,11 +8,11 @@
  * - allowedUsers: 允许交互的用户 openid 列表（空数组表示允许所有人）
  */
 
-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('QQ')
-const { cleanResponse } = require('../src/utils')
-const { FileDownloader } = require('../src/utils/download')
+const { cleanResponse } = require('../../../src/utils')
+const { FileDownloader } = require('../../../src/utils/download')
 const { z } = require('zod')
 const { createQQBotClient, QQBotAPIClient, StreamSession } = require('@chnak/qq-bot')
 const path = require('path')
@@ -374,14 +374,6 @@ class QQPlugin extends Plugin {
       },
     })
 
-    // 连接后可以从事件中获取机器人信息，先直接连接
-    // 获取机器人自身的 openid（用于发送消息）
-    // try {
-    //   const token = await this._client.api.getToken()
-    // } catch (err) {
-    //   log.warn('Failed to get access token:', err.message)
-    // }
-
     // 监听私聊消息
     this._client.on('C2C_MESSAGE_CREATE', async (event) => {
       await this._handleC2CMessage(event)
@@ -484,9 +476,6 @@ class QQPlugin extends Plugin {
 
     if (!actualContent) return
 
-    // 权限检查（可以按群或用户检查）
-    // if (!this._checkGroupPermission(groupOpenid, userId)) { ... }
-
     // 处理命令
     if (actualContent.startsWith('/')) {
       await this._handleGroupCommand(groupOpenid, username, actualContent, event)
@@ -1096,4 +1085,4 @@ function interval(fn, ms) {
   return { start, stop }
 }
 
-module.exports = QQPlugin
+module.exports = QQPlugin

package/plugins/{telegram-plugin.js → messaging/telegram/index.js}

@@ -9,8 +9,8 @@
  * - prefix: 命令前缀
  */
 
-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('Telegram')
 const { z } = require('zod')
 
@@ -29,7 +29,7 @@ class TelegramPlugin extends Plugin {
     this.priority = 80
     this.enabled = false
     this.systemPrompt = `你是一个有帮助的AI助手。回复内容不要使用markdown格式文本。
-    
+
 **重要:** 子Agent 匹配规则必须遵守：
 - 根据【子 Agent 匹配表】，将任务委托给最匹配的子Agent处理
 - 使用 subagent_call 工具并指定 agentName 来委托任务

package/plugins/{weixin-plugin.js → messaging/weixin/index.js}

@@ -6,18 +6,18 @@
  * - forceLogin: 是否强制重新扫码登录
  * - qrcodeTerminal: 是否在终端渲染二维码 (默认 true)
  */
-const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../cli/src/utils/ansi');
-const { renderLine } = require('../cli/src/utils/markdown');
-const { debounce, throttle } = require('../src/utils');
+const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../../../cli/src/utils/ansi');
+const { renderLine } = require('../../../cli/src/utils/markdown');
+const { debounce, throttle } = require('../../../src/utils');
 const interval = (fn) => {
   const handle = setInterval(fn, 3000);
   return { start: () => handle, stop: () => clearInterval(handle) };
 };
-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('WeChat')
-const {cleanResponse} =require('../src/utils')
-const {FileDownloader} = require('../src/utils/download')
+const {cleanResponse} =require('../../../src/utils')
+const {FileDownloader} = require('../../../src/utils/download')
 const removeMarkdown = require('remove-markdown');
 const { z } = require('zod')
 const { WeixinBot} = require('@chnak/weixin-bot')
@@ -338,7 +338,7 @@ class WeixinPlugin extends Plugin {
     // log.info(' 已记录机器人 userId:', this._myUserId)
     const {agent,sessionId} = this._getSessionAgent(creds.userId)
     const sessionScope = agent.createSessionScope(sessionId);
-    
+
     // 注册消息处理
     this._bot.onMessage(async (msg) => {
       await this._handleMessage(msg)
@@ -417,9 +417,9 @@ class WeixinPlugin extends Plugin {
 
     // 消息完成
     // sessionScope.on('message:complete', async ({ content }) => {
-      
+
     //   if (!content) {
-        
+
     //   }
     // });
 
@@ -478,7 +478,7 @@ class WeixinPlugin extends Plugin {
       sharedPrompt: `工作目录: {{WORK_DIR}}`,
       metadata: { WORK_DIR: this._framework?.getCwd?.() ?? process.cwd() }
     })
-    
+
     this._sessionAgents.set(userId, agent)
     // log.info(' Created new session agent for userId:', userId)
 
@@ -528,7 +528,7 @@ class WeixinPlugin extends Plugin {
           voice:"音频"
         }
         const files=await this._save_file(msg)
- 
+
         await this._processChat(userId, `
           [用户发送了${type_dict[msg.type]}消息]\n
           文件列表：\n
@@ -549,7 +549,7 @@ class WeixinPlugin extends Plugin {
         }
     }
   }
-  
+
   async _save_file(msg){
     const files=[]
     try{
@@ -562,7 +562,7 @@ class WeixinPlugin extends Plugin {
           const file=await this.downloader.fromWeXin(url,aesKey)
           files.push(file.path)
         }
-        
+
       }
     }catch(err){
       console.log(err)
@@ -1044,4 +1044,4 @@ class WeixinPlugin extends Plugin {
   }
 }
 
-module.exports = WeixinPlugin
+module.exports = WeixinPlugin

package/plugins/{plugin-manager-plugin.js → plugin-manager/index.js}

@@ -6,67 +6,40 @@
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
-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 { z } = require('zod');
-
-// 从共享配置加载
-const { DEFAULT_REPO, shouldIgnore } = require('../cli/src/utils/plugin-config');
+const { DEFAULT_REPO, shouldIgnore } = require('../../src/cli/utils/plugin-config');
 
 const log = logger.child('PluginManagerPlugin');
 
-/**
- * 递归复制目录（带过滤）
- */
 function copyDirRecursive(src, dest) {
   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 (shouldIgnore(entry.name)) {
-      log.debug(`Ignoring: ${entry.name}`);
-      continue;
-    }
-
-    if (entry.isDirectory()) {
-      copyDirRecursive(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
+    if (shouldIgnore(entry.name)) { log.debug(`Ignoring: ${entry.name}`); continue; }
+    if (entry.isDirectory()) { copyDirRecursive(srcPath, destPath); }
+    else { fs.copyFileSync(srcPath, destPath); }
   }
 }
 
-/**
- * 执行 Git 命令
- */
 function gitCommand(args, cwd) {
-  try {
-    return execSync(`git ${args}`, { cwd, encoding: 'utf-8', stdio: 'pipe' });
-  } catch (err) {
-    return err.stdout || err.stderr || '';
-  }
+  try { return execSync(`git ${args}`, { cwd, encoding: 'utf-8', stdio: 'pipe' }); }
+  catch (err) { return err.stdout || err.stderr || ''; }
 }
 
-/**
- * 解析 Git URL 获取信息
- */
 function 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] };
-    }
+    if (match) return { owner: match[1], repo: match[2] };
   }
   return null;
 }
@@ -74,12 +47,12 @@ function parseGitUrl(url) {
 class PluginManagerPlugin extends Plugin {
   constructor(config = {}) {
     super();
-    this.name = 'plugin_manager';
+    this.name = 'plugin-manager';
     this.version = '1.0.0';
     this.description = '管理远程插件：列表、发布、安装';
     this._repo = config.repo || process.env.FOLIKO_PLUGIN_REPO || DEFAULT_REPO;
     this.system = true;
-    this.tools = {}; // ext_call 需要通过 this.tools 访问工具
+    this.tools = {};
   }
 
   install(framework) {
@@ -88,7 +61,6 @@ class PluginManagerPlugin extends Plugin {
   }
 
   start(framework) {
-    // 1. plugin_list - 列出远程仓库插件
     framework.registerTool({
       name: 'plugin_list',
       description: '列出远程插件仓库中所有可用的插件',
@@ -101,7 +73,6 @@ class PluginManagerPlugin extends Plugin {
       }
     });
 
-    // 2. plugin_publish - 发布本地插件到远程仓库
     framework.registerTool({
       name: 'plugin_publish',
       description: '将本地插件发布到远程 Git 仓库（需要仓库写权限）',
@@ -116,7 +87,6 @@ class PluginManagerPlugin extends Plugin {
       }
     });
 
-    // 3. plugin_install - 从远程仓库安装插件到本地
     framework.registerTool({
       name: 'plugin_install',
       description: '从远程 Git 仓库安装插件到本地 .foliko/plugins 目录',
@@ -134,40 +104,26 @@ class PluginManagerPlugin extends Plugin {
     return this;
   }
 
-  /**
-   * 列出远程仓库的插件
-   */
   async _listPlugins(repo) {
     try {
-      //log.info(`Listing plugins from ${repo}...`);
-
       const repoInfo = parseGitUrl(repo);
-      if (!repoInfo) {
-        return { success: false, error: 'Invalid repository URL' };
-      }
+      if (!repoInfo) return { success: false, error: 'Invalid repository URL' };
 
-      // 使用 GitHub API 获取仓库内容
       const apiUrl = `https://api.github.com/repos/${repoInfo.owner}/${repoInfo.repo}/contents`;
       const response = await fetch(apiUrl);
-
       if (!response.ok) {
-        if (response.status === 404) {
-          return { success: false, error: `Repository not found: ${repo}` };
-        }
+        if (response.status === 404) return { success: false, error: `Repository not found: ${repo}` };
         return { success: false, error: `GitHub API error: ${response.status}` };
       }
 
       const contents = await response.json();
-
       if (!Array.isArray(contents) || contents.length === 0) {
         return { success: true, data: [], metadata: { message: 'No plugins found in repository' } };
       }
 
       const plugins = [];
-
       for (const item of contents) {
         if (item.type === 'dir') {
-          // 获取 README 描述
           let description = '-';
           try {
             const readmeUrl = `https://raw.githubusercontent.com/${repoInfo.owner}/${repoInfo.repo}/main/${item.name}/README.md`;
@@ -175,151 +131,83 @@ class PluginManagerPlugin extends Plugin {
             if (readmeResp.ok) {
               const readmeText = await readmeResp.text();
               const lines = readmeText.split('\n').filter(l => l.trim());
-              if (lines.length > 1) {
-                description = lines.slice(1).join(' ').slice(0, 100);
-              }
+              if (lines.length > 1) description = lines.slice(1).join(' ').slice(0, 100);
             }
-          } catch (e) {}
-
-          plugins.push({
-            name: item.name,
-            type: 'directory',
-            description,
-          });
+          } catch (e) { /* ignore */ }
+          plugins.push({ name: item.name, type: 'directory', description });
         } else if (item.type === 'file' && item.name.endsWith('.js')) {
-          const name = item.name.replace('.js', '');
-          plugins.push({
-            name,
-            type: 'file',
-            description: '(root file)',
-          });
+          plugins.push({ name: item.name.replace('.js', ''), type: 'file', description: '(root file)' });
         }
       }
 
-      return {
-        success: true,
-        data: plugins,
-        metadata: { repo, count: plugins.length },
-      };
-
+      return { success: true, data: plugins, metadata: { repo, count: plugins.length } };
     } catch (err) {
       log.error(`List plugins failed: ${err.message}`);
       return { success: false, error: err.message };
     }
   }
 
-  /**
-   * 发布插件到远程仓库
-   */
   async _publishPlugin(pluginName, repo) {
     const cwd = this._framework?.getCwd?.() ?? process.cwd();
     const pluginsDir = path.resolve(cwd, '.foliko', 'plugins');
     const localPluginsDir = path.resolve(cwd, 'plugins');
 
-    // 确定插件目录
     let actualPluginsDir = pluginsDir;
     if (!fs.existsSync(pluginsDir)) {
-      if (fs.existsSync(localPluginsDir)) {
-        actualPluginsDir = localPluginsDir;
-      } else {
-        return { success: false, error: `Plugins directory not found` };
-      }
+      if (fs.existsSync(localPluginsDir)) { actualPluginsDir = localPluginsDir; }
+      else { return { success: false, error: 'Plugins directory not found' }; }
     }
 
-    const pluginPath = path.join(actualPluginsDir, `${pluginName}.js`);
+    const pluginPathFile = path.join(actualPluginsDir, `${pluginName}.js`);
     const pluginSourceDir = path.join(actualPluginsDir, pluginName);
 
-    // 检查插件是否存在
-    if (!fs.existsSync(pluginPath) && !fs.existsSync(pluginSourceDir)) {
-      return {
-        success: false,
-        error: `Plugin "${pluginName}" not found`,
-        available: fs.readdirSync(actualPluginsDir).filter(f => {
-          if (f.endsWith('.js')) return true;
-          const fullPath = path.join(actualPluginsDir, f);
-          return fs.statSync(fullPath).isDirectory();
-        }),
-      };
+    if (!fs.existsSync(pluginPathFile) && !fs.existsSync(pluginSourceDir)) {
+      return { success: false, error: `Plugin "${pluginName}" not found`, available: fs.readdirSync(actualPluginsDir).filter(f => f.endsWith('.js') || fs.statSync(path.join(actualPluginsDir, f)).isDirectory()) };
     }
 
     const tmpDir = path.join(require('os').tmpdir(), `foliko-plugin-publish-${Date.now()}`);
-
     try {
-      //log.info(`Publishing plugin "${pluginName}" to ${repo}...`);
-
-      // 克隆仓库
       fs.mkdirSync(tmpDir, { recursive: true });
 
       let isNewRepo = false;
-      try {
-        gitCommand(`clone ${repo} "${tmpDir}" --depth 1`, this._framework?.getCwd?.() ?? process.cwd());
-      } catch (err) {
-        //log.info('Initializing new repository...');
+      try { gitCommand(`clone ${repo} "${tmpDir}" --depth 1`, cwd); }
+      catch (err) {
         fs.mkdirSync(tmpDir, { recursive: true });
         gitCommand('init', tmpDir);
         gitCommand(`remote add origin ${repo}`, tmpDir);
         isNewRepo = true;
       }
 
-      // 创建插件目录
       const pluginDir = path.join(tmpDir, pluginName);
       fs.mkdirSync(pluginDir, { recursive: true });
 
-      // 复制插件
       let pluginContent = null;
       if (fs.existsSync(pluginSourceDir) && fs.statSync(pluginSourceDir).isDirectory()) {
-        //  log.info('Copying plugin directory...');
         copyDirRecursive(pluginSourceDir, pluginDir);
-
         const mainJsPath = path.join(pluginSourceDir, `${pluginName}.js`);
-        if (fs.existsSync(mainJsPath)) {
-          pluginContent = fs.readFileSync(mainJsPath, 'utf-8');
-        }
+        if (fs.existsSync(mainJsPath)) pluginContent = fs.readFileSync(mainJsPath, 'utf-8');
       } else {
-        //log.info('Copying plugin file...');
-        pluginContent = fs.readFileSync(pluginPath, 'utf-8');
-        const targetPath = path.join(pluginDir, `${pluginName}.js`);
-        fs.writeFileSync(targetPath, pluginContent);
-
+        pluginContent = fs.readFileSync(pluginPathFile, 'utf-8');
+        fs.writeFileSync(path.join(pluginDir, `${pluginName}.js`), pluginContent);
         const configPath = path.join(actualPluginsDir, `${pluginName}.json`);
-        if (fs.existsSync(configPath)) {
-          fs.copyFileSync(configPath, path.join(pluginDir, `${pluginName}.json`));
-        }
+        if (fs.existsSync(configPath)) fs.copyFileSync(configPath, path.join(pluginDir, `${pluginName}.json`));
       }
 
-      // 创建 README.md
       const readmePath = path.join(pluginDir, 'README.md');
       if (!fs.existsSync(readmePath)) {
-        //log.info('Creating README.md...');
-        const descMatch = pluginContent?.match(/\*\*Description\*\*:\s*(.+)/) ||
-                         pluginContent?.match(/description[:\s]+(.+)/i);
+        const descMatch = pluginContent?.match(/\*\*Description\*\*:\s*(.+)/) || pluginContent?.match(/description[:\s]+(.+)/i);
         const desc = descMatch ? descMatch[1] : `Foliko plugin: ${pluginName}`;
         fs.writeFileSync(readmePath, `# ${pluginName}\n\n${desc}\n`);
       }
 
-      // Git 提交和推送
       gitCommand('add .', tmpDir);
-
       const status = gitCommand('status --porcelain', tmpDir);
-      if (!status.trim()) {
-        return {
-          success: true,
-          data: `No changes to commit for plugin "${pluginName}"`,
-          metadata: { repo },
-        };
-      }
+      if (!status.trim()) return { success: true, data: `No changes to commit for plugin "${pluginName}"`, metadata: { repo } };
 
       gitCommand(`commit -m "Add/update plugin: ${pluginName}"`, tmpDir);
       gitCommand(`push ${isNewRepo ? '-u' : ''} origin main`, tmpDir);
 
-      //log.info(`Plugin "${pluginName}" published successfully!`);
-
-      return {
-        success: true,
-        data: `Plugin "${pluginName}" published successfully`,
-        metadata: { repo, path: `${pluginName}/${pluginName}.js` },
-      };
-
+      return { success: true, data: `Plugin "${pluginName}" published successfully`, metadata: { repo, path: `${pluginName}/${pluginName}.js` } };
     } catch (err) {
       log.error(`Publish failed: ${err.message}`);
       return { success: false, error: err.message };
@@ -328,25 +216,17 @@ class PluginManagerPlugin extends Plugin {
     }
   }
 
-  /**
-   * 从远程仓库安装插件
-   */
   async _installPlugin(pluginName, repo) {
     const cwd = this._framework?.getCwd?.() ?? process.cwd();
     const localPluginsDir = path.resolve(cwd, '.foliko', 'plugins');
     const tmpDir = path.join(require('os').tmpdir(), `foliko-plugin-install-${Date.now()}`);
 
     try {
-      //log.info(`Installing plugin "${pluginName}" from ${repo}...`);
-
-      // 克隆仓库
       fs.mkdirSync(tmpDir, { recursive: true });
       gitCommand(`clone ${repo} "${tmpDir}" --depth 1`, cwd);
 
-      // 查找插件
       const pluginDir = path.join(tmpDir, pluginName);
       let sourcePath;
-
       if (fs.existsSync(pluginDir) && fs.statSync(pluginDir).isDirectory()) {
         sourcePath = path.join(pluginDir, `${pluginName}.js`);
       } else {
@@ -354,44 +234,20 @@ class PluginManagerPlugin extends Plugin {
       }
 
       if (!fs.existsSync(sourcePath)) {
-        // 列出可用插件
-        const available = fs.readdirSync(tmpDir).filter(f => {
-          const fullPath = path.join(tmpDir, f);
-          return fs.statSync(fullPath).isDirectory();
-        });
-
-        return {
-          success: false,
-          error: `Plugin "${pluginName}" not found in repository`,
-          available,
-        };
+        const available = fs.readdirSync(tmpDir).filter(f => fs.statSync(path.join(tmpDir, f)).isDirectory());
+        return { success: false, error: `Plugin "${pluginName}" not found in repository`, available };
       }
 
-      // 确保本地目录存在
-      if (!fs.existsSync(localPluginsDir)) {
-        fs.mkdirSync(localPluginsDir, { recursive: true });
-      }
+      if (!fs.existsSync(localPluginsDir)) fs.mkdirSync(localPluginsDir, { recursive: true });
 
-      // 复制插件到本地
       const targetDir = path.join(localPluginsDir, pluginName);
       fs.mkdirSync(targetDir, { recursive: true });
-
-      // 复制目录内容
       copyDirRecursive(path.dirname(sourcePath), targetDir);
-
-      // 如果是单文件插件，复制主文件
       if (!fs.existsSync(path.join(targetDir, `${pluginName}.js`))) {
         fs.copyFileSync(sourcePath, path.join(targetDir, `${pluginName}.js`));
       }
 
-      //log.info(`Plugin "${pluginName}" installed to ${targetDir}`);
-
-      return {
-        success: true,
-        data: `Plugin "${pluginName}" installed successfully`,
-        metadata: { path: targetDir },
-      };
-
+      return { success: true, data: `Plugin "${pluginName}" installed successfully`, metadata: { path: targetDir } };
     } catch (err) {
       log.error(`Install failed: ${err.message}`);
       return { success: false, error: err.message };