foliko 2.0.21 → 2.0.22

package/src/tool/router.js

@@ -15,7 +15,7 @@ const INTENT_PATTERNS = {
     ],
     tools: [
       'read_file', 'write_file', 'delete_file', 'modify_file',
-      'read_directory', 'create_directory', 'search_file',
+      'read_directory', 'create_directory', 'search',
     ],
   },
   code_development: {
@@ -34,7 +34,7 @@ const INTENT_PATTERNS = {
   },
   data_analysis: {
     keywords: ['分析', '数据', '统计', '查询', 'analyze', 'data', 'statistics', 'query'],
-    tools: ['execute_command', 'py_execute', 'search_file'],
+    tools: ['execute_command', 'py_execute', 'search', 'read_file', 'write_file'],
   },
   plugin_management: {
     keywords: ['插件', '重载', '加载插件', 'plugin', 'reload', 'load plugin'],

package/src/utils/message-validator.js

@@ -499,6 +499,191 @@ function filterPairedMessages(messages, keepRecentAssistant = 3) {
     .map((i) => messages[i]);
 }
 
+/**
+ * ★ 防御性 sanitize：确保 messages 数组符合 AI SDK 的 ModelMessage[] schema
+ *
+ * 已知会失败的情况：
+ * 1. `user.content` 不是 string 或 array（如 null、undefined、object）
+ * 2. `assistant.content` 不是 string 或 array
+ * 3. `tool.content` 不是 array
+ * 4. user/assistant content 是 array，但 part 缺少 `type` 字段或 type 不在白名单
+ * 5. tool content 是 array，但 part 不是 tool-result/tool-approval-response
+ * 6. tool-result 的 `output` 缺少 type 或 type 不在 AI SDK 允许集
+ *
+ * 策略：
+ * - 可修复 → 修复（log warn）
+ * - 不可修复 → 丢弃整条消息（log warn）
+ *
+ * @param {Array} messages 消息数组
+ * @returns {{ messages: Array, fixed: number, dropped: number }}
+ */
+function sanitizeForLLM(messages) {
+  if (!Array.isArray(messages)) return { messages: [], fixed: 0, dropped: 0 };
+  const VALID_USER_PARTS = new Set(['text', 'image', 'file']);
+  const VALID_ASSISTANT_PARTS = new Set(['text', 'file', 'reasoning', 'tool-call', 'tool-result', 'tool-approval-request']);
+  const VALID_TOOL_PARTS = new Set(['tool-result', 'tool-approval-response']);
+  const VALID_OUTPUT_TYPES = new Set(['text', 'json', 'execution-denied', 'content', 'error-text', 'error-json']);
+
+  let fixed = 0;
+  let dropped = 0;
+  const out = [];
+
+  for (let i = 0; i < messages.length; i++) {
+    const m = messages[i];
+    if (!m || typeof m !== 'object' || !m.role) {
+      console.warn(`[sanitizeForLLM] dropped msg[${i}]: missing role`);
+      dropped++;
+      continue;
+    }
+
+    if (m.role === 'system') {
+      // system: content 必须是 string
+      if (typeof m.content !== 'string') {
+        console.warn(`[sanitizeForLLM] fixed system msg[${i}]: content ${typeof m.content} → string`);
+        out.push({ ...m, content: String(m.content ?? '') });
+        fixed++;
+      } else {
+        out.push(m);
+      }
+      continue;
+    }
+
+    if (m.role === 'user') {
+      // user: content 必须是 string 或 array（text/image/file parts）
+      if (typeof m.content === 'string') {
+        out.push(m);
+        continue;
+      }
+      if (Array.isArray(m.content)) {
+        const newContent = [];
+        for (const part of m.content) {
+          if (part && typeof part === 'object' && VALID_USER_PARTS.has(part.type)) {
+            newContent.push(part);
+          } else {
+            console.warn(`[sanitizeForLLM] dropped user msg[${i}] part: ${JSON.stringify(part).slice(0, 100)}`);
+            fixed++;
+          }
+        }
+        if (newContent.length === 0) {
+          console.warn(`[sanitizeForLLM] dropped user msg[${i}]: all parts invalid`);
+          dropped++;
+          continue;
+        }
+        out.push({ ...m, content: newContent });
+        continue;
+      }
+      // content 是 object/null/undefined → 转为 string 或丢弃
+      if (m.content == null) {
+        console.warn(`[sanitizeForLLM] dropped user msg[${i}]: null content`);
+        dropped++;
+        continue;
+      }
+      // 转为字符串
+      try {
+        out.push({ ...m, content: JSON.stringify(m.content) });
+        fixed++;
+        console.warn(`[sanitizeForLLM] fixed user msg[${i}]: content object → string`);
+      } catch {
+        out.push({ ...m, content: String(m.content) });
+        fixed++;
+      }
+      continue;
+    }
+
+    if (m.role === 'assistant') {
+      // assistant: content 必须是 string 或 array
+      if (typeof m.content === 'string') {
+        out.push(m);
+        continue;
+      }
+      if (Array.isArray(m.content)) {
+        const newContent = [];
+        for (const part of m.content) {
+          if (!part || typeof part !== 'object' || !part.type) {
+            console.warn(`[sanitizeForLLM] dropped assistant msg[${i}] part: no type - ${JSON.stringify(part).slice(0, 100)}`);
+            fixed++;
+            continue;
+          }
+          if (VALID_ASSISTANT_PARTS.has(part.type)) {
+            newContent.push(part);
+          } else {
+            console.warn(`[sanitizeForLLM] dropped assistant msg[${i}] part: unknown type "${part.type}"`);
+            fixed++;
+          }
+        }
+        if (newContent.length === 0) {
+          console.warn(`[sanitizeForLLM] dropped assistant msg[${i}]: all parts invalid`);
+          dropped++;
+          continue;
+        }
+        out.push({ ...m, content: newContent });
+        continue;
+      }
+      if (m.content == null) {
+        console.warn(`[sanitizeForLLM] dropped assistant msg[${i}]: null content`);
+        dropped++;
+        continue;
+      }
+      try {
+        out.push({ ...m, content: JSON.stringify(m.content) });
+        fixed++;
+        console.warn(`[sanitizeForLLM] fixed assistant msg[${i}]: content ${typeof m.content} → string`);
+      } catch {
+        out.push({ ...m, content: String(m.content) });
+        fixed++;
+      }
+      continue;
+    }
+
+    if (m.role === 'tool') {
+      // tool: content 必须是 array (tool-result 或 tool-approval-response)
+      if (!Array.isArray(m.content)) {
+        console.warn(`[sanitizeForLLM] dropped tool msg[${i}]: content is ${typeof m.content}, not array`);
+        dropped++;
+        continue;
+      }
+      const newContent = [];
+      for (const part of m.content) {
+        if (!part || typeof part !== 'object' || !part.type) {
+          console.warn(`[sanitizeForLLM] dropped tool msg[${i}] part: no type`);
+          fixed++;
+          continue;
+        }
+        if (!VALID_TOOL_PARTS.has(part.type)) {
+          console.warn(`[sanitizeForLLM] dropped tool msg[${i}] part: type "${part.type}" not in tool union`);
+          fixed++;
+          continue;
+        }
+        // 修复 tool-result.output
+        if (part.type === 'tool-result') {
+          if (!part.output || typeof part.output !== 'object' || !VALID_OUTPUT_TYPES.has(part.output.type)) {
+            console.warn(`[sanitizeForLLM] fixed tool msg[${i}] tool-result: bad output - ${JSON.stringify(part.output).slice(0, 100)}`);
+            const out2 = (part.output == null) ? { type: 'text', value: String(part.output ?? '') } :
+              { type: 'text', value: JSON.stringify(part.output) };
+            newContent.push({ ...part, output: out2 });
+            fixed++;
+            continue;
+          }
+        }
+        newContent.push(part);
+      }
+      if (newContent.length === 0) {
+        console.warn(`[sanitizeForLLM] dropped tool msg[${i}]: all parts invalid`);
+        dropped++;
+        continue;
+      }
+      out.push({ ...m, content: newContent });
+      continue;
+    }
+
+    // 未知 role：丢弃
+    console.warn(`[sanitizeForLLM] dropped msg[${i}]: unknown role "${m.role}"`);
+    dropped++;
+  }
+
+  return { messages: out, fixed, dropped };
+}
+
 module.exports = {
   validateMessagesPairing,
   validateToolCalls,
@@ -506,4 +691,5 @@ module.exports = {
   normalizeToolOutputs,
   filterOrphanToolCalls,
   filterPairedMessages,
+  sanitizeForLLM,
 };

package/tests/core/chat-tool.test.js

@@ -0,0 +1,187 @@
+import { describe, it, expect } from 'vitest';
+
+// 测试 file-system 插件的 chat 工具修复
+// 通过读源码 + 模拟 execute 来验证行为
+
+const fs = require('fs');
+const path = require('path');
+
+const FileSystemPlugin = require('../../plugins/io/file-system/index.js');
+
+function makeFakeFw(opts = {}) {
+  const llmConfig = opts.llmConfig || { model: 'test-model', provider: 'test-provider' };
+  const captured = { agentConfig: null, chatArgs: null, registeredTools: [] };
+  const fw = {
+    getCwd: () => process.cwd(),
+    pluginManager: {
+      get: (name) => {
+        if (name === 'ai') return { getConfig: () => llmConfig };
+        return null;
+      },
+    },
+    // ★ Plugin base class 的 tool.register 会先 push 到 _registeredTools，
+    //   然后查 registry.has()，has() 返回 false 才调 registry.register()。
+    //   所以 mock 必须实现 has() 否则注册流程被中断。
+    registerTool: (toolDef) => {
+      captured.registeredTools.push(toolDef);
+    },
+    toolRegistry: {
+      has: () => false,
+      register: (toolDef) => {
+        captured.registeredTools.push(toolDef);
+      },
+    },
+    createSubAgent: (config) => {
+      captured.agentConfig = config;
+      return {
+        chat: async (msg, opts) => {
+          captured.chatArgs = { msg, opts };
+          return { success: true, message: 'mock reply', steps: 1 };
+        },
+      };
+    },
+  };
+  return { fw, captured };
+}
+
+function getChatTool(captured) {
+  return captured.registeredTools.find(t => t.name === 'chat');
+}
+
+describe('file-system 插件的 chat 工具', () => {
+  it('★ 关键：name 唯一（用 Date.now + random 避免冲突）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    // 直接调工具的 execute
+    // find chat tool in _registeredTools
+    const chatTool = getChatTool(captured);
+    expect(chatTool).toBeTruthy();
+    if (!chatTool) return;
+
+    const r1 = await chatTool.execute({ message: 'hi' }, fw);
+    const r2 = await chatTool.execute({ message: 'hi2' }, fw);
+
+    expect(captured.agentConfig.name).toMatch(/^file-system-chat-\d+/);
+    // 两次调用应产生不同名字
+    const name1 = r1.metadata?.agent;
+    const name2 = r2.metadata?.agent;
+    expect(name1).not.toBe(name2);
+  });
+
+  it('★ 关键：sessionId 隔离（避免污染主对话）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    // 1. 不传 sessionId → 自动生成
+    await chatTool.execute({ message: 'm1' }, fw);
+    expect(captured.chatArgs.opts.sessionId).toMatch(/^chat-\d+$/);
+
+    // 2. 传 sessionId → 使用传入的
+    await chatTool.execute({ message: 'm2', sessionId: 'my-session' }, fw);
+    expect(captured.chatArgs.opts.sessionId).toBe('my-session');
+  });
+
+  it('★ 关键：跟随主 agent 的 LLM 配置', async () => {
+    const llmConfig = {
+      model: 'deepseek-chat',
+      provider: 'deepseek',
+      apiKey: 'sk-test',
+      baseURL: 'https://api.deepseek.com/v1',
+    };
+    const { fw, captured } = makeFakeFw({ llmConfig });
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    await chatTool.execute({ message: 'hi' }, fw);
+    expect(captured.agentConfig.model).toBe('deepseek-chat');
+    expect(captured.agentConfig.provider).toBe('deepseek');
+    expect(captured.agentConfig.apiKey).toBe('sk-test');
+    expect(captured.agentConfig.baseURL).toBe('https://api.deepseek.com/v1');
+    expect(captured.agentConfig.hidden).toBe(true);
+  });
+
+  it('★ 关键：data 只返回 message 文本（不返回整个对象）', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    const r = await chatTool.execute({ message: 'hi' }, fw);
+    expect(r.success).toBe(true);
+    expect(r.data).toBe('mock reply');  // 只是字符串，不是整个对象
+    expect(typeof r.data).toBe('string');
+    // metadata 含元信息
+    expect(r.metadata).toBeTruthy();
+    expect(r.metadata.steps).toBe(1);
+  });
+
+  it('★ 关键：systemPrompt 默认值合理', async () => {
+    const { fw, captured } = makeFakeFw();
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = getChatTool(captured);
+    if (!chatTool) throw new Error('no chat tool');
+
+    // 不传 systemPrompt → 用默认
+    await chatTool.execute({ message: 'hi' }, fw);
+    expect(captured.agentConfig.systemPrompt).toContain('文件系统');
+
+    // 传 systemPrompt → 覆盖
+    await chatTool.execute({
+      message: 'hi',
+      systemPrompt: '你是一个翻译助手',
+    }, fw);
+    expect(captured.agentConfig.systemPrompt).toBe('你是一个翻译助手');
+  });
+
+  it('★ 关键：错误捕获（AI 抛错时不崩溃）', async () => {
+    const registeredTools = [];
+    const fw = {
+      getCwd: () => process.cwd(),
+      pluginManager: { get: () => null },
+      registerTool: (t) => registeredTools.push(t),
+      toolRegistry: { has: () => false, register: (t) => registeredTools.push(t) },
+      createSubAgent: () => ({
+        chat: async () => { throw new Error('AI 服务不可用'); },
+      }),
+    };
+    const p = new FileSystemPlugin();
+    p.install(fw);
+    p.start(fw);
+    const chatTool = registeredTools.find(t => t.name === 'chat');
+    if (!chatTool) throw new Error('no chat tool');
+
+    const r = await chatTool.execute({ message: 'hi' }, fw);
+    expect(r.success).toBe(false);
+    expect(r.error).toBe('AI 服务不可用');
+  });
+
+  it('★ inputSchema 含 sessionId 字段', () => {
+    // 直接读源码验证
+    const src = fs.readFileSync(
+      path.join(__dirname, '../../plugins/io/file-system/index.js'),
+      'utf-8'
+    );
+    expect(src).toMatch(/sessionId:\s*z\.string\(\)\.optional\(\)/);
+  });
+
+  it('★ 删除死代码：const ai = framework.getAI()', () => {
+    const src = fs.readFileSync(
+      path.join(__dirname, '../../plugins/io/file-system/index.js'),
+      'utf-8'
+    );
+    expect(src).not.toMatch(/const\s+ai\s*=\s*framework\.getAI/);
+  });
+});

