模型保持占用(held)机制:回合结束不再立即释放模型,进入 held 租约(config.model_hold 可配:idle_release_ms 默认3分钟——页面无人观看即释放;active_max_ms 默认30分钟——有人观看的保持上限;sweep_ms 巡检间隔);held 期间追问直接复用已绑模型免排队(delivered=live);sessions 表迁移新增 held_at 列;sse 增加 clientCount 判定观看者;前端新增保持中状态标签/徽章色,终止入口扩展至 held(主动放弃占用);smoke/README/示例配置同步更新
This commit is contained in:
@@ -74,6 +74,7 @@ body {
|
||||
.badge.active { background: #e3f2e6; color: #217a34; }
|
||||
.badge.queued { background: #fff4dc; color: #a06a00; }
|
||||
.badge.completed { background: #eceff5; color: #5c6674; }
|
||||
.badge.held { background: #efeafc; color: #6b46c8; }
|
||||
.badge.cancelled { background: #fdecea; color: #b3382c; }
|
||||
.session-del { color: #c33; background: none; border: none; font-size: 12px; padding: 6px; }
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
<input type="file" id="msg-file-input" multiple style="display:none;" onchange="ui.uploadFiles(event)">
|
||||
<svg viewBox="0 0 24 24"><path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48"></path></svg>
|
||||
</label>
|
||||
<textarea id="msg-input" placeholder="输入消息,Enter 换行,Ctrl+Enter 发送" rows="1"></textarea>
|
||||
<textarea id="msg-input" placeholder="输入消息..." rows="1"></textarea>
|
||||
<button class="send-btn" onclick="ui.send()">
|
||||
<svg viewBox="0 0 24 24"><line x1="22" y1="2" x2="11" y2="13"></line><polygon points="22 2 15 22 11 13 2 9 22 2"></polygon></svg>
|
||||
</button>
|
||||
|
||||
@@ -117,7 +117,7 @@ async function loadSessions() {
|
||||
return;
|
||||
}
|
||||
el.innerHTML = rows.map(s => {
|
||||
const st = { queued: '排队中', active: '活跃中', completed: '已完成', cancelled: '已终止' }[s.status] || s.status;
|
||||
const st = { queued: '排队中', active: '活跃中', held: '保持中', completed: '已完成', cancelled: '已终止' }[s.status] || s.status;
|
||||
const badge = '<span class="badge ' + s.status + '">' + st + (s.status === 'queued' && s.queue_pos ? ' #' + s.queue_pos : '') + '</span>';
|
||||
return '<div class="session-card" onclick="ui.openSession(\'' + s.id + '\')">' +
|
||||
'<div class="session-main">' +
|
||||
@@ -217,7 +217,7 @@ async function renderDetail(detail) {
|
||||
state.toolCards = {};
|
||||
const s = detail.session;
|
||||
state.status = s.status;
|
||||
updatePhaseUI();
|
||||
updatePhaseUI({ model_id: s.model_id, queue_pos: detail.queue_pos });
|
||||
$('chat-title').textContent = s.title || s.id;
|
||||
for (const m of detail.messages) {
|
||||
const node = msgNode(m, state.toolCards);
|
||||
@@ -309,15 +309,16 @@ function connectStream() {
|
||||
// ---------- 任务状态 ----------
|
||||
function updatePhaseUI(d) {
|
||||
const pill = $('status-pill');
|
||||
const stMap = { queued: '排队中', active: '活跃中', completed: '已完成', cancelled: '已终止' };
|
||||
const stMap = { queued: '排队中', active: '活跃中', held: '保持中', completed: '已完成', cancelled: '已终止' };
|
||||
let text = stMap[state.status] || state.status || '--';
|
||||
if (d && d.queue_pos) text += '(第 ' + d.queue_pos + ' 位)';
|
||||
if (state.status === 'active') {
|
||||
text = '活跃中' + (d && d.model_id ? ' · ' + d.model_id : '');
|
||||
// active/held 时附带当前占用的模型
|
||||
if ((state.status === 'active' || state.status === 'held') && d && d.model_id) {
|
||||
text += ' · ' + d.model_id;
|
||||
}
|
||||
pill.textContent = text;
|
||||
// 仅活跃中提供终止入口
|
||||
$('stop-btn').classList.toggle('hidden', state.status !== 'active');
|
||||
// 活跃中/保持中提供终止入口(保持中点终止 = 主动放弃占用的模型)
|
||||
$('stop-btn').classList.toggle('hidden', state.status !== 'active' && state.status !== 'held');
|
||||
}
|
||||
|
||||
// ---------- 文件 ----------
|
||||
|
||||
Reference in New Issue
Block a user