2.0阶段3: 技能管理API(增删改/重命名/文件读写上传,路径防护+文本限制)+H5技能页三视图(列表/文件详情/全屏编辑器),smoke新增[9]技能段

This commit is contained in:
2026-09-01 17:30:42 +08:00
parent e9a70711c1
commit e8ec284194
8 changed files with 596 additions and 16 deletions
+18
View File
@@ -346,3 +346,21 @@ body {
box-shadow: 0 1px 4px rgba(30,40,90,0.06); font-size: 14px;
}
.ghost-btn.small { flex: none; padding: 6px 12px; font-size: 13px; border-radius: 8px; }
/* ---- 技能页(阶段 3) ---- */
.skill-desc {
font-size: 12px; color: #888; margin-top: 3px;
display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden;
}
/* 文件编辑器:全屏覆盖本 Tab(盖住列表/详情与顶栏,不遮底部导航) */
#skill-editor {
position: absolute; inset: 0; z-index: 6; background: #f2f3f7;
display: flex; flex-direction: column;
}
#skill-editor-area {
flex: 1; margin: 10px 12px 12px; resize: none; outline: none;
border: 1px solid #dde; border-radius: 10px; background: #fff; color: #223;
padding: 10px 12px; font-size: 12.5px; line-height: 1.55; tab-size: 4;
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, "Courier New", monospace;
white-space: pre; overflow: auto;
}
+57 -8
View File
@@ -35,10 +35,46 @@
<!-- ================= Tab:技能 ================= -->
<div id="tab-skills" class="tab-page hidden">
<div class="header">
<div class="header-left"><h2>技能管理</h2></div>
<button class="icon-btn hidden" id="skills-back-btn" onclick="skillsUI.back()" title="返回">
<svg viewBox="0 0 24 24"><polyline points="15 18 9 12 15 6"></polyline></svg>
</button>
<div class="header-left"><h2 id="skills-title">技能管理</h2></div>
<div class="header-right">
<button class="icon-btn hidden" id="skill-newfile-btn" onclick="skillsUI.newFile()" title="新建文件">
<svg viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="12" y1="12" x2="12" y2="18"></line><line x1="9" y1="15" x2="15" y2="15"></line></svg>
</button>
<label class="icon-btn hidden" id="skill-upload-btn" title="上传文件">
<input type="file" id="skill-file-input" style="display:none;" onchange="skillsUI.onUpload(event)">
<svg viewBox="0 0 24 24"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="17 8 12 3 7 8"></polyline><line x1="12" y1="3" x2="12" y2="15"></line></svg>
</label>
<button class="icon-btn hidden" id="skill-rename-btn" onclick="skillsUI.renameSkill()" title="重命名">
<svg viewBox="0 0 24 24"><path d="M17 3a2.83 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5z"></path></svg>
</button>
<button class="icon-btn hidden" id="skill-del-btn" onclick="skillsUI.deleteSkill()" title="删除技能">
<svg viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg>
</button>
<button class="icon-btn" id="skill-new-btn" onclick="skillsUI.openCreate()" title="新建技能">
<svg viewBox="0 0 24 24"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
</button>
</div>
</div>
<div class="tab-body-area">
<div class="empty-tip">技能管理开发中(阶段 3):技能的创建 / 编辑 / 删除与技能文件管理。</div>
<div class="tab-body-area" id="skills-list"></div>
<div class="tab-body-area hidden" id="skill-detail"></div>
<!-- 技能文件编辑器(全屏覆盖本 Tab) -->
<div id="skill-editor" class="hidden">
<div class="header">
<button class="icon-btn" onclick="skillsUI.closeEditor()" title="关闭编辑器">
<svg viewBox="0 0 24 24"><polyline points="15 18 9 12 15 6"></polyline></svg>
</button>
<span class="chat-title" id="skill-editor-name"></span>
<div class="header-right">
<button class="icon-btn" onclick="skillsUI.saveFile()" title="保存">
<svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"></polyline></svg>
</button>
</div>
</div>
<textarea id="skill-editor-area" spellcheck="false" autocomplete="off" autocapitalize="off"></textarea>
</div>
</div>
@@ -150,6 +186,19 @@
</div>
</div>
<!-- 新建技能弹窗 -->
<div id="skill-create-modal" class="modal-overlay hidden" onclick="if(event.target===this)skillsUI.closeCreate()">
<div class="modal">
<button class="modal-close-btn" onclick="skillsUI.closeCreate()">
<svg viewBox="0 0 24 24"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
</button>
<h3>新建技能</h3>
<input type="text" id="skill-new-name" placeholder="技能名(字母/数字/-/_)" style="width:100%">
<input type="text" id="skill-new-desc" placeholder="一句话描述(何时使用该技能)" style="width:100%">
<button class="primary-btn" style="width:100%" onclick="skillsUI.createSkill()">创建</button>
</div>
</div>
<!-- 删除会话弹窗 -->
<div id="delete-modal" class="modal-overlay hidden" onclick="if(event.target===this)ui.closeDelete()">
<div class="modal">
@@ -169,10 +218,10 @@
<div class="toast hidden" id="toast"></div>
<!-- 发版时更新 v 参数,避免移动端浏览器缓存旧 JS -->
<script src="/js/core.js?v=20260901d"></script>
<script src="/js/tasks.js?v=20260901d"></script>
<script src="/js/skills.js?v=20260901d"></script>
<script src="/js/models.js?v=20260901d"></script>
<script src="/js/settings.js?v=20260901d"></script>
<script src="/js/core.js?v=20260901e"></script>
<script src="/js/tasks.js?v=20260901e"></script>
<script src="/js/skills.js?v=20260901e"></script>
<script src="/js/models.js?v=20260901e"></script>
<script src="/js/settings.js?v=20260901e"></script>
</body>
</html>
+230 -5
View File
@@ -1,11 +1,236 @@
// 技能 Tab:SKILL 管理(增删改 + 文件管理)。
// 阶段 1 先注册模块占位;阶段 3 实现完整功能。
// 技能 Tab:SKILL 管理(技能增删改 + 技能内文件管理)。
// 只做文件管理,不执行技能;技能是否生效由用户在任务里自行测试。
// 视图:列表(list) / 技能详情(detail) / 文件编辑器(editor,全屏覆盖本 Tab)。
'use strict';
window.tabModules = window.tabModules || {};
// 当前技能名(详情/编辑视图有效)与编辑器状态
let curSkill = null;
let editorPath = null; // 正在编辑的文件相对路径
let editorOrig = ''; // 打开/上次保存时的内容,用于脏检测
// ---------- 视图切换 ----------
function setSkillsView(v) {
$('skills-back-btn').classList.toggle('hidden', v === 'list');
$('skill-new-btn').classList.toggle('hidden', v !== 'list');
const detailOnly = v === 'detail';
$('skill-newfile-btn').classList.toggle('hidden', !detailOnly);
$('skill-upload-btn').classList.toggle('hidden', !detailOnly);
$('skill-rename-btn').classList.toggle('hidden', !detailOnly);
$('skill-del-btn').classList.toggle('hidden', !detailOnly);
$('skills-list').classList.toggle('hidden', v !== 'list');
$('skill-detail').classList.toggle('hidden', v !== 'detail');
$('skill-editor').classList.toggle('hidden', v !== 'editor');
}
// ---------- 列表 ----------
async function loadSkillList() {
curSkill = null;
setSkillsView('list');
$('skills-title').textContent = '技能管理';
const el = $('skills-list');
el.innerHTML = '<div class="empty-tip">加载中…</div>';
try {
const rows = await req('GET', '/api/skills');
if (!rows.length) {
el.innerHTML = '<div class="empty-tip">还没有技能,点右上角 + 新建一个。</div>';
return;
}
el.innerHTML = rows.map(s =>
'<div class="session-card" onclick="skillsUI.open(\'' + encodeURIComponent(s.name) + '\')">' +
'<div class="session-main">' +
'<div class="session-name">' + esc(s.name) +
(s.has_md ? '' : ' <span class="badge cancelled">缺 SKILL.md</span>') +
(s.entry ? ' <span class="badge active">' + s.entry + ' 入口</span>' : '') +
'</div>' +
'<div class="skill-desc">' + esc(s.description || '') + '</div>' +
'<div class="session-meta"><span>' + s.file_count + ' 个文件</span>' +
'<span>' + fmtSize(s.size) + '</span>' +
(s.mtime ? '<span>' + fmtTime(s.mtime) + '</span>' : '') + '</div>' +
'</div>' +
'</div>').join('');
} catch (e) {
el.innerHTML = '<div class="empty-tip">加载失败:' + esc(e.message) + '</div>';
}
}
// ---------- 详情(文件列表) ----------
async function loadSkillDetail() {
if (!curSkill) return loadSkillList();
const el = $('skill-detail');
el.innerHTML = '<div class="empty-tip">加载中…</div>';
try {
const d = await req('GET', '/api/skills/' + encodeURIComponent(curSkill));
$('skills-title').textContent = d.name;
if (!d.files.length) {
el.innerHTML = '<div class="empty-tip">技能目录是空的。</div>';
return;
}
el.innerHTML = d.files.map(f => {
const a = encodeURIComponent(f.filename);
return '<div class="file-row">' +
'<span class="file-name">' + esc(f.filename) + '</span>' +
'<span class="file-size">' + fmtSize(f.size) + '</span>' +
'<button class="file-act" onclick="skillsUI.editFile(\'' + a + '\')">编辑</button>' +
'<button class="file-act del" onclick="skillsUI.deleteFile(\'' + a + '\')">删</button>' +
'</div>';
}).join('');
} catch (e) {
el.innerHTML = '<div class="empty-tip">加载失败:' + esc(e.message) + '</div>';
}
}
async function openSkill(name) {
curSkill = decodeURIComponent(name);
setSkillsView('detail');
await loadSkillDetail();
}
function backFromSkill() {
// 编辑器内的返回由 closeEditor 处理;这里只处理顶部返回(先提醒未保存)
loadSkillList();
}
// ---------- 技能增删改 ----------
function openCreateSkill() {
$('skill-new-name').value = '';
$('skill-new-desc').value = '';
$('skill-create-modal').classList.remove('hidden');
$('skill-new-name').focus();
}
function closeCreateSkill() { $('skill-create-modal').classList.add('hidden'); }
async function createSkill() {
const name = $('skill-new-name').value.trim();
if (!name) { toast('请填写技能名'); return; }
try {
await req('POST', '/api/skills', { name, description: $('skill-new-desc').value.trim() });
closeCreateSkill();
toast('已创建 ' + name);
// 新建后直接进入详情,方便继续编辑 SKILL.md
await openSkill(encodeURIComponent(name));
} catch (e) { toast('创建失败:' + e.message); }
}
async function renameSkill() {
if (!curSkill) return;
const nn = prompt('新的技能名:', curSkill);
if (nn == null) return;
const name = nn.trim();
if (!name || name === curSkill) return;
try {
await req('POST', '/api/skills/' + encodeURIComponent(curSkill) + '/rename', { newName: name });
toast('已重命名为 ' + name);
await openSkill(encodeURIComponent(name));
} catch (e) { toast('重命名失败:' + e.message); }
}
async function deleteSkill() {
if (!curSkill) return;
if (!confirm('确定删除技能「' + curSkill + '」?目录下所有文件将不可恢复。')) return;
try {
await req('DELETE', '/api/skills/' + encodeURIComponent(curSkill));
toast('已删除 ' + curSkill);
loadSkillList();
} catch (e) { toast('删除失败:' + e.message); }
}
// ---------- 技能内文件 ----------
async function openFileEditor(path) {
const rel = decodeURIComponent(path);
try {
const f = await req('GET', '/api/skills/' + encodeURIComponent(curSkill) + '/file?path=' + encodeURIComponent(rel));
editorPath = f.path; editorOrig = f.content;
$('skill-editor-name').textContent = curSkill + ' / ' + f.path;
$('skill-editor-area').value = f.content;
setSkillsView('editor');
} catch (e) { toast('打开失败:' + e.message); }
}
async function saveSkillFile() {
if (!curSkill || editorPath == null) return;
const content = $('skill-editor-area').value;
try {
await req('PUT', '/api/skills/' + encodeURIComponent(curSkill) + '/file', { path: editorPath, content });
editorOrig = content;
toast('已保存 ' + editorPath);
} catch (e) { toast('保存失败:' + e.message); }
}
function closeSkillEditor() {
if ($('skill-editor-area').value !== editorOrig &&
!confirm('有未保存的修改,确定关闭编辑器?')) return;
editorPath = null; editorOrig = '';
setSkillsView('detail');
loadSkillDetail();
}
async function newSkillFile() {
if (!curSkill) return;
const p = prompt('新建文件路径(相对技能目录,可含子目录):', '');
if (p == null) return;
const rel = p.trim();
if (!rel) { toast('路径为空'); return; }
editorPath = rel; editorOrig = '';
$('skill-editor-name').textContent = curSkill + ' / ' + rel + '(新建)';
$('skill-editor-area').value = '';
setSkillsView('editor');
$('skill-editor-area').focus();
}
async function deleteSkillFile(path) {
const rel = decodeURIComponent(path);
if (!confirm('删除文件 ' + rel + ' ?')) return;
try {
await req('DELETE', '/api/skills/' + encodeURIComponent(curSkill) + '/file?path=' + encodeURIComponent(rel));
toast('已删除');
loadSkillDetail();
} catch (e) { toast('删除失败:' + e.message); }
}
// 单文件上传;重名默认 409,询问后带 overwrite 重试
async function uploadSkillFile(ev) {
const input = ev.target;
const file = input.files && input.files[0];
input.value = '';
if (!file || !curSkill) return;
const send = async function (overwrite) {
const fd = new FormData();
fd.append('file', file);
return req('POST', '/api/skills/' + encodeURIComponent(curSkill) + '/upload' + (overwrite ? '?overwrite=true' : ''), fd, true);
};
try {
await send(false);
toast('已上传 ' + file.name);
} catch (e) {
if (/已存在/.test(e.message)) {
if (!confirm(file.name + ' 已存在,覆盖?')) return;
try { await send(true); toast('已覆盖 ' + file.name); }
catch (e2) { toast('上传失败:' + e2.message); }
} else {
toast('上传失败:' + e.message);
}
}
loadSkillDetail();
}
window.skillsUI = {
back: backFromSkill,
open: openSkill,
openCreate: openCreateSkill,
closeCreate: closeCreateSkill,
createSkill: createSkill,
renameSkill: renameSkill,
deleteSkill: deleteSkill,
editFile: openFileEditor,
saveFile: saveSkillFile,
closeEditor: closeSkillEditor,
newFile: newSkillFile,
deleteFile: deleteSkillFile,
onUpload: uploadSkillFile,
};
tabModules.skills = {
onShow() {
// TODO 阶段 3:loadSkillList()
},
onShow() { loadSkillList(); },
};
+1
View File
@@ -209,3 +209,4 @@ router.delete('/:id/files/*', function (req, res) {
});
module.exports = router;
module.exports.sanitizeName = sanitizeName;
+256
View File
@@ -0,0 +1,256 @@
// 技能管理 API(2.0 阶段 3):技能列表 / 创建 / 重命名 / 删除,以及技能内文件管理。
// 只做文件管理,不执行技能(执行仍走 tools/skills.js 的 AI 工具侧,由用户自行测试)。
// 安全:技能名与文件路径都经严格校验(无路径分隔符/无穿越/保留名拒绝);
// 在线编辑限文本文件与大小;上传走 multer 并清洗文件名。
const express = require('express');
const fs = require('fs');
const fsp = fs.promises;
const path = require('path');
const multer = require('multer');
const YAML = require('yaml');
const engine = require('../engine');
const { extractDescription } = require('../tools/skills');
const { sanitizeName } = require('./files');
const router = express.Router();
const RESERVED_DIRS = new Set(['deps']); // skills_root 下的共享 pip 依赖目录,不是技能
const TEXT_READ_LIMIT = 512 * 1024; // 在线读取上限(再大引导下载本地编辑)
const TEXT_WRITE_LIMIT = 1024 * 1024; // 在线写入上限(再大走上传)
function sendErr(res, err) {
if (err && err.name === 'MulterError') {
return res.status(400).json({ error: '上传失败:' + err.message });
}
const code = err && err.status_code || 500;
res.status(code).json({ error: String(err && err.message || err) });
}
function httpError(code, msg) { return Object.assign(new Error(msg), { status_code: code }); }
function wrap(fn) {
return function (req, res) {
try {
const r = fn(req, res);
if (r && typeof r.catch === 'function') r.catch(err => sendErr(res, err));
} catch (err) { sendErr(res, err); }
};
}
function skillsRoot() {
const cfg = engine.getConfig();
return path.resolve((cfg && (cfg.skills_root || (cfg.skills && cfg.skills.skills_root))) || 'skills');
}
// 技能名 = 技能根目录下的单层目录名
function safeSkillName(name) {
const n = String(name == null ? '' : name).trim();
if (!n || n.length > 64) throw httpError(400, '技能名长度需为 1-64 字符');
if (/[\/\\\0\r\n<>:"|?*]/.test(n)) throw httpError(400, '技能名含非法字符: ' + n);
if (n === '.' || n === '..' || n.startsWith('.') || RESERVED_DIRS.has(n)) {
throw httpError(400, '保留或非法技能名: ' + n);
}
return n;
}
function skillDirOf(name) {
const root = skillsRoot();
const dir = path.resolve(root, safeSkillName(name));
if (dir === root || !dir.startsWith(root + path.sep)) throw httpError(400, '非法技能路径');
return dir;
}
// 技能内相对路径:禁绝对路径与 .. 穿越
function safeRel(p) {
const rel = path.posix.normalize(String(p == null ? '' : p).replace(/\\/g, '/').trim());
if (!rel || rel === '.' || rel === '..' || rel.startsWith('../') || path.posix.isAbsolute(rel)) {
throw httpError(400, '非法文件路径: ' + p);
}
return rel;
}
function absInSkill(dir, rel) {
const abs = path.resolve(dir, rel);
if (abs !== dir && !abs.startsWith(dir + path.sep)) throw httpError(400, '文件路径越出技能目录');
return abs;
}
// 递归文件列表(与任务文件同形状:filename/size/mtime;隐藏文件如 .deps_installed 不展示)
function listSkillFiles(dir) {
const out = [];
(function rec(d, rel) {
let entries;
try { entries = fs.readdirSync(d, { withFileTypes: true }); } catch (_) { return; }
for (const e of entries) {
if (e.name.startsWith('.')) continue;
const abs = path.join(d, e.name);
const relPath = rel ? rel + '/' + e.name : e.name;
if (e.isDirectory()) rec(abs, relPath);
else if (e.isFile()) {
let size = null, mtime = null;
try { const st = fs.statSync(abs); size = st.size; mtime = st.mtimeMs; } catch (_) {}
out.push({ filename: relPath, size, mtime });
}
}
})(dir, '');
out.sort((a, b) => a.filename < b.filename ? -1 : a.filename > b.filename ? 1 : 0);
return out;
}
// ---------- 技能 ----------
// 列表:名称 / 描述 / 入口类型 / 文件数 / 总大小 / 最近修改
router.get('/', wrap(async (req, res) => {
const root = skillsRoot();
if (!fs.existsSync(root)) return res.json([]);
const out = [];
for (const e of await fsp.readdir(root, { withFileTypes: true })) {
if (!e.isDirectory() || e.name.startsWith('.') || RESERVED_DIRS.has(e.name)) continue;
const dir = path.join(root, e.name);
let description = '(缺 SKILL.md)';
let hasMd = false;
try {
description = extractDescription(await fsp.readFile(path.join(dir, 'SKILL.md'), 'utf8'));
hasMd = true;
} catch (_) {}
const files = listSkillFiles(dir);
out.push({
name: e.name,
description,
has_md: hasMd,
entry: fs.existsSync(path.join(dir, 'run.py')) ? 'py'
: 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,
});
}
out.sort((a, b) => a.name.localeCompare(b.name));
res.json(out);
}));
// 创建:生成带 front matter 的 SKILL.md 骨架(YAML.stringify 保证特殊字符安全)
router.post('/', wrap(async (req, res) => {
const name = safeSkillName(req.body && req.body.name);
const dir = skillDirOf(name);
if (fs.existsSync(dir)) throw httpError(409, '技能已存在: ' + name);
const desc = String((req.body && req.body.description) || '').trim() || '待填写:何时使用这个技能';
const tpl = [
'---',
YAML.stringify({ name, description: desc }).trim(),
'---',
'',
'# ' + name,
'',
'这里描述技能做什么、什么场景下使用。',
'',
'## 用法',
'',
'- 入口脚本 `run.py` 或 `run.sh`,接收一个 JSON 字符串作为唯一命令行参数(含全部入参)。',
'- 可选:`requirements.txt`(Python 依赖)、`install.sh`(系统依赖),首次执行前自动安装。',
'',
].join('\n');
await fsp.mkdir(dir, { recursive: true });
await fsp.writeFile(path.join(dir, 'SKILL.md'), tpl, 'utf8');
res.json({ ok: true, name });
}));
// 详情:文件列表 + SKILL.md 内容
router.get('/:name', wrap(async (req, res) => {
const dir = skillDirOf(req.params.name);
if (!fs.existsSync(dir)) throw httpError(404, '技能不存在: ' + req.params.name);
let skill_md = null;
try { skill_md = await fsp.readFile(path.join(dir, 'SKILL.md'), 'utf8'); } catch (_) {}
res.json({ name: path.basename(dir), files: listSkillFiles(dir), skill_md });
}));
// 重命名(改目录名;SKILL.md front matter 的 name 如有需要请自行同步)
router.post('/:name/rename', wrap(async (req, res) => {
const from = skillDirOf(req.params.name);
const newName = safeSkillName(req.body && req.body.newName);
if (!fs.existsSync(from)) throw httpError(404, '技能不存在: ' + req.params.name);
const to = path.join(path.dirname(from), newName);
if (fs.existsSync(to)) throw httpError(409, '目标名称已存在: ' + newName);
await fsp.rename(from, to);
res.json({ ok: true, name: newName });
}));
// 删除整个技能(递归,不可恢复;页面需二次确认)
router.delete('/:name', wrap(async (req, res) => {
const dir = skillDirOf(req.params.name);
if (!fs.existsSync(dir)) throw httpError(404, '技能不存在: ' + req.params.name);
await fsp.rm(dir, { recursive: true, force: true });
res.json({ ok: true });
}));
// ---------- 技能内文件 ----------
// 读文本(在线编辑用):限大小、拒绝二进制
router.get('/:name/file', wrap(async (req, res) => {
const dir = skillDirOf(req.params.name);
const rel = safeRel(req.query.path);
const abs = absInSkill(dir, rel);
let st;
try { st = fs.statSync(abs); } catch (_) { throw httpError(404, '文件不存在: ' + rel); }
if (!st.isFile()) throw httpError(400, '不是文件');
if (st.size > TEXT_READ_LIMIT) throw httpError(413, '文件超过 ' + (TEXT_READ_LIMIT / 1024) + 'KB,请下载后本地编辑');
const buf = await fsp.readFile(abs);
if (buf.includes(0)) throw httpError(415, '二进制文件不支持在线编辑,请走上传替换');
res.json({ path: rel, content: buf.toString('utf8'), size: st.size });
}));
// 写文本(新建或覆盖;自动建父目录)
router.put('/:name/file', wrap(async (req, res) => {
const dir = skillDirOf(req.params.name);
if (!fs.existsSync(dir)) throw httpError(404, '技能不存在: ' + req.params.name);
const rel = safeRel(req.body && req.body.path);
const content = (req.body || {}).content;
if (typeof content !== 'string') throw httpError(400, 'body.content 必须是字符串');
if (Buffer.byteLength(content) > TEXT_WRITE_LIMIT) throw httpError(413, '内容超过 ' + (TEXT_WRITE_LIMIT / 1024) + 'KB,请改用文件上传');
const abs = absInSkill(dir, rel);
await fsp.mkdir(path.dirname(abs), { recursive: true });
await fsp.writeFile(abs, content, 'utf8');
res.json({ ok: true, path: rel });
}));
// 删文件(或子目录)
router.delete('/:name/file', wrap(async (req, res) => {
const dir = skillDirOf(req.params.name);
const rel = safeRel(req.query.path);
const abs = absInSkill(dir, rel);
if (!fs.existsSync(abs)) throw httpError(404, '文件不存在: ' + rel);
await fsp.rm(abs, { recursive: true, force: true });
res.json({ ok: true });
}));
// 单文件上传:文件名清洗同任务上传;重名默认 409,?overwrite=true 才覆盖
const upload = multer({
storage: multer.diskStorage({
destination: function (req, file, cb) {
try {
const dir = skillDirOf(req.params.name);
if (!fs.existsSync(dir)) return cb(httpError(404, '技能不存在: ' + req.params.name));
cb(null, dir);
} catch (err) { cb(err); }
},
filename: function (req, file, cb) {
try {
const dir = skillDirOf(req.params.name);
const name = sanitizeName(file.originalname);
if (req.query.overwrite !== 'true' && fs.existsSync(path.join(dir, name))) {
return cb(httpError(409, '文件已存在: ' + name));
}
cb(null, name);
} catch (err) { cb(err); }
},
}),
limits: { filesize: 50 * 1024 * 1024 },
});
router.post('/:name/upload', function (req, res) {
upload.single('file')(req, res, function (err) {
if (err) return sendErr(res, err);
if (!req.file) return res.status(400).json({ error: '未收到文件(表单字段名:file)' });
res.json({ ok: true, path: req.file.filename, size: req.file.size });
});
});
module.exports = router;
+1
View File
@@ -34,6 +34,7 @@ app.use(express.static(path.join(__dirname, 'public')));
app.use('/api/sessions', require('./routes/sessions'));
app.use('/api/sessions', require('./routes/messages'));
app.use('/api/sessions', require('./routes/files'));
app.use('/api/skills', require('./routes/skills'));
app.use('/api/config', require('./routes/config'));
app.use('/api/system', require('./routes/system'));
+1 -1
View File
@@ -286,4 +286,4 @@ async function runSkill(ctx, skillName, inputArgs) {
return runEntry(ctx, entry, cmdArgs, dir, timeoutMs);
}
module.exports = { listSkills, getSkillInfo, runSkill, skillsRoot };
module.exports = { listSkills, getSkillInfo, runSkill, skillsRoot, parseFrontMatter, extractDescription };
+32 -2
View File
@@ -198,7 +198,7 @@ async function main() {
const esc = await executeTool(ctx, 'read_file', { path: '../outside.txt' }).catch(e => 'ERR:' + e.message);
ok(String(esc).includes('越界'), 'read_file 拒绝越界', String(esc));
// ---- 9. 配置读写 API(阶段 2)----
// ---- 8. 配置读写 API(阶段 2)----
console.log('\n[8] 配置读写');
const cfgPath = path.join(ROOT, 'test/config.test.yml');
const origText = fs.readFileSync(cfgPath, 'utf8');
@@ -216,8 +216,38 @@ async function main() {
const restored = await api('PUT', '/api/config', { text: origText });
ok(restored.ok && fs.readFileSync(cfgPath, 'utf8') === origText, 'PUT 整文件恢复原配置');
// ---- 9. 技能管理(阶段 3)----
console.log('\n[9] 技能管理');
ok((await api('POST', '/api/skills', { name: 'demo-skill', description: '演示技能' })).ok, '创建技能');
let slist = await api('GET', '/api/skills');
const demo = slist.find(x => x.name === 'demo-skill');
ok(demo && demo.has_md && String(demo.description).includes('演示技能'), '列表含新技能与描述');
let sdet = await api('GET', '/api/skills/demo-skill');
ok(sdet.skill_md && sdet.skill_md.includes('demo-skill') && sdet.files.some(f => f.filename === 'SKILL.md'), '详情含 SKILL.md');
await api('PUT', '/api/skills/demo-skill/file', { path: 'sub/run.sh', content: '#!/bin/sh\necho hi\n' });
const sfr = await api('GET', '/api/skills/demo-skill/file?path=sub%2Frun.sh');
ok(sfr.content.includes('echo hi'), '文件写入+读取(含子目录)');
let trav = false;
try { await api('GET', '/api/skills/demo-skill/file?path=..%2F..%2Fetc%2Fpasswd'); } catch (e) { trav = /400/.test(e.message); }
ok(trav, '路径穿越被拒 400');
const mkFd = txt => { const fd = new FormData(); fd.append('file', new Blob([txt]), 'note.txt'); return fd; };
const up1 = await fetch(BASE + '/api/skills/demo-skill/upload', { method: 'POST', body: mkFd('up\n') });
const up1j = await up1.json();
ok(up1.ok && up1j.path === 'note.txt', '上传新文件');
const up2 = await fetch(BASE + '/api/skills/demo-skill/upload', { method: 'POST', body: mkFd('dup\n') });
ok(up2.status === 409, '重名上传默认 409');
const up3 = await fetch(BASE + '/api/skills/demo-skill/upload?overwrite=true', { method: 'POST', body: mkFd('ovr\n') });
ok(up3.ok, 'overwrite=true 覆盖上传');
ok((await api('POST', '/api/skills/demo-skill/rename', { newName: 'demo-2' })).ok, '重命名技能');
await api('DELETE', '/api/skills/demo-2/file?path=sub%2Frun.sh');
sdet = await api('GET', '/api/skills/demo-2');
ok(!sdet.files.some(f => f.filename === 'sub/run.sh') && sdet.files.some(f => f.filename === 'note.txt'), '删文件生效');
ok((await api('DELETE', '/api/skills/demo-2')).ok, '删除整个技能');
slist = await api('GET', '/api/skills');
ok(!slist.some(x => x.name.indexOf('demo') === 0), '删除后列表干净');
// ---- 10. 系统状态与优雅重启(阶段 2;放在最后,服务进程将退出收尾)----
console.log('\n[9] 优雅重启');
console.log('\n[10] 优雅重启');
const st = await api('GET', '/api/system/status');
ok(st.ok && st.started_at && st.port === 8099, 'GET /api/system/status');
s = await api('POST', '/api/sessions', { title: '冒烟-重启保护' });