feat(mcp): 增加 mode=skill,把 MCP 工具以技能形式暴露
mode 三态改为 advertise / skill / disable: - skill 不下发到 tools 数组,由 skill 工具的 list/get/run 暴露 - get 返回 MCP 原始的 description + input_schema;run 直接转发,不做路径改写与 required 预检 - 移除 mode: silent(不设专门迁移文案)与 front matter mcp_tool 包装 - 删除 skills/image、skills/video,改由 image_task / video_task 的 mode: skill 提供 - 技能清单改用 listCallableSkills(目录 + MCP,同名时目录胜出);设置页仍只列目录 - init.sh 配了 BIGMODEL_KEY 时给 image_task / video_task 写 mode: skill - image_task / video_task 的 tool description 首行改为自解释的一句话(技能清单取首行)
This commit is contained in:
@@ -10,7 +10,7 @@ const multer = require('multer');
|
||||
const YAML = require('yaml');
|
||||
const engine = require('../engine');
|
||||
const llm = require('../llm');
|
||||
const { extractDescription, parseFrontMatter, listSkills, formatSkillListForPrompt } = require('../tools/skills');
|
||||
const { extractDescription, listCallableSkills, formatSkillListForPrompt } = require('../tools/skills');
|
||||
const { sanitizeName } = require('./files');
|
||||
|
||||
const router = express.Router();
|
||||
@@ -79,7 +79,7 @@ function absInSkill(dir, rel) {
|
||||
// 模型立即感知新技能或改名,无需重启。fire-and-forget:扫描失败不影响 API 响应,
|
||||
// skill {"list":"all"} 仍是实时兜底。
|
||||
function refreshSkillPrompt() {
|
||||
listSkills({ cfg: engine.getConfig() })
|
||||
listCallableSkills({ cfg: engine.getConfig() })
|
||||
.then(list => llm.setSkillListText(formatSkillListForPrompt(list)))
|
||||
.catch(() => {});
|
||||
}
|
||||
@@ -118,12 +118,9 @@ router.get('/', wrap(async (req, res) => {
|
||||
const dir = path.join(root, e.name);
|
||||
let description = '(缺 SKILL.md)';
|
||||
let hasMd = false;
|
||||
let mcpTool = '';
|
||||
try {
|
||||
const content = await fsp.readFile(path.join(dir, 'SKILL.md'), 'utf8');
|
||||
description = extractDescription(content);
|
||||
// mcp_tool 后端没有入口脚本,徽章靠它区分(前端显示「mcp 后端」)
|
||||
mcpTool = String(parseFrontMatter(content).mcp_tool || '').trim();
|
||||
hasMd = true;
|
||||
} catch (_) {}
|
||||
const files = listSkillFiles(dir);
|
||||
@@ -132,7 +129,7 @@ router.get('/', wrap(async (req, res) => {
|
||||
description,
|
||||
has_md: hasMd,
|
||||
entry: fs.existsSync(path.join(dir, 'run.py')) ? 'py'
|
||||
: fs.existsSync(path.join(dir, 'run.sh')) ? 'sh' : (mcpTool ? 'mcp' : null),
|
||||
: fs.existsSync(path.join(dir, 'run.sh')) ? 'sh' : null,
|
||||
file_count: files.length,
|
||||
size: files.reduce((s, f) => s + (f.size || 0), 0),
|
||||
mtime: files.length ? Math.max.apply(null, files.map(f => f.mtime || 0)) : null,
|
||||
@@ -160,7 +157,6 @@ router.post('/', wrap(async (req, res) => {
|
||||
'## 用法',
|
||||
'',
|
||||
'- 入口脚本 `run.py` 或 `run.sh`,接收一个 JSON 字符串作为唯一命令行参数(含全部入参)。',
|
||||
'- 后端是 MCP 工具时改在 front matter 写 `mcp_tool: <工具名>`,不需要入口脚本。',
|
||||
'- 可选:`requirements.txt`(Python 依赖)、`install.sh`(系统依赖),首次执行前自动安装。',
|
||||
'',
|
||||
].join('\n');
|
||||
|
||||
Reference in New Issue
Block a user