foliko 2.0.21 → 2.0.22

package/tests/core/sub-agent-parse.test.js

@@ -0,0 +1,247 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+
+const { SubAgentManagerPlugin } = require('../../plugins/core/sub-agent/index.js');
+
+function makePlugin() {
+  const p = new SubAgentManagerPlugin({});
+  p.install({ getCwd: () => process.cwd() });
+  return p;
+}
+
+describe('_parseMarkdownConfig 解析 agent .md 文件', () => {
+  let tempDir;
+  beforeEach(() => {
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-parse-'));
+  });
+  afterEach(() => {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  function writeAgent(name, content) {
+    const filePath = path.join(tempDir, `${name}.md`);
+    fs.writeFileSync(filePath, content, 'utf-8');
+    return filePath;
+  }
+
+  it('★ 关键 bug：frontmatter + body 里有 JSON 示例 → 应该用 frontmatter，不用示例', () => {
+    // 真实 bug 场景：news-pipeline-agent.md 有 frontmatter，但 body 里有 ```json 示例
+    const content = `---
+name: news-pipeline-agent
+description: 热点新闻视频自动化生产专家
+tools: Read, Write, Edit
+model: inherit
+---
+
+# 热点新闻视频自动化专家
+
+执行流程：
+
+\`\`\`json
+{
+  "news_list": [
+    { "title": "新闻", "summary": "摘要" }
+  ]
+}
+\`\`\`
+`;
+    const filePath = writeAgent('news-pipeline-agent', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'news-pipeline-agent');
+    expect(config.name).toBe('news-pipeline-agent');
+    expect(config.description).toContain('热点');
+    expect(config.tools).toBe('Read, Write, Edit');
+    expect(config.model).toBe('inherit');
+  });
+
+  it('★ 关键 bug：只有 body JSON（无 frontmatter）→ 应该用 JSON 但必须有 name', () => {
+    const content = `---
+description: 没 name 的 frontmatter
+---
+
+\`\`\`json
+{
+  "news_list": [{"title": "x"}]
+}
+\`\`\`
+`;
+    const filePath = writeAgent('agent-a', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'agent-a');
+    // frontmatter 没 name，回退到 JSON，但 JSON 也没 name
+    // 最终只有 defaultName，没有 description（因为 JSON 也没 name 被丢弃）
+    expect(config.name).toBe('agent-a');
+  });
+
+  it('纯 frontmatter：标准情况', () => {
+    const content = `---
+name: simple-agent
+description: 简单
+tools: a, b, c
+---`;
+    const filePath = writeAgent('simple', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'simple');
+    expect(config.name).toBe('simple-agent');
+    expect(config.tools).toBe('a, b, c');
+  });
+
+  it('纯 body JSON（有 name）：应该用 JSON', () => {
+    const content = `# 没有 frontmatter
+
+\`\`\`json
+{
+  "name": "json-agent",
+  "description": "JSON 配置",
+  "tools": ["a", "b"]
+}
+\`\`\`
+`;
+    const filePath = writeAgent('json-agent', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'json-agent');
+    expect(config.name).toBe('json-agent');
+    expect(config.tools).toEqual(['a', 'b']);
+  });
+
+  it('★ 关键 bug：frontmatter 在中间（不在开头）→ 不应被识别为 frontmatter', () => {
+    const content = `# 标题
+
+\`\`\`
+---
+name: fake-name
+---
+\`\`\`
+`;
+    const filePath = writeAgent('edge', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'edge');
+    // frontmatter 在代码块内，不应被识别
+    // body 没有 name 的 JSON，应使用 defaultName
+    expect(config.name).toBe('edge');
+  });
+
+  it('★ 真实复现：news-pipeline-agent.md', () => {
+    // 复制实际文件测
+    const realFile = 'D:/date/20260624/video/.foliko/agents/news-pipeline-agent.md';
+    if (!fs.existsSync(realFile)) return; // 跳过（如果文件不存在）
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(realFile, 'news-pipeline-agent');
+    expect(config.name).toBe('news-pipeline-agent');
+    expect(config.tools).toBeTruthy();
+    expect(typeof config.tools).toBe('string'); // 逗号分隔的字符串
+  });
+
+  it('★ 新功能：markdown body 提取为 systemPrompt', () => {
+    const content = `---
+name: body-test
+description: 测试 body 提取
+---
+
+# 标题行（应被去除）
+
+你是一个**测试 agent**。
+
+## 章节 1
+内容 1
+
+## 章节 2
+内容 2
+`;
+    const filePath = writeAgent('body-test', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'body-test');
+    expect(config.name).toBe('body-test');
+    expect(config.systemPrompt).toBeTruthy();
+    expect(config.systemPrompt).toContain('测试 agent');
+    expect(config.systemPrompt).toContain('章节 1');
+    expect(config.systemPrompt).toContain('章节 2');
+    // 第一个 # 标题行应被去除
+    expect(config.systemPrompt).not.toContain('标题行（应被去除）');
+  });
+
+  it('★ 新功能：太短的 body 不作为 systemPrompt', () => {
+    const content = `---
+name: short-body
+---
+
+hi
+`;
+    const filePath = writeAgent('short-body', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'short-body');
+    // body 只有 "hi"，长度 < 20，不应作为 systemPrompt
+    expect(config.systemPrompt).toBeUndefined();
+  });
+
+  it('★ 新功能：skills 字符串（YAML），由 SubAgentPlugin 构造时分割', () => {
+    const content = `---
+name: skill-test
+skills: a, b, c
+---`;
+    const filePath = writeAgent('skill-test', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'skill-test');
+    // _parseYamlLike 把逗号分隔的字符串保留为字符串（不会切分）
+    // SubAgentPlugin 构造函数负责字符串→数组转换
+    expect(config.skills).toBe('a, b, c');
+
+    // 验证 SubAgentPlugin 的转换
+    const { SubAgentPlugin } = require('../../plugins/core/sub-agent/index.js');
+    const sub = new SubAgentPlugin(config);
+    expect(sub.skills).toEqual(['a', 'b', 'c']);
+  });
+
+  it('★ 新功能：skills 数组形式（来自 .json 配置）保留', () => {
+    const content = `---
+name: skill-arr
+skills: [a, b]
+---`;
+    const filePath = writeAgent('skill-arr', content);
+    const p = makePlugin();
+    const config = p._parseMarkdownConfig(filePath, 'skill-arr');
+    // _parseYamlLike 把 '[a, b]' 解析成 ['a', 'b']
+    expect(config.skills).toEqual(['a', 'b']);
+  });
+});
+
+describe('_loadAgentsFromDir 集成', () => {
+  let tempDir;
+  beforeEach(() => {
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-load-'));
+    fs.mkdirSync(path.join(tempDir, '.foliko', 'agents'), { recursive: true });
+  });
+  afterEach(() => {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it('正确加载带 body JSON 示例的 agent', () => {
+    const filePath = path.join(tempDir, '.foliko', 'agents', 'pip-a.md');
+    fs.writeFileSync(filePath, `---
+name: pip-a
+description: pipeline A
+tools: read, write
+---
+
+# 标题
+
+执行流程里有一段示例代码：
+
+\`\`\`json
+{ "step": "example", "data": 123 }
+\`\`\`
+`, 'utf-8');
+
+    const p = new SubAgentManagerPlugin({});
+    p.install({ getCwd: () => tempDir });
+    p._loadAgentsFromDir();
+
+    expect(p.agents).toHaveLength(1);
+    expect(p.agents[0].name).toBe('pip-a');
+    expect(p.agents[0].description).toBe('pipeline A');
+    expect(p.agents[0].tools).toBe('read, write');
+    expect(p.agents[0]._fromDir).toBe(true);
+  });
+});

package/tests/core/sub-agent-skills.test.js

@@ -0,0 +1,197 @@
+import { describe, it, expect } from 'vitest';
+const { SubAgentPlugin, SubAgentManagerPlugin } = require('../../plugins/core/sub-agent/index.js');
+
+// 测试 SubAgentPlugin 接受 systemPrompt + skills 字段
+
+function makeFw(opts = {}) {
+  const fakeSkills = opts.skills || new Map();
+  return {
+    getCwd: () => process.cwd(),
+    pluginManager: {
+      get: (name) => {
+        if (name === 'skill-manager') {
+          return {
+            getAllSkills: () => Array.from(fakeSkills.values()),
+            getSkill: (n) => fakeSkills.get(n),
+            hasSkill: (n) => fakeSkills.has(n),
+            getSkillDetails: (n) => {
+              const s = fakeSkills.get(n);
+              return s ? { name: s.name, commands: s._commands } : null;
+            },
+          };
+        }
+        if (name === 'extension-executor') {
+          return {
+            getExtensionTools: (pluginName) => {
+              if (pluginName.startsWith('skill:')) {
+                const skillName = pluginName.slice(6);
+                const s = fakeSkills.get(skillName);
+                if (!s) return [];
+                return s._commands.map(c => ({ name: c.name, description: c.description }));
+              }
+              return [];
+            },
+          };
+        }
+        return null;
+      },
+    },
+  };
+}
+
+describe('SubAgentPlugin 接受 systemPrompt 字段', () => {
+  it('★ 直接传 systemPrompt 时，_buildBaseSystemPrompt 优先用', () => {
+    const p = new SubAgentPlugin({
+      name: 'a',
+      systemPrompt: '你是专门做 X 的 agent\n\n具体规则...',
+    });
+    p.install({ getCwd: () => process.cwd() });
+    const prompt = p._buildBaseSystemPrompt();
+    expect(prompt).toContain('你是专门做 X 的 agent');
+    expect(prompt).toContain('具体规则');
+  });
+
+  it('无 systemPrompt 时回退到 SubAgentConfigManager', () => {
+    const p = new SubAgentPlugin({ name: 'no-prompt' });
+    p.install({
+      getCwd: () => process.cwd(),
+      _subAgentConfigManager: {
+        get: (name) => name === 'no-prompt' ? {
+          getSystemPrompt: () => 'from-config-manager',
+        } : null,
+      },
+    });
+    expect(p._buildBaseSystemPrompt()).toBe('from-config-manager');
+  });
+});
+
+describe('SubAgentPlugin 接受 skills 字段', () => {
+  it('★ 数组形式：保持原样', () => {
+    const p = new SubAgentPlugin({ name: 'a', skills: ['x', 'y'] });
+    expect(p.skills).toEqual(['x', 'y']);
+  });
+
+  it('★ 字符串形式：按逗号分割', () => {
+    const p = new SubAgentPlugin({ name: 'a', skills: 'x, y, z' });
+    expect(p.skills).toEqual(['x', 'y', 'z']);
+  });
+
+  it('缺省时为空数组', () => {
+    const p = new SubAgentPlugin({ name: 'a' });
+    expect(p.skills).toEqual([]);
+  });
+
+  it('★ _buildSkillsSection 从 skill-manager 查询命令并注入', () => {
+    const skills = new Map([
+      ['creator', {
+        name: 'creator',
+        _commands: [
+          { name: 'addCover', description: '加封面' },
+          { name: 'addSubtitle', description: '加字幕' },
+        ],
+      }],
+    ]);
+    const p = new SubAgentPlugin({ name: 'a', skills: ['creator'] });
+    p.install(makeFw({ skills }));
+    const section = p._buildSkillsSection();
+    expect(section).toContain('## 🛠️ 可用技能');
+    expect(section).toContain('### creator');
+    expect(section).toContain('**addCover**: 加封面');
+    expect(section).toContain('**addSubtitle**: 加字幕');
+    expect(section).toContain('ext_call({plugin: "skill:creator"');
+  });
+
+  it('★ _buildSkillsSection：空 skills 时不返回 section', () => {
+    const p = new SubAgentPlugin({ name: 'a', skills: ['nonexistent'] });
+    p.install(makeFw({ skills: new Map() }));
+    // 现在的实现：空 commands 直接跳过（让 _getFullSystemPrompt 决定是否包含）
+    const section = p._buildSkillsSection();
+    // 没有可用命令时返回空字符串（避免显示 "(该技能尚未注册)" 等无意义内容）
+    expect(section).toBe('');
+  });
+
+  it('★ _buildSkillsSection：skills 为空时返回空', () => {
+    const p = new SubAgentPlugin({ name: 'a', skills: [] });
+    p.install(makeFw());
+    expect(p._buildSkillsSection()).toBe('');
+  });
+
+  it('★ _getFullSystemPrompt 叠加 systemPrompt + skills section', () => {
+    const skills = new Map([
+      ['hot-news', {
+        name: 'hot-news',
+        _commands: [{ name: 'fetch', description: '抓取' }],
+      }],
+    ]);
+    const p = new SubAgentPlugin({
+      name: 'news',
+      description: '新闻专家',
+      systemPrompt: '你是一个新闻 agent。\n\n## 规则\n做新闻。',
+      skills: ['hot-news'],
+    });
+    p.install(makeFw({ skills }));
+    const prompt = p._getFullSystemPrompt();
+    expect(prompt).toContain('你是一个新闻 agent');
+    expect(prompt).toContain('## 规则');
+    expect(prompt).toContain('## 🛠️ 可用技能');
+    expect(prompt).toContain('**fetch**: 抓取');
+  });
+});
+
+describe('SubAgentManagerPlugin 集成', () => {
+  it('★ 端到端：news-pipeline-agent.md + skills 自动注入', () => {
+    const skills = new Map([
+      ['hot-news-video', { name: 'hot-news-video', _commands: [{ name: 'fetch', description: '抓热点' }] }],
+      ['baidu-video-publisher', { name: 'baidu-video-publisher', _commands: [{ name: 'publish', description: '发百度' }] }],
+      ['creator', { name: 'creator', _commands: [{ name: 'addCover', description: '封面' }] }],
+    ]);
+    const fs = require('fs');
+    const os = require('os');
+    const path = require('path');
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'sub-int-'));
+    fs.writeFileSync(path.join(tempDir, 'news-pipeline.md'), `---
+name: news-pipeline
+description: 视频自动化
+tools: Read, Write, Edit, Bash, fetch, ext_call, subagent_call
+skills: hot-news-video, baidu-video-publisher, creator
+model: inherit
+---
+
+# 标题
+
+你是一个**视频自动化** agent。
+
+## 📋 流程
+1. 抓新闻
+2. 做视频
+3. 发布
+`, 'utf-8');
+
+    const mgr = new SubAgentManagerPlugin({});
+    mgr.install({ ...makeFw({ skills }), getCwd: () => tempDir });
+    mgr.config.agentsDir = tempDir;  // override
+    mgr._loadAgentsFromDir();
+
+    expect(mgr.agents).toHaveLength(1);
+    const cfg = mgr.agents[0];
+    expect(cfg.name).toBe('news-pipeline');
+    expect(cfg.systemPrompt).toContain('视频自动化');
+    // _parseMarkdownConfig 返回字符串，SubAgentPlugin 构造时分割
+    expect(cfg.skills).toBe('hot-news-video, baidu-video-publisher, creator');
+
+    // 模拟创建 SubAgentPlugin
+    const subPlugin = new SubAgentPlugin(cfg);
+    subPlugin.install({ ...makeFw({ skills }), getCwd: () => tempDir });
+    const fullPrompt = subPlugin._getFullSystemPrompt();
+    expect(fullPrompt).toContain('视频自动化');
+    expect(fullPrompt).toContain('## 🛠️ 可用技能');
+    expect(fullPrompt).toContain('### hot-news-video');
+    expect(fullPrompt).toContain('### baidu-video-publisher');
+    expect(fullPrompt).toContain('### creator');
+    expect(fullPrompt).toContain('**fetch**: 抓热点');
+    expect(fullPrompt).toContain('**publish**: 发百度');
+    expect(fullPrompt).toContain('**addCover**: 封面');
+
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+});