设置页新增 MCP 服务管理:增/改/删 name、url 与多 headers,启用开关
- 设置主页新增「MCP」入口卡片,路由到 mcp 页 - mcp 页读 GET /api/config 的 effective.mcp_servers,展示为卡片列表 - 顶部在「已写入未重启」时常驻重启服务横幅(复用 .restart-bar) - 卡片显示 name / url / 启用状态徽标 / 全部 headers 键值 - 新增 mcp-edit-modal:name、url、可增删的 headers 行、enable 开关 - 共用模型页的 mpe-row / mpe-grow / mpe-del 等样式 - 保存走既有 PATCH /api/config 的细粒度 edits:append / delete / setIn - 新增:op=append path=[mcp_servers] 一并写入 url/name/enable/headers - 改:仅推送与当前配置有差异的字段(name/url/enable 逐项;headers 整体 setIn 一次) - 删:op=delete path=[mcp_servers, idx] - 改动后置位 SET.mcpPendingRestart,复用 sUI.restartNow() 跳转重启 - 不改后端逻辑:mcp_servers 字段已存在于配置 schema 与校验链路 Refs: 设置页阶段化建设(沿用模型池同款 PATCH + 弹窗编辑模式)
This commit is contained in:
@@ -255,6 +255,30 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- MCP 服务编辑/新增弹窗:配置 name / url / 多条 headers / 启用开关;保存后写入 config.yml,重启生效 -->
|
||||
<div id="mcp-edit-modal" class="modal-overlay hidden" onclick="if(event.target===this)mcpUI.close()">
|
||||
<div class="modal modal-wide">
|
||||
<button class="modal-close-btn" onclick="mcpUI.close()">
|
||||
<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 id="mce-title">编辑 MCP 服务</h3>
|
||||
<input type="text" id="mce-name" placeholder="服务名(留空取 url 主机名首段)">
|
||||
<input type="text" id="mce-url" placeholder="MCP 服务 JSON-RPC 端点(完整 URL)">
|
||||
<div class="mpe-sec">
|
||||
<div class="mpe-sec-head"><span>请求头(headers)</span><button class="ghost-btn sm" onclick="mcpUI.addHeader()">添加 header</button></div>
|
||||
<div id="mce-headers"></div>
|
||||
</div>
|
||||
<div class="mpe-cks" style="margin-top:14px">
|
||||
<label class="mpe-ck"><input type="checkbox" id="mce-enable" checked>启用(关闭后启动不加载该服务的工具)</label>
|
||||
</div>
|
||||
<div class="btn-row mpe-foot">
|
||||
<button class="ghost-btn danger hidden" id="mce-del-btn" onclick="mcpUI.del()">删除服务</button>
|
||||
<button class="primary-btn" onclick="mcpUI.save()">保存</button>
|
||||
</div>
|
||||
<div class="cfg-note">保存后写入 config.yml,点击「服务」页「重启服务」后生效。</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 全局确认弹窗(替代原生 confirm;搬自 index) -->
|
||||
<div id="confirm-modal" class="modal-overlay hidden" onclick="if(event.target===this)confirmClose(false)">
|
||||
<div class="modal">
|
||||
@@ -2414,6 +2438,8 @@
|
||||
pendingEnable: {}, // 已写盘但重启前 effective 仍是旧值的 enable 覆盖(id → bool),防卡片回弹
|
||||
deletedModels: {}, // 已从 config.yml 删除、重启前后端仍会返回的模型(id → true):前端隐藏防回弹
|
||||
expandedGroups: {}, balanceByGroup: {}, balanceRequested: {}, balanceTypes: [], // 平台编辑弹窗工作态见 pfEdit(模块级变量)
|
||||
// MCP 服务页:cfgMcp 缓存当前列表;改动待重启生效时置位,顶部常驻重启横幅
|
||||
cfgMcp: [], mcpPendingRestart: false,
|
||||
};
|
||||
let setTok = 0; // 异步渲染防竞态令牌
|
||||
|
||||
@@ -2640,6 +2666,7 @@
|
||||
if (p === 'skill-detail') return setPageSkillDetail(ctx);
|
||||
if (p === 'skill-editor') return setPageSkillEditor(ctx);
|
||||
if (p === 'models') return setPageModels(ctx);
|
||||
if (p === 'mcp') return setPageMcp(ctx);
|
||||
}
|
||||
// 主页卡片跳转与配置表单脏值标红(容器常驻,各自委托一次)
|
||||
$('set-body').addEventListener('click', e => {
|
||||
@@ -2663,6 +2690,8 @@
|
||||
icon: '<svg class="ic" viewBox="0 0 24 24"><polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2"></polygon></svg>' },
|
||||
{ go: 'models', name: '模型', desc: '模型池状态 · 增删改',
|
||||
icon: '<svg class="ic" viewBox="0 0 24 24"><rect x="4" y="4" width="16" height="16" rx="2"></rect><rect x="9" y="9" width="6" height="6"></rect><line x1="9" y1="1" x2="9" y2="4"></line><line x1="15" y1="1" x2="15" y2="4"></line><line x1="9" y1="20" x2="9" y2="23"></line><line x1="15" y1="20" x2="15" y2="23"></line><line x1="20" y1="9" x2="23" y2="9"></line><line x1="20" y1="14" x2="23" y2="14"></line><line x1="1" y1="9" x2="4" y2="9"></line><line x1="1" y1="14" x2="4" y2="14"></line></svg>' },
|
||||
{ go: 'mcp', name: 'MCP', desc: 'MCP 服务 · 增删改',
|
||||
icon: '<svg class="ic" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="16" rx="2"></rect><line x1="3" y1="10" x2="21" y2="10"></line><circle cx="7" cy="15" r="1.2" fill="currentColor" stroke="none"></circle><circle cx="12" cy="15" r="1.2" fill="currentColor" stroke="none"></circle><circle cx="17" cy="15" r="1.2" fill="currentColor" stroke="none"></circle></svg>' },
|
||||
];
|
||||
function setPageHome(ctx) {
|
||||
setTitle('设置');
|
||||
@@ -3531,6 +3560,183 @@
|
||||
} catch (e) { toast('删除失败:' + e.message); }
|
||||
}
|
||||
|
||||
// ---------- 页:MCP 服务(增/改/删;name / url / 多 headers / enable) ----------
|
||||
// 与模型池共用 PATCH /api/config 的细粒度 edit 接口:
|
||||
// · 新增 = append 到 mcp_servers;
|
||||
// · 删 = delete mcp_servers[pi];
|
||||
// · 改 = setIn mcp_servers[pi].(name|url|enable);headers 是普通键值对象,整体 setIn 一次到位。
|
||||
// 运行配置(cg.effective.mcp_servers)即文件刚解析后的视图,按 pi 直接定位;重启后才会重新发现工具。
|
||||
let mcpEdit = null; // 工作态:{ idx, headers:[{key, value}] };idx=-1 为新增
|
||||
async function setPageMcp(ctx) {
|
||||
setTitle('MCP 服务');
|
||||
setActions('<button class="icon-btn" title="添加 MCP 服务" onclick="mcpUI.add()">' +
|
||||
'<svg class="ic" 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>');
|
||||
setBody('<div class="set-scroll" id="mcp-list"><div class="empty-tip">加载中…</div></div>');
|
||||
await loadMcpList(ctx);
|
||||
}
|
||||
async function loadMcpList(ctx) {
|
||||
const box = $('mcp-list');
|
||||
if (!box || (ctx && !ctx())) return;
|
||||
try {
|
||||
const cg = await req('GET', '/api/config');
|
||||
if (ctx && !ctx()) return;
|
||||
if (!$('mcp-list')) return;
|
||||
SET.cfgMcp = (cg.effective && cg.effective.mcp_servers) || [];
|
||||
if (!SET.cfgMcp.length) {
|
||||
box.innerHTML = (SET.mcpPendingRestart
|
||||
? '<div class="restart-bar"><span>配置已写入,重启后生效</span><button class="primary-btn" onclick="sUI.restartNow()">重启服务</button></div>'
|
||||
: '') + '<div class="empty-tip">尚未配置 MCP 服务,点右上角 + 添加。</div>';
|
||||
return;
|
||||
}
|
||||
const banner = SET.mcpPendingRestart
|
||||
? '<div class="restart-bar"><span>配置已写入,重启后生效</span><button class="primary-btn" onclick="sUI.restartNow()">重启服务</button></div>'
|
||||
: '';
|
||||
box.innerHTML = banner + SET.cfgMcp.map(mcpCardHtml).join('') +
|
||||
'<div class="empty-tip">点卡片编辑 MCP 服务,启用后启动时发现其工具并追加到内置工具之后。</div>';
|
||||
} catch (e) {
|
||||
const b = $('mcp-list');
|
||||
if (b && (!ctx || ctx())) b.innerHTML = '<div class="empty-tip">加载失败:' + esc(e.message) + '</div>';
|
||||
}
|
||||
}
|
||||
// MCP 卡:头部 = 名称 + url + enable 状态;体内 = headers 键值列表。整卡点击进入编辑。
|
||||
function mcpCardHtml(s, pi) {
|
||||
const off = s.enable === false;
|
||||
const stateHtml = off ? '<span class="model-card-state off">已禁用</span>' : '<span class="model-card-state idle">启用</span>';
|
||||
const entries = Object.entries(s.headers || {});
|
||||
const headersHtml = entries.length
|
||||
? entries.map(([k, v]) => '<div class="cfg-kv"><label>' + esc(k) + '</label><b>' + esc(v) + '</b></div>').join('')
|
||||
: '<div class="cfg-kv"><label>(无)</label><b>--</b></div>';
|
||||
return '<div class="model-card" onclick="mcpUI.edit(' + pi + ')">' +
|
||||
'<div class="model-card-head">' +
|
||||
'<span class="model-card-name">' + esc(s.name || ('MCP-' + pi)) + '</span>' +
|
||||
'<span class="model-card-meta">' + esc(s.url || '') + '</span>' +
|
||||
stateHtml +
|
||||
'</div>' + headersHtml +
|
||||
'</div>';
|
||||
}
|
||||
// 弹窗打开:add 模式 (idx=-1) → 空工作态;edit 模式 → 从当前配置复制。
|
||||
function openMcpEditor(idx) {
|
||||
const add = idx == null;
|
||||
const s = add ? {} : (SET.cfgMcp[idx] || {});
|
||||
mcpEdit = {
|
||||
idx: add ? -1 : Number(idx),
|
||||
// headers 数组:每个 {key, value} 均为编辑行;空行也保留(用户可能想填)
|
||||
headers: add
|
||||
? [{ key: '', value: '' }]
|
||||
: Object.entries(s.headers || {}).map(([k, v]) => ({ key: k, value: String(v) })),
|
||||
};
|
||||
$('mce-title').textContent = add ? '添加 MCP 服务' : '编辑 MCP 服务';
|
||||
$('mce-name').value = add ? '' : (s.name || '');
|
||||
$('mce-url').value = add ? '' : (s.url || '');
|
||||
$('mce-enable').checked = add ? true : (s.enable !== false);
|
||||
$('mce-del-btn').classList.toggle('hidden', add);
|
||||
renderMcpHeaders();
|
||||
$('mcp-edit-modal').classList.remove('hidden');
|
||||
}
|
||||
function closeMcpEditor() { $('mcp-edit-modal').classList.add('hidden'); }
|
||||
// header 行:id 由 JS 运行时下标 i 拼接,避免与服务端 path 冲突
|
||||
function mcpHeaderRowHtml(r, i) {
|
||||
return '<div class="mpe-row">' +
|
||||
'<input class="mpe-grow" type="text" placeholder="Header 名(如 Authorization)" value="' + esc(r.key) + '" oninput="mcpUI.setHeader(' + i + ',\'key\',this.value)">' +
|
||||
'<input class="mpe-grow" type="text" placeholder="值" value="' + esc(r.value) + '" oninput="mcpUI.setHeader(' + i + ',\'value\',this.value)">' +
|
||||
'<button class="mpe-del" title="删除此 header" onclick="mcpUI.delHeader(' + i + ')">×</button>' +
|
||||
'</div>';
|
||||
}
|
||||
function renderMcpHeaders() {
|
||||
if (!mcpEdit) return;
|
||||
const box = $('mce-headers');
|
||||
if (!mcpEdit.headers.length) box.innerHTML = '<div class="model-group-empty">未配置 header</div>';
|
||||
else box.innerHTML = mcpEdit.headers.map(mcpHeaderRowHtml).join('');
|
||||
}
|
||||
function addMcpHeader() {
|
||||
if (!mcpEdit) return;
|
||||
mcpEdit.headers.push({ key: '', value: '' });
|
||||
renderMcpHeaders();
|
||||
}
|
||||
function delMcpHeader(i) {
|
||||
if (!mcpEdit) return;
|
||||
mcpEdit.headers.splice(i, 1);
|
||||
renderMcpHeaders();
|
||||
}
|
||||
function setMcpHeader(i, f, v) { if (mcpEdit && mcpEdit.headers[i]) mcpEdit.headers[i][f] = v; }
|
||||
// 收集弹窗内的修改为批量 PATCH:服务端一次读文/写回/校验,原子生效。
|
||||
// headers 整体替换(简单可靠;键值对场景下增量 diff 收益小):空 key 行不写入。
|
||||
function buildMcpEdits() {
|
||||
if (!mcpEdit) return [];
|
||||
const edits = [];
|
||||
const name = $('mce-name').value.trim();
|
||||
const url = $('mce-url').value.trim();
|
||||
const enable = $('mce-enable').checked;
|
||||
const add = mcpEdit.idx < 0;
|
||||
if (add) {
|
||||
if (!url) throw new Error('请填写 url');
|
||||
const obj = { url };
|
||||
if (name) obj.name = name;
|
||||
if (!enable) obj.enable = false;
|
||||
const headers = {};
|
||||
for (const r of mcpEdit.headers) {
|
||||
const k = String(r.key || '').trim();
|
||||
const v = String(r.value || '').trim();
|
||||
if (k) headers[k] = v;
|
||||
}
|
||||
if (Object.keys(headers).length) obj.headers = headers;
|
||||
edits.push({ op: 'append', path: ['mcp_servers'], value: obj });
|
||||
} else {
|
||||
const cur = SET.cfgMcp[mcpEdit.idx] || {};
|
||||
if (!url) throw new Error('请填写 url');
|
||||
if (name !== (cur.name || '')) edits.push({ path: ['mcp_servers', mcpEdit.idx, 'name'], value: name });
|
||||
if (url !== (cur.url || '')) edits.push({ path: ['mcp_servers', mcpEdit.idx, 'url'], value: url });
|
||||
if (!!cur.enable !== enable) edits.push({ path: ['mcp_servers', mcpEdit.idx, 'enable'], value: enable });
|
||||
// headers 仅在内容变更时整体 setIn;避免无意义重写(顺序可能不同)
|
||||
const newH = {};
|
||||
for (const r of mcpEdit.headers) {
|
||||
const k = String(r.key || '').trim();
|
||||
const v = String(r.value || '').trim();
|
||||
if (k) newH[k] = v;
|
||||
}
|
||||
const curH = cur.headers || {};
|
||||
const same = JSON.stringify(newH) === JSON.stringify(curH);
|
||||
if (!same) edits.push({ path: ['mcp_servers', mcpEdit.idx, 'headers'], value: newH });
|
||||
}
|
||||
return edits;
|
||||
}
|
||||
async function saveMcpEditor() {
|
||||
let edits;
|
||||
try { edits = buildMcpEdits(); }
|
||||
catch (e) { toast(e.message); return; }
|
||||
if (!edits.length) { toast('没有改动'); closeMcpEditor(); return; }
|
||||
try {
|
||||
await req('PATCH', '/api/config', { edits });
|
||||
closeMcpEditor();
|
||||
afterMcpWrite();
|
||||
} catch (e) { toast('保存失败:' + e.message); }
|
||||
}
|
||||
async function delMcpEditor() {
|
||||
if (!mcpEdit || mcpEdit.idx < 0) return;
|
||||
const s = SET.cfgMcp[mcpEdit.idx] || {};
|
||||
closeMcpEditor();
|
||||
if (!await confirmModal('删除 MCP 服务', '删除「' + (s.name || s.url || ('MCP-' + mcpEdit.idx)) + '」?此操作仅修改 config.yml,重启后该服务的工具不再加载。', '删除', true)) return;
|
||||
try {
|
||||
await req('PATCH', '/api/config', { path: ['mcp_servers', mcpEdit.idx], op: 'delete' });
|
||||
afterMcpWrite();
|
||||
} catch (e) { toast('删除失败:' + e.message); }
|
||||
}
|
||||
function afterMcpWrite() {
|
||||
SET.mcpPendingRestart = true;
|
||||
toast('已写入 config.yml,到「服务」页重启后生效');
|
||||
loadMcpList();
|
||||
}
|
||||
window.mcpUI = {
|
||||
add: function () { openMcpEditor(null); },
|
||||
edit: openMcpEditor,
|
||||
close: closeMcpEditor,
|
||||
save: saveMcpEditor,
|
||||
del: delMcpEditor,
|
||||
addHeader: addMcpHeader,
|
||||
delHeader: delMcpHeader,
|
||||
setHeader: setMcpHeader,
|
||||
};
|
||||
|
||||
// ---------- 设置区对外接口(动态卡片里的 onclick 均指向这里) ----------
|
||||
window.sUI = {
|
||||
// 账户
|
||||
|
||||
Reference in New Issue
Block a user