按 README 设计方案实现 Agent 系统 app/:多模型 FIFO 调度、Agent 主循环、13 个沙箱工具(web_search 走内网 MCP)、H5 前端(SSE 流式)、Docker 部署与端到端冒烟测试(25/25 通过)
This commit is contained in:
@@ -0,0 +1,138 @@
|
||||
// 文件管理 API(README 10.3):上传 / 列表 / 下载 / 删除
|
||||
const express = require('express');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const multer = require('multer');
|
||||
const engine = require('../engine');
|
||||
const { listTaskFiles } = require('./sessions');
|
||||
const { resolveInTask } = require('../tools/executor');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
function taskDir(req) {
|
||||
const dir = engine.taskDirOf(req.params.id);
|
||||
fs.mkdirSync(dir, { recursive: true });
|
||||
return dir;
|
||||
}
|
||||
|
||||
function sanitizeName(original) {
|
||||
let name = Buffer.from(original || 'file', 'latin1').toString('utf8');
|
||||
name = path.basename(name).replace(/[\/\x00-\x1f]/g, '_');
|
||||
while (name.startsWith('.')) name = name.slice(1);
|
||||
return name || 'file';
|
||||
}
|
||||
|
||||
const upload = multer({
|
||||
storage: multer.diskStorage({
|
||||
destination: function (req, file, cb) {
|
||||
try { cb(null, taskDir(req)); } catch (err) { cb(err); }
|
||||
},
|
||||
filename: function (req, file, cb) {
|
||||
try {
|
||||
const dir = taskDir(req);
|
||||
const name = sanitizeName(file.originalname);
|
||||
const ext = path.extname(name);
|
||||
const stem = name.slice(0, name.length - ext.length);
|
||||
let target = name;
|
||||
let i = 0;
|
||||
while (fs.existsSync(path.join(dir, target))) {
|
||||
i++;
|
||||
target = stem + '-' + i + ext;
|
||||
}
|
||||
cb(null, target);
|
||||
} catch (err) { cb(err); }
|
||||
},
|
||||
}),
|
||||
limits: { filesize: 50 * 1024 * 1024 },
|
||||
});
|
||||
|
||||
router.post('/:id/files', upload.array('files', 10), function (req, res) {
|
||||
try {
|
||||
const uploaded = (req.files || []).map(f => ({ filename: f.filename, size: f.size }));
|
||||
const db = engine.getDb();
|
||||
for (const f of uploaded) {
|
||||
db.prepare('INSERT INTO files (session_id, filename, size, created_at) VALUES (?,?,?,?)')
|
||||
.run(req.params.id, f.filename, f.size, Date.now());
|
||||
}
|
||||
res.json({ uploaded });
|
||||
} catch (err) {
|
||||
res.status(500).json({ error: String(err && err.message || err) });
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/:id/files', function (req, res) {
|
||||
try {
|
||||
const session = engine.getSession(req.params.id);
|
||||
if (!session) return res.status(404).json({ error: '会话不存在' });
|
||||
res.json(listTaskFiles(engine.taskDirOf(session.id)));
|
||||
} catch (err) {
|
||||
res.status(500).json({ error: String(err && err.message || err) });
|
||||
}
|
||||
});
|
||||
|
||||
// 下载(支持子目录路径,前端用 ?path=xxx 传入相对路径)
|
||||
router.get('/:id/files/download', function (req, res) {
|
||||
try {
|
||||
const rel = String(req.query.path || '');
|
||||
if (!rel) return res.status(400).json({ error: '缺少 path 参数' });
|
||||
const abs = resolveInTask(engine.taskDirOf(req.params.id), rel);
|
||||
const st = fs.statSync(abs);
|
||||
if (!st.isFile()) return res.status(400).json({ error: '不是文件' });
|
||||
res.download(abs, path.basename(abs));
|
||||
} catch (err) {
|
||||
res.status(404).json({ error: '文件不存在' });
|
||||
}
|
||||
});
|
||||
|
||||
router.delete('/:id/files', function (req, res) {
|
||||
try {
|
||||
const rel = String(req.query.path || '');
|
||||
if (!rel) return res.status(400).json({ error: '缺少 path 参数' });
|
||||
const dir = engine.taskDirOf(req.params.id);
|
||||
const abs = resolveInTask(dir, rel);
|
||||
if (path.resolve(abs) === path.resolve(dir)) {
|
||||
return res.status(400).json({ error: '禁止删除任务目录' });
|
||||
}
|
||||
fs.rmSync(abs, { recursive: true, force: true });
|
||||
engine.getDb().prepare('DELETE FROM files WHERE session_id = ? AND filename = ?')
|
||||
.run(req.params.id, rel);
|
||||
res.json({ ok: true });
|
||||
} catch (err) {
|
||||
res.status(404).json({ error: '文件不存在' });
|
||||
}
|
||||
});
|
||||
|
||||
// 兼容 README 形式:GET /:id/files/{filename}(支持子目录)
|
||||
router.get('/:id/files/*', function (req, res) {
|
||||
try {
|
||||
const rel = req.params[req.params.length - 1] || '';
|
||||
if (!rel) return res.status(400).json({ error: '缺少文件名' });
|
||||
const abs = resolveInTask(engine.taskDirOf(req.params.id), rel);
|
||||
const st = fs.statSync(abs);
|
||||
if (!st.isFile()) return res.status(400).json({ error: '不是文件' });
|
||||
res.download(abs, path.basename(abs));
|
||||
} catch (err) {
|
||||
res.status(404).json({ error: '文件不存在' });
|
||||
}
|
||||
});
|
||||
|
||||
// 兼容 README 形式:DELETE /:id/files/{filename}
|
||||
router.delete('/:id/files/*', function (req, res) {
|
||||
req.query.path = req.params[req.params.length - 1] || '';
|
||||
if (!req.query.path) return res.status(400).json({ error: '缺少文件名' });
|
||||
try {
|
||||
const dir = engine.taskDirOf(req.params.id);
|
||||
const abs = resolveInTask(dir, req.query.path);
|
||||
if (path.resolve(abs) === path.resolve(dir)) {
|
||||
return res.status(400).json({ error: '禁止删除任务目录' });
|
||||
}
|
||||
fs.rmSync(abs, { recursive: true, force: true });
|
||||
engine.getDb().prepare('DELETE FROM files WHERE session_id = ? AND filename = ?')
|
||||
.run(req.params.id, req.query.path);
|
||||
res.json({ ok: true });
|
||||
} catch (err) {
|
||||
res.status(404).json({ error: '文件不存在' });
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,62 @@
|
||||
// 消息与交互 API(README 10.2):发消息 / SSE 流 / 开始执行 / 终止
|
||||
const express = require('express');
|
||||
const engine = require('../engine');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
function wrap(fn) {
|
||||
return function (req, res) {
|
||||
try {
|
||||
fn(req, res);
|
||||
} catch (err) {
|
||||
res.status(err && err.status_code || 500).json({ error: String(err && err.message || err) });
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
router.post('/:id/messages', wrap((req, res) => {
|
||||
const content = String((req.body && req.body.content) || '').trim();
|
||||
if (!content) return res.status(400).json({ error: 'content 不能为空' });
|
||||
const r = engine.postUserMessage(req.params.id, content);
|
||||
res.json(r);
|
||||
}));
|
||||
|
||||
router.post('/:id/start', wrap((req, res) => {
|
||||
res.json(engine.startExecution(req.params.id));
|
||||
}));
|
||||
|
||||
router.post('/:id/stop', wrap((req, res) => {
|
||||
res.json(engine.stop(req.params.id));
|
||||
}));
|
||||
|
||||
// SSE 事件流
|
||||
router.get('/:id/stream', (req, res) => {
|
||||
const session = engine.getSession(req.params.id);
|
||||
if (!session) return res.status(404).json({ error: '会话不存在' });
|
||||
const bus = engine.getBus();
|
||||
res.set({
|
||||
'Content-Type': 'text/event-stream',
|
||||
'Cache-Control': 'no-cache',
|
||||
Connection: 'keep-alive',
|
||||
'X-Accel-Buffering': 'no',
|
||||
});
|
||||
res.flushHeaders && res.flushHeaders();
|
||||
res.write('retry: 3000\n\n');
|
||||
bus.addClient(session.id, res);
|
||||
const heartbeat = setInterval(() => {
|
||||
try { res.write(': ping\n\n'); } catch (_) {}
|
||||
}, 15000);
|
||||
req.on('close', () => {
|
||||
clearInterval(heartbeat);
|
||||
bus.removeClient(session.id, res);
|
||||
});
|
||||
bus.emit(session.id, 'status', {
|
||||
session_id: session.id,
|
||||
status: session.status,
|
||||
phase: session.phase,
|
||||
model_id: session.model_id,
|
||||
queue_pos: session.status === 'queued' ? engine.queuePosition(session.id) : null,
|
||||
});
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,89 @@
|
||||
// 会话管理 API(README 10.1)
|
||||
const express = require('express');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const engine = require('../engine');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
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 sendErr(res, err) {
|
||||
const code = err && err.status_code || 500;
|
||||
res.status(code).json({ error: String(err && err.message || err) });
|
||||
}
|
||||
|
||||
// 递归列出任务目录文件
|
||||
function listTaskFiles(dir) {
|
||||
const out = [];
|
||||
(function rec(d, rel) {
|
||||
let entries;
|
||||
try { entries = fs.readdirSync(d, { withFileTypes: true }); } catch (_) { return; }
|
||||
for (const e of entries) {
|
||||
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(function (a, b) { return a.filename < b.filename ? -1 : a.filename > b.filename ? 1 : 0; });
|
||||
return out;
|
||||
}
|
||||
|
||||
router.post('/', wrap((req, res) => {
|
||||
const title = (req.body && req.body.title || '').trim();
|
||||
const session = engine.createSession(title);
|
||||
res.json(session);
|
||||
}));
|
||||
|
||||
router.get('/', wrap((req, res) => {
|
||||
const db = engine.getDb();
|
||||
const rows = db.prepare('SELECT * FROM sessions ORDER BY updated_at DESC LIMIT 50').all();
|
||||
const qpos = db.prepare(
|
||||
'SELECT session_id, ROW_NUMBER() OVER (ORDER BY queued_at, id) AS pos FROM wait_queue'
|
||||
).all();
|
||||
const posMap = {};
|
||||
for (const r of qpos) posMap[r.session_id] = r.pos;
|
||||
for (const row of rows) {
|
||||
row.queue_pos = row.status === 'queued' ? (posMap[row.id] || null) : null;
|
||||
}
|
||||
res.json(rows);
|
||||
}));
|
||||
|
||||
router.get('/:id', wrap((req, res) => {
|
||||
const session = engine.getSession(req.params.id);
|
||||
if (!session) return sendErr(res, Object.assign(new Error('会话不存在'), { status_code: 404 }));
|
||||
const db = engine.getDb();
|
||||
const messages = db.prepare('SELECT id, role, content, tool_calls, tool_call_id, name, created_at FROM messages WHERE session_id = ? ORDER BY id').all(session.id);
|
||||
const taskDir = engine.taskDirOf(session.id);
|
||||
res.json({
|
||||
session,
|
||||
messages,
|
||||
files: listTaskFiles(taskDir),
|
||||
queue_pos: session.status === 'queued' ? engine.queuePosition(session.id) : null,
|
||||
running: !!(engine.getRun(session.id) || {}).looping,
|
||||
});
|
||||
}));
|
||||
|
||||
router.delete('/:id', wrap((req, res) => {
|
||||
const delDir = req.query.delete_dir === 'true' || req.query.delete_dir === '';
|
||||
res.json(engine.deleteSession(req.params.id, delDir));
|
||||
}));
|
||||
|
||||
module.exports = router;
|
||||
module.exports.listTaskFiles = listTaskFiles;
|
||||
Reference in New Issue
Block a user