foliko 1.1.2 → 1.1.4

package/cli/src/commands/chat.js

@@ -71,9 +71,18 @@ function parseArgs(args) {
       options.baseURL = args[++i];
     } else if (arg === '--api-key' && args[i + 1]) {
       options.apiKey = args[++i];
+    } else if (arg === '--stream') {
+      options.stream = true;
+    } else if (arg === '--no-stream') {
+      options.stream = false;
     }
   }
 
+  // 默认开启流式
+  if (options.stream === undefined) {
+    options.stream = true;
+  }
+
   return options;
 }
 
@@ -94,16 +103,21 @@ async function chatCommand(args) {
       baseURL: options.baseURL,
       apiKey: options.apiKey,
       providerOptions: {
-        maxOutputTokens: 16384,
-        reasoning_split: true,
+        maxOutputTokens: 8192,
       },
     },
   });
 
-  // 创建 Agent
-  const agent = framework.createAgent({
-    name: 'FolikoAgent',
-    systemPrompt: `你是一个有帮助的助手，擅长回答问题和执行任务。
+  // 使用框架的 _mainAgent（已注册 memory-context 等）
+  const agent = framework._mainAgent;
+  if (!agent) {
+    console.error('错误：框架未正确初始化，请检查 AI 配置');
+    process.exit(1);
+  }
+
+  // 更新 _mainAgent 的配置
+  agent.setMetadata('WORK_DIR', process.cwd());
+  agent.setSystemPrompt(`你是一个有帮助的助手，擅长回答问题和执行任务。
 **重要:** 子Agent 匹配规则必须遵守：
 - 根据【子 Agent 匹配表】，将任务委托给最匹配的子Agent处理
 - 使用 subagent_call 工具并指定 agentName 来委托任务
@@ -111,15 +125,10 @@ async function chatCommand(args) {
 **命令执行规范：**
 - 执行 npx skills add / npx skills remove / npx skills list 命令时，必须自动添加参数：-a openclaw -y
 - 禁止添加 -g 参数
-- 例如：npx skills add xxx 应该执行为 npx skills add xxx -a openclaw -y`,
-    sharedPrompt: `工作目录: {{WORK_DIR}}`,
-    metadata: {
-      WORK_DIR: process.cwd(), // 覆盖内置的 WORK_DIR
-    },
-  });
+- 例如：npx skills add xxx 应该执行为 npx skills add xxx -a openclaw -y`);
 
   // 初始化 UI
-  const ui = new ChatUI(agent);
+  const ui = new ChatUI(agent, { stream: options.stream });
 
   // 监听通知事件，在 CLI 中显示
   // 显示当前会话的通知，以及没有指定 sessionId 的广播通知

package/cli/src/ui/chat-ui.js

@@ -13,6 +13,9 @@ class ChatUI {
     this.rl = null;
     this.lines = []; // 多行输入的累积
 
+    // 流式模式（默认开启）
+    this.stream = options.stream !== false;
+
     // 会话管理
     this.sessionId = options.sessionId || 'cli_default';
     this.sessionPlugin = null;
@@ -121,13 +124,6 @@ class ChatUI {
    * 发送消息并显示响应
    */
   async sendMessage(message) {
-    // console.log();
-
-    // // 添加用户消息到会话历史
-    // if (this.sessionPlugin) {
-    //   this.sessionPlugin.addMessage(this.sessionId, { role: 'user', content: message });
-    // }
-
     // 用于打断的标志
     let interrupted = false;
 
@@ -145,43 +141,65 @@ class ChatUI {
     let fullResponse = '';
 
     try {
-      let lineBuffer = '';
       const renderState = { inThink: false, inCodeBlock: false };
-
-      console.log(colored('● ', GREEN));
-      // console.log()
-
       const runWithContext = this.agent.framework?.runWithContext.bind(this.agent.framework);
       const { sessionId } = this;
 
-      await runWithContext({ sessionId }, async () => {
-        for await (const chunk of this.agent.chatStream(message, { sessionId })) {
-          if (interrupted) break;
+      if (this.stream) {
+        // 流式模式
+        console.log(colored('● ', GREEN));
+
+        let lineBuffer = '';
+        await runWithContext({ sessionId }, async () => {
+          for await (const chunk of this.agent.chatStream(message, { sessionId })) {
+            if (interrupted) break;
 
-          if (chunk.type === 'text') {
-            fullResponse += chunk.text;
-            lineBuffer += chunk.text;
+            if (chunk.type === 'text') {
+              fullResponse += chunk.text;
+              lineBuffer += chunk.text;
 
-            while (lineBuffer.includes('\n')) {
-              if (interrupted) break;
+              while (lineBuffer.includes('\n')) {
+                if (interrupted) break;
 
-              const nlIndex = lineBuffer.indexOf('\n');
-              const line = lineBuffer.substring(0, nlIndex);
-              lineBuffer = lineBuffer.substring(nlIndex + 1);
-              if (line.trim()) {
-                console.log(renderLine(line, renderState));
+                const nlIndex = lineBuffer.indexOf('\n');
+                const line = lineBuffer.substring(0, nlIndex);
+                lineBuffer = lineBuffer.substring(nlIndex + 1);
+                if (line.trim()) {
+                  console.log(renderLine(line, renderState));
+                }
               }
+            } else if (chunk.type === 'tool-call') {
+              console.log(`\n${colored('[工具调用]', YELLOW)} ${chunk.toolName}`);
+            } else if (chunk.type === 'error') {
+              console.error(`\n${colored('[错误]', RED)} ${chunk.error}`);
             }
-          } else if (chunk.type === 'tool-call') {
-            console.log(`\n${colored('[工具调用]', YELLOW)} ${chunk.toolName}`);
-          } else if (chunk.type === 'error') {
-            console.error(`\n${colored('[错误]', RED)} ${chunk.error}`);
           }
+        });
+
+        if (lineBuffer.trim() && !interrupted) {
+          console.log(renderLine(lineBuffer, renderState));
         }
-      });
+      } else {
+        // 非流式模式
+        console.log(colored('○ ', CYAN) + '处理中...\n');
 
-      if (lineBuffer.trim() && !interrupted) {
-        console.log(renderLine(lineBuffer, renderState));
+        const result = await runWithContext({ sessionId }, async () => {
+          return await this.agent.chat(message, { sessionId });
+        });
+
+        if (interrupted) return;
+
+        fullResponse = result.message;
+
+        // 一次性渲染完整响应
+        const lines = fullResponse.split('\n');
+        for (const line of lines) {
+          if (line.trim()) {
+            console.log(renderLine(line, renderState));
+          } else {
+            console.log();
+          }
+        }
       }
     } catch (err) {
       if (!interrupted) {
@@ -189,11 +207,6 @@ class ChatUI {
       }
     } finally {
       process.removeListener('SIGINT', interruptHandler);
-
-      // 添加助手回复到会话历史
-      // if (this.sessionPlugin && fullResponse) {
-      //   this.sessionPlugin.addMessage(this.sessionId, { role: 'assistant', content: fullResponse });
-      // }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -59,7 +59,6 @@
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@modelcontextprotocol/sdk": "^1.27.1",
     "ai": "^6.0.146",
-    "dayjs": "^1.11.20",
     "dotenv": "^17.3.1",
     "gate-api": "^7.2.57",
     "hono": "^4.12.9",

package/plugins/default-plugins.js

@@ -289,7 +289,8 @@ async function bootstrapDefaults(framework, config = {}) {
   }
 
   // 1.5 创建主 Agent（供 Telegram 等需要绑定 Agent 的插件使用）
-  if (!framework._mainAgent && aiConfig.provider) {
+  // 注意：即使没有 AI 配置也创建主 agent，让 memory-plugin 等能注册 prompt parts
+  if (!framework._mainAgent) {
     const { Agent } = require('../src/core/agent')
     const aiPlugin = framework.pluginManager.get('ai')
     const aiClient = aiPlugin ? aiPlugin.getAIClient() : null
@@ -298,8 +299,8 @@ async function bootstrapDefaults(framework, config = {}) {
     framework._mainAgent = framework.createAgent({
       name: 'MainAgent',
       systemPrompt: '你是一个智能助手。当用户提出问题或任务时，你会主动分析需求，选择合适的工具来获取信息或执行操作。你善于将复杂任务拆解为多个步骤，通过工具协作完成。',
-      model: aiConfig.model,
-      provider: aiConfig.provider,
+      model: aiConfig.model || 'deepseek-chat',
+      provider: aiConfig.provider || 'deepseek',
       apiKey: aiConfig.apiKey,
       baseURL: aiConfig.baseURL
     })

package/plugins/extension-executor-plugin.js

@@ -23,52 +23,6 @@ class ExtensionExecutorPlugin extends Plugin {
     this._extensions = new Map();
   }
 
-  /**
-   * 从 JSON Schema 构建 Zod Schema
-   * @param {Object} jsonSchema - JSON Schema 对象
-   * @returns {z.ZodObject}
-   */
-  _buildZodSchema(jsonSchema) {
-    const properties = jsonSchema.properties || {};
-    const required = jsonSchema.required || [];
-    const shape = {};
-
-    for (const [name, prop] of Object.entries(properties)) {
-      let field;
-      const isRequired = required.includes(name);
-
-      switch (prop.type) {
-        case 'string':
-          field = z.string();
-          break;
-        case 'number':
-          field = z.number();
-          break;
-        case 'boolean':
-          field = z.boolean();
-          break;
-        case 'array':
-          field = z.array(z.any());
-          break;
-        case 'object':
-          field = z.object({});
-          break;
-        default:
-          field = z.any();
-      }
-
-      if (prop.description) {
-        field = field.describe(prop.description);
-      }
-      if (!isRequired) {
-        field = field.optional();
-      }
-      shape[name] = field;
-    }
-
-    return z.object(shape);
-  }
-
   install(framework) {
     this._framework = framework;
 
@@ -178,49 +132,20 @@ class ExtensionExecutorPlugin extends Plugin {
         args: z.record(z.any()).optional().describe('工具参数'),
       }),
       execute: async (args) => {
-        try {
-          const { plugin, tool, args: toolArgs = {} } = args;
-          log.info(` ext_call: plugin=${plugin}, tool=${tool}`);
-
-          const ext = this._extensions.get(plugin);
-          if (!ext) {
-            return { success: false, error: `扩展插件 '${plugin}' 不存在` };
-          }
+        const { plugin, tool, args: toolArgs = {} } = args;
+        log.info(` ext_call: plugin=${plugin}, tool=${tool}`);
 
-          const toolDef = ext.tools.find((t) => t.name === tool);
-          if (!toolDef) {
-            const availableTools = ext.tools.map((t) => t.name).join(', ');
-            return {
-              success: false,
-              error: `扩展工具 '${tool}' 不存在。可用工具: ${availableTools || '无'}`
-            };
-          }
+        const ext = this._extensions.get(plugin);
+        if (!ext) {
+          return { success: false, error: `扩展插件 '${plugin}' 不存在` };
+        }
 
-          // 验证参数
-          if (toolDef.inputSchema) {
-            try {
-              const schema = toolDef.inputSchema instanceof z.ZodType
-                ? toolDef.inputSchema
-                : this._buildZodSchema(toolDef.inputSchema);
-              schema.parse(toolArgs);
-            } catch (err) {
-              if (err instanceof z.ZodError) {
-                const fieldErrors = err.errors.map((e) => `${e.path.join('.')}: ${e.message}`).join('; ');
-                return {
-                  success: false,
-                  error: `参数错误: ${fieldErrors}`,
-                  inputSchema: toolDef.inputSchema,
-                };
-              }
-              return {
-                success: false,
-                error: `参数验证失败: ${err.message}`,
-                inputSchema: toolDef.inputSchema,
-              };
-            }
-          }
+        const toolDef = ext.tools.find((t) => t.name === tool);
+        if (!toolDef) {
+          return { success: false, error: `扩展工具 '${tool}' 不存在` };
+        }
 
-        
+        try {
           // 触发扩展工具开始事件
           framework.emit('tool:call', {
             name: `${plugin}:${tool}`,
@@ -295,11 +220,7 @@ class ExtensionExecutorPlugin extends Plugin {
 
         const toolDef = ext.tools.find((t) => t.name === tool);
         if (!toolDef) {
-          const availableTools = ext.tools.map((t) => t.name).join(', ');
-          return {
-            success: false,
-            error: `扩展工具 '${tool}' 不存在。可用工具: ${availableTools || '无'}`
-          };
+          return { success: false, error: `扩展工具 '${tool}' 不存在` };
         }
 
         return {

package/plugins/file-system-plugin.js

@@ -827,9 +827,10 @@ class FileSystemPlugin extends Plugin {
         timeout: z.number().optional().describe('超时时间(ms)，默认 30000'),
         proxy: z.boolean().optional().describe('是否使用代理，默认 false。访问失败时可自动设为 true 重试'),
         toMarkdown: z.boolean().default(true).describe('是否将 HTML 响应转换为 Markdown 格式，默认 true'),
+        maxLength: z.number().optional().describe('最大返回长度（字符数），超过则截断')
       }),
       execute: async (args, framework) => {
-        const { url, method = 'GET', headers = {}, body, timeout = 30000, proxy = false, toMarkdown = true } = args
+        const { url, method = 'GET', headers = {}, body, timeout = 30000, proxy = false, toMarkdown = true, maxLength } = args
         try {
           const controller = new AbortController()
           const timeoutId = setTimeout(() => controller.abort(), timeout)
@@ -858,18 +859,27 @@ class FileSystemPlugin extends Plugin {
             const isHtml = /<[a-z][\s\S]*>/i.test(data) || data.trim().startsWith('<')
             if (isHtml) {
               try {
+                
                 const markdown = NodeHtmlMarkdown.translate(data)
+                // 限制返回长度
+                const truncatedMarkdown = maxLength && markdown.length > maxLength 
+                  ? markdown.substring(0, maxLength) + '\n\n...(truncated)' 
+                  : markdown
                 return {
                   success: true,
                   status: response.status,
                   statusText: response.statusText,
                   headers: Object.fromEntries(response.headers.entries()),
                   usedProxy: proxy,
-                  markdown: markdown,
+                  markdown: truncatedMarkdown,
                   originalLength: markdown.length,
+                  truncated: maxLength && markdown.length > maxLength
                 }
               } catch (e) {
                 // 转换失败时返回原始 body
+                const truncatedBody = maxLength && data.length > maxLength
+                  ? data.substring(0, maxLength) + '\n\n...(truncated)'
+                  : data
                 return {
                   success: true,
                   status: response.status,
@@ -877,8 +887,9 @@ class FileSystemPlugin extends Plugin {
                   headers: Object.fromEntries(response.headers.entries()),
                   usedProxy: proxy,
                   markdown: null,
-                  body: data,
+                  body: truncatedBody,
                   originalLength: data.length,
+                  truncated: maxLength && data.length > maxLength,
                   markdownError: e.message
                 }
               }
@@ -886,14 +897,18 @@ class FileSystemPlugin extends Plugin {
           }
 
           // toMarkdown 为 false 或非 HTML 内容时，返回原始内容
+          const truncatedData = maxLength && typeof data === 'string' && data.length > maxLength
+            ? data.substring(0, maxLength) + '\n\n...(truncated)'
+            : data
           return {
             success: true,
             status: response.status,
             statusText: response.statusText,
             headers: Object.fromEntries(response.headers.entries()),
             usedProxy: proxy,
-            body: data,
+            body: truncatedData,
             originalLength: typeof data === 'string' ? data.length : null,
+            truncated: maxLength && typeof data === 'string' && data.length > maxLength
           }
         } catch (error) {
           return {

package/plugins/memory-plugin.js

@@ -9,6 +9,7 @@ const log = logger.child('Memory')
 const { z } = require('zod')
 const fs = require('fs')
 const path = require('path')
+const { EventEmitter } = require('events')
 
 /**
  * 记忆类型常量
@@ -190,8 +191,9 @@ function _extractJSON(text) {
 /**
  * MemoryStore - 双层存储（内存 + 文件）
  */
-class MemoryStore {
+class MemoryStore extends EventEmitter {
   constructor(baseDir) {
+    super()
     this._baseDir = path.resolve(process.cwd(), baseDir)
     this._memory = new Map() // memoryId -> memory object
     this._indexByType = new Map() // type -> Set of memoryIds
@@ -353,6 +355,10 @@ class MemoryStore {
     this._fileIndex.set(id, filePath)
 
     log.debug(`Added memory: ${id} (${newMemory.type})`)
+
+    // 触发变化事件
+    this.emit('change', { action: 'add', memory: newMemory })
+
     return newMemory
   }
 
@@ -393,6 +399,10 @@ class MemoryStore {
     this._fileIndex.set(id, filePath)
 
     log.debug(`Updated memory: ${id}`)
+
+    // 触发变化事件
+    this.emit('change', { action: 'update', memory })
+
     return memory
   }
 
@@ -415,6 +425,10 @@ class MemoryStore {
     this._fileIndex.delete(id)
 
     log.debug(`Deleted memory: ${id}`)
+
+    // 触发变化事件
+    this.emit('change', { action: 'delete', memory })
+
     return true
   }
 
@@ -549,6 +563,9 @@ class MemoryPlugin extends Plugin {
     // 注册 memory-context 到系统提示（优先级 350）
     this._registerMemoryContext(framework)
 
+    // 监听记忆变化，动态刷新系统提示词
+    this._setupDynamicRefresh(framework)
+
     log.info('Memory plugin started')
     return this
   }
@@ -899,21 +916,34 @@ ${typeof assistantResponse === 'string' ? assistantResponse : JSON.stringify(ass
    * 注册 memory-context 到系统提示
    */
   _registerMemoryContext(framework) {
-    // 获取主 agent 并注册 memory-context 部分
     const mainAgent = framework._mainAgent
     if (mainAgent) {
       mainAgent.registerPromptPart('memory-context', 350, () => {
         return this._buildMemoryContext()
       })
+      mainAgent._refreshContext()
     }
 
-    // 也监听 framework:ready 事件，以防主 agent 还没创建
     framework.on('framework:ready', () => {
       const agent = framework._mainAgent
       if (agent) {
         agent.registerPromptPart('memory-context', 350, () => {
           return this._buildMemoryContext()
         })
+        agent._refreshContext()
+      }
+    })
+  }
+
+  /**
+   * 设置动态刷新 - 记忆变化时自动刷新系统提示词
+   */
+  _setupDynamicRefresh(framework) {
+    this._store.on('change', ({ action, memory }) => {
+      const mainAgent = framework._mainAgent
+      if (mainAgent) {
+        mainAgent.invalidatePromptPart('memory-context')
+        mainAgent._refreshContext()
       }
     })
   }
@@ -923,7 +953,6 @@ ${typeof assistantResponse === 'string' ? assistantResponse : JSON.stringify(ass
    */
   _buildMemoryContext() {
     try {
-      // 获取所有 user 类型记忆作为用户偏好
       const userMemories = this._store.listByType(MEMORY_TYPES.USER, 10)
       const projectMemories = this._store.listByType(MEMORY_TYPES.PROJECT, 5)
 

package/plugins/subagent-plugin.js

@@ -9,7 +9,6 @@ const { Plugin } = require('../src/core/plugin-base')
 const { logger } = require('../src/utils/logger')
 const log = logger.child('SubAgent')
 const { z } = require('zod')
-const { cleanResponse } = require('../src/utils')
 const { Agent } = require('../src/core/agent')
 
 class SubAgentPlugin extends Plugin {
@@ -461,28 +460,17 @@ class SubAgentManagerPlugin extends Plugin {
         if (!plugin) {
           return { success: false, error: `SubAgent ${args.agentName} not found` }
         }
+
         try {
           const result = await plugin.chat(args.task)
-          // 提取返回内容
-          let output = result.message || result
-          // 处理 { type: "text", value: "..." } 格式
-          if (output && output.type === 'text' && output.value) {
-            output = output.value
-          }
-          // 清理 thinking 标签
-          if (typeof output === 'string') {
-            output = cleanResponse(output)
-          }
-          if (result.success !== false) {
-            // 确保返回的是字符串
-            if (typeof output === 'string') {
-              return output
-            }
-            return JSON.stringify(output, null, 2)
+          return {
+            success: true,
+            agent: args.agentName,
+            result: result.message || result,
+            success: result.success !== false
           }
-          return { error: typeof output === 'string' ? output : JSON.stringify(output) }
         } catch (err) {
-          return { error: err.message }
+          return { success: false, error: err.message }
         }
       }
     })
@@ -535,28 +523,17 @@ class SubAgentManagerPlugin extends Plugin {
         if (!plugin) {
           return { success: false, error: `SubAgent ${args.agentName} not found` }
         }
+
         try {
           const result = await plugin.chat(args.task)
-          // 提取返回内容
-          let output = result.message || result
-          // 处理 { type: "text", value: "..." } 格式
-          if (output && output.type === 'text' && output.value) {
-            output = output.value
-          }
-          // 清理 thinking 标签
-          if (typeof output === 'string') {
-            output = cleanResponse(output)
-          }
-          if (result.success !== false) {
-            // 确保返回的是字符串
-            if (typeof output === 'string') {
-              return output
-            }
-            return JSON.stringify(output, null, 2)
+          return {
+            success: true,
+            agent: args.agentName,
+            result: result.message || result,
+            success: result.success !== false
           }
-          return { error: typeof output === 'string' ? output : JSON.stringify(output) }
         } catch (err) {
-          return { error: err.message }
+          return { success: false, error: err.message }
         }
       }
     })