foliko 1.1.8 → 1.1.9

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

@@ -151,29 +151,40 @@ class ChatUI {
 
         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;
-
-              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));
+          await this.agent.continue(message, sessionId, {
+            onChunk: (chunk) => {
+              if (interrupted) return;
+
+              if (chunk.type === 'text') {
+                fullResponse += chunk.text;
+                lineBuffer += chunk.text;
+
+                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));
+                  }
                 }
+              } else if (chunk.type === 'tool-call') {
+                console.log(
+                  `\n${colored('[工具调用]', YELLOW)} ${chunk.toolName}`,
+                  JSON.stringify(chunk.input)
+                );
+              } 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}`);
-            }
-          }
+            },
+            onComplete: async (full, ctx) => {
+              const response = cleanResponse(full);
+              if (!response) {
+                ctx.push('请继续完成任务', { sessionId });
+              }
+            },
+          });
         });
 
         if (lineBuffer.trim() && !interrupted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -58,7 +58,6 @@
     "@hono/node-server": "^1.19.11",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@modelcontextprotocol/sdk": "^1.27.1",
-    "@napi-rs/canvas": "^0.1.97",
     "ai": "^6.0.146",
     "dotenv": "^17.3.1",
     "gate-api": "^7.2.57",

package/plugins/default-plugins.js

@@ -21,7 +21,8 @@ function loadAgentConfig(agentDir = '.agent') {
     mcpServers: {},
     plugins: [],
     skillsDirs: [],
-    agentsDir: null    // 子Agent配置目录
+    agentsDir: null,    // 子Agent配置目录
+    pluginLinks: {}     // 外部插件链接 { "插件名": "外部路径" }
   }
   const cmdDir=path.resolve(process.cwd())
   const resolvedDir = path.resolve(process.cwd(), agentDir)
@@ -100,6 +101,13 @@ function loadAgentConfig(agentDir = '.agent') {
       if (pluginsConfig.email) {
         config.email = pluginsConfig.email
       }
+      // 外部插件链接配置 (pluginLinks: { "poster": "/path/to/poster-plugin" })
+      if (pluginsConfig.pluginLinks) {
+        config.pluginLinks = pluginsConfig.pluginLinks
+        for (const [name, targetPath] of Object.entries(pluginsConfig.pluginLinks)) {
+          log.info(` Found plugin link: ${name} -> ${targetPath}`)
+        }
+      }
     } catch (err) {
       log.error(` Failed to load plugins.json:`, err.message)
     }
@@ -376,6 +384,7 @@ async function bootstrapDefaults(framework, config = {}) {
  * 支持两种结构：
  * 1. 文件夹结构: .agent/plugins/my-plugin/index.js
  * 2. 单文件结构: .agent/plugins/my-plugin.js
+ * 支持符号链接
  * @param {string} pluginsDir - 插件目录
  * @param {string} name - 插件名称
  * @returns {{path: string, type: 'folder'|'file'}|null} 插件路径和类型
@@ -384,8 +393,28 @@ function resolvePluginPath(pluginsDir, name) {
   const folderPath = path.join(pluginsDir, name)
   const filePath = path.join(pluginsDir, `${name}.js`)
 
-  // 文件夹优先
-  if (fs.existsSync(folderPath) && fs.statSync(folderPath).isDirectory()) {
+  // 检查文件夹是否存在
+  if (!fs.existsSync(folderPath)) {
+    // 单文件回退
+    if (fs.existsSync(filePath)) {
+      return { path: filePath, type: 'file' }
+    }
+    return null
+  }
+
+  // 检查是否为目录（支持符号链接）
+  let isDir = false
+  try {
+    isDir = fs.statSync(folderPath).isDirectory()
+  } catch (err) {
+    // 无法访问，跳过
+    if (fs.existsSync(filePath)) {
+      return { path: filePath, type: 'file' }
+    }
+    return null
+  }
+
+  if (isDir) {
     const pkgPath = path.join(folderPath, 'package.json')
     if (fs.existsSync(pkgPath)) {
       try {
@@ -404,7 +433,6 @@ function resolvePluginPath(pluginsDir, name) {
     if (fs.existsSync(indexPath)) {
       return { path: indexPath, type: 'folder' }
     }
-    //log.warn(` No entry point found for plugin folder: ${name}`)
     return null
   }
 
@@ -418,6 +446,7 @@ function resolvePluginPath(pluginsDir, name) {
 
 /**
  * 扫描插件目录，返回所有插件名称
+ * 支持符号链接
  * @param {string} pluginsDir - 插件目录
  * @returns {string[]} 插件名称列表
  */
@@ -430,8 +459,31 @@ function scanPluginNames(pluginsDir) {
   const entries = fs.readdirSync(pluginsDir, { withFileTypes: true })
 
   for (const entry of entries) {
-    if (entry.isDirectory()) {
-      // 文件夹插件
+    const fullPath = path.join(pluginsDir, entry.name)
+    
+    // 检查是否为符号链接
+    let isSymlink = false
+    try {
+      const lstat = fs.lstatSync(fullPath)
+      isSymlink = lstat.isSymbolicLink()
+    } catch (err) {
+      // 无法获取信息，跳过
+      continue
+    }
+
+    // 获取实际类型（跟随符号链接）
+    let isDir = entry.isDirectory()
+    if (isSymlink) {
+      try {
+        isDir = fs.statSync(fullPath).isDirectory()
+      } catch (err) {
+        // 符号链接目标不存在，跳过
+        continue
+      }
+    }
+
+    if (isDir) {
+      // 文件夹插件（包括符号链接指向的目录）
       names.add(entry.name)
     } else if (entry.isFile() && entry.name.endsWith('.js')) {
       // 单文件插件（排除与文件夹同名的）

package/plugins/extension-executor-plugin.js

@@ -347,27 +347,14 @@ class ExtensionExecutorPlugin extends Plugin {
     const extDesc = this._buildExtensionsDescription();
     if (!extDesc) return;
 
-    const existingPrompt = agent._originalPrompt || '';
-
-    // 如果已有 [Extensions] 部分，替换它
-    const extStartIdx = existingPrompt.indexOf('【Extensions】');
-    if (extStartIdx !== -1) {
-      const extEndMarker = '\n\n【';
-      let extEndIdx = existingPrompt.indexOf(extEndMarker, extStartIdx);
-      if (extEndIdx === -1) {
-        // 尝试其他标记
-        extEndIdx = existingPrompt.indexOf('\n\n---\n\n', extStartIdx);
-      }
-      if (extEndIdx === -1) {
-        extEndIdx = existingPrompt.length;
-      } else {
-        extEndIdx += extEndMarker.length;
-      }
-      const newPrompt = existingPrompt.substring(0, extStartIdx) + extDesc + existingPrompt.substring(extEndIdx);
-      agent.setSystemPrompt(newPrompt);
-    } else {
-      agent.setSystemPrompt(existingPrompt + '\n\n' + extDesc);
-    }
+    let existingPrompt = agent._originalPrompt || '';
+
+    // 移除所有已存在的 ## 【Extensions】 部分（防止重复累积）
+    const extRegex = /## 【Extensions】[\s\S]*?(?=\n## 【|$)/;
+    existingPrompt = existingPrompt.replace(extRegex, '').trim();
+
+    // 添加新的 Extensions 部分
+    agent.setSystemPrompt(existingPrompt + '\n\n' + extDesc);
   }
 
   _buildExtensionsDescription() {