2.0阶段5调整2: 任务页去模型池条;模型页支持增改删(PATCH写config,待重启徽章提示);设置页去运行中会话行、未保存改动标红

This commit is contained in:
2026-09-01 22:18:56 +08:00
parent 530e1c6d72
commit 21e5a5d2cc
5 changed files with 185 additions and 43 deletions
+6 -10
View File
@@ -63,16 +63,7 @@ body {
margin-top: 16px;
}
/* ---- 模型池条 ---- */
.model-strip {
display: flex; gap: 6px; padding: 8px 12px 0;
flex-wrap: wrap;
}
.model-chip {
font-size: 11px; padding: 3px 8px; border-radius: 10px;
background: #e3f2e6; color: #217a34;
}
.model-chip.busy { background: #fdecea; color: #b3382c; }
/* ---- 模型池条已随 2.0 任务页改版移除 ---- */
/* ---- 会话列表 ---- */
.session-list { flex: 1; overflow-y: auto; padding: 10px 12px calc(16px + env(safe-area-inset-bottom)); }
@@ -337,7 +328,10 @@ body {
.model-card-state { font-size: 11px; padding: 2px 8px; border-radius: 9px; }
.model-card-state.idle { background: #e3f2e6; color: #217a34; }
.model-card-state.busy { background: #fdecea; color: #b3382c; }
/* 配置已加但还没重启进运行池 */
.model-card-state.pending { background: #fff4dc; color: #a06a00; }
.model-card-meta { font-size: 12px; color: #888; margin-top: 4px; }
.model-card-foot { display: flex; justify-content: flex-end; gap: 14px; margin-top: 6px; }
/* ---- 设置页行 ---- */
.settings-row {
@@ -392,6 +386,8 @@ body {
}
.cfg-input:focus { border-color: #2a5299; background: #fff; }
.cfg-input::-webkit-outer-spin-button, .cfg-input::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
/* 改了但还没保存的项标红 */
.cfg-input.cfg-dirty { color: #c0392b; border-color: #e8b4b0; background: #fdf3f2; }
/* 原文编辑器保存前的校验错误条 */
.cfg-err {
margin: 8px 12px 0; padding: 8px 12px; border-radius: 8px;
+27 -6
View File
@@ -28,7 +28,6 @@
</button>
</div>
</div>
<div class="model-strip" id="model-strip"></div>
<div class="session-list" id="session-list"></div>
</div>
@@ -82,6 +81,11 @@
<div id="tab-models" class="tab-page hidden">
<div class="header">
<div class="header-left"><h2>模型池</h2></div>
<div class="header-right">
<button class="icon-btn" onclick="modelsUI.openAdd()" 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" id="model-cards">
<div class="empty-tip">加载中…</div>
@@ -221,6 +225,23 @@
</div>
</div>
<!-- 添加模型弹窗 -->
<div id="model-add-modal" class="modal-overlay hidden" onclick="if(event.target===this)modelsUI.closeAdd()">
<div class="modal">
<button class="modal-close-btn" onclick="modelsUI.closeAdd()">
<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="model-new-id" placeholder="id(唯一标识,如 ds3)" style="width:100%">
<input type="text" id="model-new-name" placeholder="显示名(留空同 id)" style="width:100%">
<input type="text" id="model-new-url" placeholder="上游地址(OpenAI 兼容 /v1)" style="width:100%">
<input type="text" id="model-new-key" placeholder="api_key(选填,留空不带鉴权头)" style="width:100%">
<label class="del-dir"><input type="checkbox" id="model-new-vision">支持图片输入(vision)</label>
<button class="primary-btn" style="width:100%" onclick="modelsUI.add()">添加</button>
<div class="cfg-note">写入 config.yml 的 models 段,到「设置」页重启服务后生效。</div>
</div>
</div>
<!-- 删除会话弹窗 -->
<div id="delete-modal" class="modal-overlay hidden" onclick="if(event.target===this)ui.closeDelete()">
<div class="modal">
@@ -240,10 +261,10 @@
<div class="toast hidden" id="toast"></div>
<!-- 发版时更新 v 参数,避免移动端浏览器缓存旧 JS -->
<script src="/js/core.js?v=20260901g"></script>
<script src="/js/tasks.js?v=20260901g"></script>
<script src="/js/skills.js?v=20260901g"></script>
<script src="/js/models.js?v=20260901g"></script>
<script src="/js/settings.js?v=20260901g"></script>
<script src="/js/core.js?v=20260901h"></script>
<script src="/js/tasks.js?v=20260901h"></script>
<script src="/js/skills.js?v=20260901h"></script>
<script src="/js/models.js?v=20260901h"></script>
<script src="/js/settings.js?v=20260901h"></script>
</body>
</html>
+136 -14
View File
@@ -1,35 +1,157 @@
// 模型 Tab:模型池卡片。
// 阶段 1 先用现有 /api/models 渲染状态占位卡片,验证 Tab 数据链路;
// 阶段 4 补充 token 用量、费用统计与按天曲线。
// 模型 Tab(阶段 5):模型池状态 + 增 / 改 / 删(仅写 config.yml,到「设置」页重启才生效)。
// 状态(忙/闲)来自运行中的模型池 /api/models;配置(名称/地址/key/vision)来自 /api/config effective。
// 说明:删除/新增按整段替换 models(该段注释会丢失);id 不提供页面修改(会话按 id 绑定,改 id 属危险操作)。
'use strict';
window.tabModules = window.tabModules || {};
// 配置里的模型数组(下标即 PATCH 下标);运行态按 id 关联
let cfgModels = [];
let runtimeById = {};
let modelsPendingRestart = false;
async function loadModelCards() {
const el = $('model-cards');
if (!el) return;
try {
const rows = await req('GET', '/api/models');
if (!rows.length) {
el.innerHTML = '<div class="empty-tip">未配置模型</div>';
const [rt, cg] = await Promise.all([req('GET', '/api/models'), req('GET', '/api/config')]);
runtimeById = {};
for (const m of rt || []) runtimeById[m.id] = m;
cfgModels = (cg.effective && cg.effective.models) || [];
if (!cfgModels.length) {
el.innerHTML = '<div class="empty-tip">尚未配置模型,点右上角 + 添加。</div>';
return;
}
el.innerHTML = rows.map(m =>
'<div class="model-card">' +
el.innerHTML = cfgModels.map(m => {
const run = runtimeById[m.id];
// 运行池里没有 = 配置新增但还没重启生效
const stateHtml = run
? '<span class="model-card-state ' + (run.is_busy ? 'busy' : 'idle') + '">' + (run.is_busy ? '占用中' : '空闲') + '</span>'
: '<span class="model-card-state pending">待重启</span>';
return '<div class="model-card">' +
'<div class="model-card-head">' +
'<span class="model-card-name">' + esc(m.display_name || m.id) + '</span>' +
'<span class="model-card-state ' + (m.is_busy ? 'busy' : 'idle') + '">' + (m.is_busy ? '占用中' : '空闲') + '</span>' +
'<span class="model-card-name">' + esc(m.display_name || m.id) + '</span>' + stateHtml +
'</div>' +
'<div class="model-card-meta">' + esc(m.id) +
(m.is_busy && m.current_session_id ? ' · 会话 ' + esc(m.current_session_id) : '') +
'</div>' +
'</div>').join('') +
'<div class="empty-tip">token 用量与费用统计在阶段 4 上线。</div>';
(run && run.is_busy && run.current_session_id ? ' · 会话 ' + esc(run.current_session_id) : '') + '</div>' +
'<div class="cfg-kv"><label>地址</label><b>' + esc(m.url) + '</b>' +
'<button class="file-act" onclick="modelsUI.edit(\'' + encodeURIComponent(m.id) + '\',\'url\')">改</button></div>' +
'<div class="cfg-kv"><label>api_key</label><b>' + (m.api_key ? '已设置(••••' + esc(String(m.api_key).slice(-4)) + ')' : '(未设置)') + '</b>' +
'<button class="file-act" onclick="modelsUI.edit(\'' + encodeURIComponent(m.id) + '\',\'api_key\')">改</button></div>' +
'<div class="cfg-kv"><label>支持图片</label><b>' + (m.vision ? '是' : '否') + '</b>' +
'<button class="file-act" onclick="modelsUI.toggleVision(\'' + encodeURIComponent(m.id) + '\')">' + (m.vision ? '关' : '开') + '</button></div>' +
'<div class="model-card-foot"><button class="file-act" onclick="modelsUI.rename(\'' + encodeURIComponent(m.id) + '\')">改显示名</button>' +
'<button class="file-act del" onclick="modelsUI.del(\'' + encodeURIComponent(m.id) + '\')">删除模型</button></div>' +
'</div>';
}).join('') +
(modelsPendingRestart
? '<div class="empty-tip">已写入 config.yml,到「设置」页重启服务后生效。</div>'
: '<div class="empty-tip">改动写入 config.yml,重启服务后生效。token 用量统计在阶段 4 上线。</div>');
} catch (e) {
el.innerHTML = '<div class="empty-tip">加载失败:' + esc(e.message) + '</div>';
}
}
function idxOf(id) {
for (let i = 0; i < cfgModels.length; i++) if (cfgModels[i].id === id) return i;
return -1;
}
function afterWrite(r) {
modelsPendingRestart = true;
toast('已写入 config.yml,到「设置」页重启后生效');
loadModelCards();
}
// ---------- 增 ----------
function openAddModel() {
['model-new-id', 'model-new-name', 'model-new-url', 'model-new-key'].forEach(i => { $(i).value = ''; });
$('model-new-vision').checked = false;
$('model-add-modal').classList.remove('hidden');
$('model-new-id').focus();
}
function closeAddModel() { $('model-add-modal').classList.add('hidden'); }
async function addModel() {
const id = $('model-new-id').value.trim();
const url = $('model-new-url').value.trim();
if (!id) { toast('请填写 id'); return; }
if (idxOf(id) >= 0) { toast('id 已存在:' + id); return; }
if (!url) { toast('请填写上游地址'); return; }
const m = {
id,
display_name: $('model-new-name').value.trim() || id,
url,
api_key: $('model-new-key').value.trim(),
vision: $('model-new-vision').checked,
};
try {
const r = await req('PATCH', '/api/config', { path: 'models', value: cfgModels.concat([m]) });
closeAddModel();
afterWrite(r);
} catch (e) { toast('添加失败:' + e.message); }
}
// ---------- 改 ----------
async function patchModel(id, field, value) {
const i = idxOf(id);
if (i < 0) return toast('模型不存在:' + id);
try {
const r = await req('PATCH', '/api/config', { path: ['models', i, field], value });
afterWrite(r);
} catch (e) { toast('保存失败:' + e.message); }
}
async function editModel(rawId, field) {
const id = decodeURIComponent(rawId);
const m = cfgModels[idxOf(id)] || {};
const label = field === 'url' ? '上游地址(OpenAI 兼容 /v1,不带尾斜杠)' : 'API Key(留空则不带鉴权头)';
// api_key 不回填旧值,避免密钥展示在输入框
const v = prompt(label + ':', field === 'url' ? (m.url || '') : '');
if (v == null) return;
await patchModel(id, field, v.trim());
}
async function renameModel(rawId) {
const id = decodeURIComponent(rawId);
const m = cfgModels[idxOf(id)] || {};
const v = prompt('显示名:', m.display_name || '');
if (v == null) return;
const name = v.trim();
if (!name) return toast('显示名不能为空');
await patchModel(id, 'display_name', name);
}
async function toggleVision(rawId) {
const id = decodeURIComponent(rawId);
const m = cfgModels[idxOf(id)] || {};
if (!confirm('模型「' + (m.display_name || id) + '」支持图片输入(vision)?\n确定=开启,取消=关闭')) return;
await patchModel(id, 'vision', !m.vision);
}
// ---------- 删(整段替换 models,会丢该段注释) ----------
async function delModel(rawId) {
const id = decodeURIComponent(rawId);
const i = idxOf(id);
if (i < 0) return;
const m = cfgModels[i];
if (cfgModels.length <= 1) return toast('至少要保留一个模型');
if (!confirm('删除模型「' + (m.display_name || id) + '」?将整体重写 models 段(注释可能丢失)。')) return;
try {
const r = await req('PATCH', '/api/config', { path: 'models', value: cfgModels.filter(x => x.id !== id) });
afterWrite(r);
} catch (e) { toast('删除失败:' + e.message); }
}
window.modelsUI = {
openAdd: openAddModel,
closeAdd: closeAddModel,
add: addModel,
edit: editModel,
rename: renameModel,
toggleVision: toggleVision,
del: delModel,
};
tabModules.models = {
onShow() { loadModelCards(); },
};
+16 -1
View File
@@ -63,7 +63,6 @@ function svcCard(st) {
html += kvPlain('版本 / Node', st.version + ' / ' + st.node);
html += kvPlain('已运行', fmtUptime(st.uptime_ms) + '(启动于 ' + new Date(st.started_at).toLocaleString() + ')');
html += kvPlain('端口', st.port);
html += kvPlain('运行中会话', (st.running_sessions || []).length);
html += kvPlain('配置文件', st.config_path);
html += kvPlain('工作区', st.workspace_root);
html += kvPlain('技能目录', st.skills_root);
@@ -99,6 +98,7 @@ function formCard() {
async function loadSettings() {
refreshUser();
bindDirtyMark();
const el = $('cfg-sections');
if (!el) return;
el.innerHTML = '<div class="empty-tip">加载中…</div>';
@@ -128,6 +128,21 @@ async function refreshUser() {
} catch (_) { /* 未启用认证 */ }
}
// 未保存改动标红:委托监听(#cfg-sections 容器常驻,innerHTML 重建不影响)
let dirtyBound = false;
function bindDirtyMark() {
if (dirtyBound) return;
const box = $('cfg-sections');
if (!box) return;
dirtyBound = true;
box.addEventListener('input', function (ev) {
const inp = ev.target;
if (inp.classList && inp.classList.contains('cfg-input')) {
inp.classList.toggle('cfg-dirty', inp.value.trim() !== inp.dataset.orig);
}
});
}
// ---------- 表单保存(收集与打开时不同的项,逐项 PATCH) ----------
async function saveForm() {
const inputs = document.querySelectorAll('#cfg-sections .cfg-input');
-12
View File
@@ -78,15 +78,6 @@ async function loadSessions() {
} catch (e) { toast('加载会话失败:' + e.message); }
}
async function loadModels() {
try {
const rows = await req('GET', '/api/models');
$('model-strip').innerHTML = rows.map(m =>
'<span class="model-chip ' + (m.is_busy ? 'busy' : '') + '">' +
esc(m.display_name || m.id) + (m.is_busy ? ' 忙' : ' 空闲') + '</span>').join('');
} catch (_) {}
}
// ---------- 消息渲染 ----------
function md(text) {
if (typeof marked === 'undefined') return esc(text);
@@ -276,7 +267,6 @@ function connectStream() {
es.addEventListener('done', ev => {
removePendingBubble(); // 本轮结束,占位兼终止(如模型报错无回复)
loadSessions();
loadModels();
});
es.addEventListener('error', ev => {
removePendingBubble();
@@ -406,7 +396,6 @@ const ui = {
state.sessionId = null;
showList();
loadSessions();
loadModels();
},
async send() {
const ta = $('msg-input');
@@ -502,6 +491,5 @@ window.tabModules = window.tabModules || {};
tabModules.tasks = {
onShow() {
loadSessions();
loadModels();
},
};