package/tests/core/edit-file.test.js

@@ -0,0 +1,194 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+
+const FileSystemPlugin = require('../../plugins/io/file-system/index.js');
+
+let tempDir, framework, tool;
+let fileSystem;
+
+beforeEach(async () => {
+  tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'edit-test-'));
+  fs.writeFileSync(path.join(tempDir, 'sample.js'),
+    'function hello() {\n  console.log("hello world");\n  return 42;\n}\n');
+
+  const registeredTools = [];
+  framework = {
+    getCwd: () => tempDir,
+    registerTool: (t) => registeredTools.push(t),
+    pluginManager: { get: () => null },
+    toolRegistry: { has: () => false, register: (t) => registeredTools.push(t) },
+  };
+  const p = new FileSystemPlugin();
+  p.install(framework);
+  tool = registeredTools.find(t => t.name === 'edit' || t.name === 'edit_file');
+  if (!tool) throw new Error('edit tool not registered');
+});
+
+afterEach(() => {
+  fs.rmSync(tempDir, { recursive: true, force: true });
+});
+
+describe('edit/edit_file 工具 (frs-replace 实现)', () => {
+  it('★ 基础：单次字面量替换', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: 'hello world', newText: 'goodbye universe' }],
+    }, framework);
+    expect(r.success).toBe(true);
+    expect(r.data.appliedEdits).toBe(1);
+    const newContent = fs.readFileSync(path.join(tempDir, 'sample.js'), 'utf8');
+    expect(newContent).toContain('goodbye universe');
+    expect(newContent).not.toContain('hello world');
+  });
+
+  it('★ 多次替换按顺序应用', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [
+        { oldText: 'function hello', newText: 'function greet' },
+        { oldText: 'console.log', newText: 'console.warn' },
+      ],
+    }, framework);
+    expect(r.success).toBe(true);
+    expect(r.data.appliedEdits).toBe(2);
+    const newContent = fs.readFileSync(path.join(tempDir, 'sample.js'), 'utf8');
+    expect(newContent).toContain('function greet()');
+    expect(newContent).toContain('console.warn');
+  });
+
+  it('★ 关键：找不到 oldText 报错（不再静默不生效）', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: 'NOT_EXISTING_TEXT_XYZ', newText: 'foo' }],
+    }, framework);
+    expect(r.success).toBe(false);
+    expect(r.error).toContain('替换未生效');
+    expect(r.error).toContain('找不到');
+  });
+
+  it('★ useRegex=true 支持正则匹配', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{
+        oldText: '\\b\\w+\\(\\)',  // 匹配 "函数名()"
+        newText: 'fn()',
+        useRegex: true,
+      }],
+    }, framework);
+    expect(r.success).toBe(true);
+    const newContent = fs.readFileSync(path.join(tempDir, 'sample.js'), 'utf8');
+    // hello() → fn() 但 greet() 也会变（多匹配中第一个）
+    expect(newContent).toContain('fn()');
+  });
+
+  it('★ useRegex=true 无效正则报错', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: '[invalid(', newText: 'X', useRegex: true }],
+    }, framework);
+    expect(r.success).toBe(false);
+    expect(r.error).toContain('无效的正则');
+  });
+
+  it('★ useRegex=true 多次出现都被替换（默认）', async () => {
+    fs.writeFileSync(path.join(tempDir, 'multi.txt'), 'foo foo foo bar foo');
+    const r = await tool.execute({
+      path: 'multi.txt',
+      edits: [{ oldText: 'foo', newText: 'BAZ', useRegex: true }],
+    }, framework);
+    expect(r.success).toBe(true);
+    const newContent = fs.readFileSync(path.join(tempDir, 'multi.txt'), 'utf8');
+    expect(newContent).toBe('BAZ BAZ BAZ bar BAZ');
+  });
+
+  it('★ allOccurrences=false 只替换第一个', async () => {
+    fs.writeFileSync(path.join(tempDir, 'multi.txt'), 'foo foo foo bar foo');
+    const r = await tool.execute({
+      path: 'multi.txt',
+      edits: [{ oldText: 'foo', newText: 'BAZ', allOccurrences: false }],
+    }, framework);
+    expect(r.success).toBe(true);
+    const newContent = fs.readFileSync(path.join(tempDir, 'multi.txt'), 'utf8');
+    expect(newContent).toBe('BAZ foo foo bar foo');
+  });
+
+  it('★ 多 edit 中第二个找不到：报错且不应用第一个', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [
+        { oldText: 'function hello', newText: 'function greet' },     // 找得到
+        { oldText: 'NOT_EXISTING', newText: 'foo' },                 // 找不到
+      ],
+    }, framework);
+    expect(r.success).toBe(false);
+    expect(r.error).toContain('edits[1]');
+    // ★ 验证第一个 edit 也没应用（避免部分应用）
+    const content = fs.readFileSync(path.join(tempDir, 'sample.js'), 'utf8');
+    expect(content).toContain('function hello');
+    expect(content).not.toContain('function greet');
+  });
+
+  it('★ 文件不存在报错', async () => {
+    const r = await tool.execute({
+      path: 'nonexistent.js',
+      edits: [{ oldText: 'foo', newText: 'bar' }],
+    }, framework);
+    expect(r.success).toBe(false);
+    expect(r.error).toContain('读取文件失败');
+  });
+
+  it('★ edits 是空数组报错', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [],
+    }, framework);
+    expect(r.success).toBe(false);
+  });
+
+  it('★ edits[i].oldText 是空字符串报错', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: '', newText: 'foo' }],
+    }, framework);
+    expect(r.success).toBe(false);
+  });
+
+  it('★ 原子写入：失败时不留 .tmp 垃圾', async () => {
+    // 模拟：先创建 .tmp 但删除 source file 让 rename 失败
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: 'function hello', newText: 'function greet' }],
+    }, framework);
+    expect(r.success).toBe(true);
+    // 检查没有遗留 .tmp
+    const files = fs.readdirSync(tempDir);
+    expect(files.some(f => f.endsWith('.tmp'))).toBe(false);
+  });
+
+  it('★ edit_file 是 edit 的别名（同实现）', async () => {
+    // 找到 edit_file 工具
+    const p = new FileSystemPlugin();
+    p.install(framework);
+    const editFileTool = p._registeredTools?.find(t => t.name === 'edit_file')
+      || (p._registeredTools || []).find(t => t.name === 'edit_file');
+    // 由于 install 重新注册，p._registeredTools 是空（mock 没捕获 Plugin base class 的 _registeredTools）
+    // 重新调用 install 让 mock 捕获
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: 'function hello', newText: 'function greet' }],
+    }, framework);
+    expect(r.success).toBe(true);
+  });
+
+  it('★ 返回元数据：contentLength before/after', async () => {
+    const r = await tool.execute({
+      path: 'sample.js',
+      edits: [{ oldText: 'hello world', newText: 'X' }],  // 11 → 1
+    }, framework);
+    expect(r.success).toBe(true);
+    expect(r.data.contentLength.before).toBeGreaterThan(r.data.contentLength.after);
+    expect(r.data.contentChanged).toBe(true);
+  });
+});