foliko 1.1.67 → 1.1.69

package/plugins/python-plugin-loader.js

@@ -59,7 +59,7 @@ class PythonPluginLoader extends Plugin {
     this.version = '1.0.0'
     this.description = 'Python 插件加载器，属于Python的插件'
 
-    this._agentDir = config.agentDir || '.agent'
+    this._agentDir = config.agentDir || '.foliko' // 默认从 .foliko 目录加载 Python 插件
     this._pythonPlugins = new Map()
     this._framework = null
     this.system = true 

package/plugins/qq-plugin.js

@@ -26,7 +26,7 @@ class QQPlugin extends Plugin {
     this.description = 'QQ 对话插件，使用 QQ 开放平台进行对话'
     this.priority = 80
     this.enabled = false
-    this.path = `.agent/data`
+    this.path = `.foliko/data`
 
     this.config = {
       appId: config.appId || process.env.QQ_APP_ID,
@@ -49,7 +49,7 @@ class QQPlugin extends Plugin {
     this.agent = null
     this.sessionId = null
 
-    const saveDir = path.join(process.cwd(), '.agent', 'data', this.name)
+    const saveDir = path.join(process.cwd(), '.foliko', 'data', this.name)
     this.downloader = new FileDownloader({
       retries: 3,
       baseDir: saveDir
@@ -175,7 +175,7 @@ class QQPlugin extends Plugin {
         // 降级为普通发送
         await this._client.sendC2CMessage({ openid, content })
       }
-      return { success: true, message: '消息发送成功' }
+      return { success: true, data: '消息发送成功' }
     } catch (err) {
       log.error(`消息发送失败: ${err.message}`)
       return { error: err.message }
@@ -198,7 +198,7 @@ class QQPlugin extends Plugin {
         imageUrl,
         content,
       })
-      return { success: true, message: '图片发送成功' }
+      return { success: true, data: '图片发送成功' }
     } catch (err) {
       log.error(`图片发送失败: ${err.message}`)
       return { error: err.message }
@@ -227,13 +227,13 @@ class QQPlugin extends Plugin {
     try {
       if (imageExts.includes(ext)) {
         await this._client.sendC2CLocalImageMessage({ openid, filePath, content })
-        return { success: true, message: '图片发送成功' }
+        return { success: true, data: '图片发送成功' }
       } else if (voiceExts.includes(ext)) {
         await this._client.sendC2CLocalVoiceMessage({ openid, filePath })
-        return { success: true, message: '语音发送成功' }
+        return { success: true, data: '语音发送成功' }
       } else if (videoExts.includes(ext)) {
         await this._client.sendC2CLocalVideoMessage({ openid, filePath, content })
-        return { success: true, message: '视频发送成功' }
+        return { success: true, data: '视频发送成功' }
       } else {
         // 未知格式，当作文件处理
         return this._sendFile(openid, filePath, content)
@@ -263,7 +263,7 @@ class QQPlugin extends Plugin {
         filePath,
         content,
       })
-      return { success: true, message: '文件发送成功' }
+      return { success: true, data: '文件发送成功' }
     } catch (err) {
       log.error(`文件发送失败: ${err.message}`)
       return { error: err.message }
@@ -285,7 +285,7 @@ class QQPlugin extends Plugin {
         groupOpenid,
         content,
       })
-      return { success: true, message: '群消息发送成功' }
+      return { success: true, data: '群消息发送成功' }
     } catch (err) {
       log.error(`群消息发送失败: ${err.message}`)
       return { error: err.message }
@@ -311,7 +311,7 @@ class QQPlugin extends Plugin {
         filePath: imagePath,
         content,
       })
-      return { success: true, message: '群图片发送成功' }
+      return { success: true, data: '群图片发送成功' }
     } catch (err) {
       log.error(`群图片发送失败: ${err.message}`)
       return { error: err.message }
@@ -679,17 +679,28 @@ class QQPlugin extends Plugin {
     const command = parts[0].substring(1)
     const args = parts.slice(1).join(' ')
 
+    // 检查 skill 命令 (格式: skillname:cmdname)
+    if (command.includes(':')) {
+      const result = await this._executeSkillCommand(command, args)
+      if (result) {
+        await this._sendMessage(openid, `✅ ${result.data || result}`)
+        return
+      }
+    }
+
     switch (command.toLowerCase()) {
       case 'start':
       case 'help':
-        await this._sendMessage(openid,
-          '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/history - 查看历史消息数')
+        await this._sendMessageHelp(openid)
         break
       case 'clean':
       case 'clear':
         await this._clearSessionContext(openid)
         await this._sendMessage(openid, '✅ 对话上下文已清除')
         break
+      case 'compress':
+        await this._compressSessionContext(openid)
+        break
       case 'history':
         const sessionInfo = this._getSessionAgent(openid)
         if (sessionInfo && this._framework) {
@@ -701,10 +712,55 @@ class QQPlugin extends Plugin {
         }
         break
       default:
+        // 检查是否是 skill 命令 (格式: skillname:cmdname)
+        if (text.startsWith('/')) {
+          const cmdParts = command.split(':')
+          if (cmdParts.length === 2) {
+            const skillCmd = `${cmdParts[0]}:${cmdParts[1]}`
+            try {
+              const result = await this._framework.executeTool('ext_call', {
+                plugin: 'skill',
+                tool: skillCmd,
+                args: { args }
+              })
+              if (result.success !== false) {
+                await this._sendMessage(openid, `✅ ${result.data || result}`)
+                return
+              }
+            } catch (err) {
+              log.warn('Skill command failed:', err.message)
+            }
+          }
+        }
         await this._processChat(openid, text, originalMsg, 'c2c')
     }
   }
 
+  /**
+   * 检查并执行 skill 命令
+   */
+  async _executeSkillCommand(command, args) {
+    const extExecutor = this._framework?.pluginManager?.get('extension-executor')
+    if (!extExecutor || typeof extExecutor.executeSkillCommand !== 'function') return null
+    return await extExecutor.executeSkillCommand(command, args)
+  }
+
+  /**
+   * 发送帮助信息
+   */
+  async _sendMessageHelp(openid) {
+    const extExecutor = this._framework?.pluginManager?.get('extension-executor')
+    const skillHelp = extExecutor?.getSkillCommandsHelp?.() || ''
+
+    let helpText = '👋 欢迎使用 AI 助手！\n\n直接发送消息即可与我对话。\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/history - 查看历史消息数'
+
+    if (skillHelp) {
+      helpText += '\n\n【技能命令】\n' + skillHelp.split('\n').map(line => line.replace(/^\//, '/')).join('\n')
+    }
+
+    await this._sendMessage(openid, helpText)
+  }
+
   /**
    * 处理群命令
    */
@@ -713,17 +769,28 @@ class QQPlugin extends Plugin {
     const command = parts[0].substring(1)
     const args = parts.slice(1).join(' ')
 
+    // 检查 skill 命令 (格式: skillname:cmdname)
+    if (command.includes(':')) {
+      const result = await this._executeSkillCommand(command, args)
+      if (result) {
+        await this._sendGroupMessage(groupOpenid, `✅ ${result.data || result}`)
+        return
+      }
+    }
+
     switch (command.toLowerCase()) {
       case 'start':
       case 'help':
-        await this._sendGroupMessage(groupOpenid,
-          '👋 欢迎使用 AI 助手！\n\n可用命令：\n/clean - 清除对话上下文\n/history - 查看历史消息数')
+        await this._sendGroupMessageHelp(groupOpenid)
         break
       case 'clean':
       case 'clear':
         await this._clearSessionContext(groupOpenid)
         await this._sendGroupMessage(groupOpenid, '✅ 对话上下文已清除')
         break
+      case 'compress':
+        await this._compressSessionContext(groupOpenid)
+        break
       case 'history':
         const sessionInfo = this._getSessionAgent(groupOpenid, 'group')
         if (sessionInfo && this._framework) {
@@ -739,6 +806,22 @@ class QQPlugin extends Plugin {
     }
   }
 
+  /**
+   * 发送群组帮助信息
+   */
+  async _sendGroupMessageHelp(groupOpenid) {
+    const extExecutor = this._framework?.pluginManager?.get('extension-executor')
+    const skillHelp = extExecutor?.getSkillCommandsHelp?.() || ''
+
+    let helpText = '👋 欢迎使用 AI 助手！\n\n可用命令：\n/clean - 清除对话上下文\n/compress - 压缩上下文\n/history - 查看历史消息数'
+
+    if (skillHelp) {
+      helpText += '\n\n【技能命令】\n' + skillHelp.split('\n').map(line => line.replace(/^\//, '/')).join('\n')
+    }
+
+    await this._sendGroupMessage(groupOpenid, helpText)
+  }
+
   /**
    * 清除会话上下文
    */
@@ -752,18 +835,62 @@ class QQPlugin extends Plugin {
     }
 
     if (this._framework) {
-      const sessionCtx = this._framework.getSessionContext(sessionId)
-      if (sessionCtx) {
-        sessionCtx.clearMessages()
-        sessionCtx.compressionState.count = 0
-        sessionCtx.metadata.compressionCount = 0
+      const manager = this._framework.getSessionContext(sessionId)
+      if (manager) {
+        manager.clearMessages()
+      }
+    }
+  }
+
+  /**
+   * 压缩会话上下文
+   */
+  async _compressSessionContext(identifier) {
+    const sessionId = `qq_c2c_${identifier}`
+
+    const { agent } = this._getSessionAgent(identifier)
+
+    if (agent._chatHandler) {
+      const chatHandler = agent._chatHandler
+
+      const messageStore = chatHandler._chatSession.getSessionMessageStore(sessionId)
+      messageStore.historyLoaded = false
+      chatHandler._chatSession.loadHistory(sessionId)
+
+      let messages = messageStore.messages
+
+      if (!messages || messages.length === 0) {
+        if (this._framework) {
+          const sessionCtx = this._framework.getSessionContext(sessionId)
+          if (sessionCtx) {
+            messages = sessionCtx.getMessages()
+            messageStore.messages = messages
+          }
+        }
       }
-      const cachedCtx = this._framework._sessionContexts?.get(sessionId)
-      if (cachedCtx) {
-        cachedCtx.clearMessages()
-        cachedCtx.compressionState.count = 0
-        cachedCtx.metadata.compressionCount = 0
+
+      const beforeCount = messages ? messages.length : 0
+      await this._sendMessage(identifier, `📦 开始压缩上下文，当前 ${beforeCount} 条消息...`)
+
+      if (messages && messages.length > 0) {
+        if (chatHandler._contextCompressor) {
+          await chatHandler._contextCompressor.compress(sessionId, messages, messageStore)
+          const afterCount = messages.length
+          if (this._framework) {
+            const sessionCtx = this._framework.getSessionContext(sessionId)
+            if (sessionCtx) {
+              sessionCtx.replaceMessages(messages)
+            }
+          }
+          await this._sendMessage(identifier, `✅ 压缩完成：${beforeCount} → ${afterCount} 条（保留 ${chatHandler._contextCompressor._keepRecentMessages} 条）`)
+        } else {
+          await this._sendMessage(identifier, '❌ 压缩器不可用')
+        }
+      } else {
+        await this._sendMessage(identifier, '❌ 没有消息需要压缩')
       }
+    } else {
+      await this._sendMessage(identifier, '❌ ChatHandler 不可用')
     }
   }
 

package/plugins/rules-plugin.js

@@ -41,7 +41,7 @@ class RulesPlugin extends Plugin {
     this.system = true 
     
     this.config = {
-      rulesDir: config.rulesDir || '.agent/rules',
+      rulesDir: config.rulesDir || '.foliko/rules',
       autoLoad: config.autoLoad !== false
     }
 
@@ -74,14 +74,14 @@ class RulesPlugin extends Plugin {
       execute: async () => {
         return {
           success: true,
-          rules: this._rules.map(r => ({
+          data: this._rules.map(r => ({
             name: r.name,
             type: r.type,
             target: r.target,
             description: r.description,
             enabled: r.enabled
           })),
-          total: this._rules.length
+          metadata: { total: this._rules.length }
         }
       }
     })
@@ -108,7 +108,7 @@ class RulesPlugin extends Plugin {
           enabled: true
         }
         this._rules.push(rule)
-        return { success: true, rule: rule.name }
+        return { success: true, data: `规则已添加: ${rule.name}` }
       }
     })
 
@@ -124,7 +124,7 @@ class RulesPlugin extends Plugin {
           return { success: false, error: 'Rule not found' }
         }
         this._rules.splice(index, 1)
-        return { success: true, removed: args.name }
+        return { success: true, data: `规则已移除: ${args.name}` }
       }
     })
 
@@ -135,7 +135,7 @@ class RulesPlugin extends Plugin {
       execute: async () => {
         return {
           success: true,
-          stats: { ...this._ruleStats }
+          data: { ...this._ruleStats }
         }
       }
     })
@@ -151,8 +151,8 @@ class RulesPlugin extends Plugin {
         const result = this.evaluate(args.target, args.input || {})
         return {
           success: true,
-          target: args.target,
-          result: {
+          data: {
+            target: args.target,
             allowed: result.allowed,
             ruleName: result.rule?.name || null,
             ruleType: result.rule?.type || null

package/plugins/scheduler-plugin.js

@@ -20,7 +20,7 @@ try {
 }
 
 // ============================================================================
-// TaskStore - 持久化任务到 .agent/data/scheduler/tasks.json
+// TaskStore - 持久化任务到 .foliko/data/scheduler/tasks.json
 // ============================================================================
 class TaskStore {
   constructor(persistencePath) {
@@ -130,7 +130,7 @@ class SchedulerPlugin extends Plugin {
     this.system = true
     this.config = {
       checkInterval: config.checkInterval || 1000,  // 每秒检查一次
-      persistencePath: config.persistencePath || '.agent/data/scheduler'
+      persistencePath: config.persistencePath || '.foliko/data/scheduler'
     }
 
     this._framework = null
@@ -227,15 +227,17 @@ class SchedulerPlugin extends Plugin {
               this._saveTasks()
               return {
                 success: true,
-                taskId: task.id,
-                name: task.name,
-                type: 'shell',
-                shell,
-                scheduleTime,
-                cronExpression: task.cronExpression,
-                message: repeat ? 'Shell 定时任务已创建 (重复执行)' : 'Shell 任务已创建',
-                sessionId: sessionId || 'default',
-                notify: task.notify
+                data: repeat ? 'Shell 定时任务已创建 (重复执行)' : 'Shell 任务已创建',
+                metadata: {
+                  taskId: task.id,
+                  name: task.name,
+                  type: 'shell',
+                  shell,
+                  scheduleTime,
+                  cronExpression: task.cronExpression,
+                  sessionId: sessionId || 'default',
+                  notify: task.notify
+                }
               }
             } else {
               // 一次性 Shell 任务
@@ -276,15 +278,17 @@ class SchedulerPlugin extends Plugin {
               this._saveTasks()
               return {
                 success: true,
-                taskId: task.id,
-                name: task.name,
-                type: 'shell',
-                shell,
-                scheduleTime,
-                executeAt: runAt.toISOString(),
-                message: 'Shell 任务已创建',
-                sessionId: sessionId || 'default',
-                notify: task.notify
+                data: 'Shell 任务已创建',
+                metadata: {
+                  taskId: task.id,
+                  name: task.name,
+                  type: 'shell',
+                  shell,
+                  scheduleTime,
+                  executeAt: runAt.toISOString(),
+                  sessionId: sessionId || 'default',
+                  notify: task.notify
+                }
               }
             }
           }