已完成会话可手动选择空闲模型
This commit is contained in:
@@ -219,6 +219,24 @@ function releaseModel(sessionId) {
|
||||
db.prepare('UPDATE sessions SET model_id = NULL, updated_at = ? WHERE id = ?').run(now(), sessionId);
|
||||
}
|
||||
|
||||
// 手动为已结版/已终止的会话指定模型:选定的模型必须空闲,绑定后状态直接 active,
|
||||
// 下一条消息不再排队;若有未回应消息则立刻开跑。绑而不用同样受闲置租约兑底(sweepHeld)。
|
||||
function bindToSession(sessionId, modelId) {
|
||||
const s = getSession(sessionId);
|
||||
if (!s) throw Object.assign(new Error('会话不存在'), { status_code: 404 });
|
||||
if (s.status !== 'completed' && s.status !== 'cancelled') {
|
||||
throw Object.assign(new Error('仅已完成/已终止的会话可手动选择模型'), { status_code: 409 });
|
||||
}
|
||||
const model = db.prepare('SELECT * FROM model_pool WHERE id = ? AND is_busy = 0').get(String(modelId || ''));
|
||||
if (!model) throw Object.assign(new Error('模型不存在或正被占用'), { status_code: 409 });
|
||||
touch(sessionId, { cancelled_at: null, completed_at: null, held_at: null });
|
||||
bindModel(s, model);
|
||||
emitStatus(sessionId);
|
||||
log.info('[model] ' + sessionId + ' 手动绑定模型 ' + model.id);
|
||||
if (hasPendingUser(sessionId)) runLoop(sessionId);
|
||||
return { ok: true, model_id: model.id };
|
||||
}
|
||||
|
||||
// 是否还有待回应的新用户消息(最后一条非 tool 消息是 user)。
|
||||
// 会话上下文消息(role=user 但带 SESSION_CONTEXT_NAME 标记)不算待回应消息。
|
||||
function hasPendingUser(sessionId) {
|
||||
@@ -675,6 +693,7 @@ module.exports = {
|
||||
recordModelUsage,
|
||||
modelUsageStats,
|
||||
dispatchQueued,
|
||||
bindToSession,
|
||||
TOOL_DEFINITIONS,
|
||||
START_EXECUTION_MESSAGE,
|
||||
};
|
||||
|
||||
@@ -155,6 +155,7 @@
|
||||
<div class="phase-bar" id="phase-bar">
|
||||
<span class="status-pill" id="status-pill">--</span>
|
||||
<button class="stop-link hidden" id="stop-btn" onclick="ui.stopSession()">终止</button>
|
||||
<button class="stop-link muted hidden" id="model-switch-btn" onclick="ui.openModelSwitch()">选择模型</button>
|
||||
</div>
|
||||
|
||||
<div class="messages" id="messages"></div>
|
||||
@@ -203,6 +204,18 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 已完成会话手动选择模型弹窗 -->
|
||||
<div id="bind-model-modal" class="modal-overlay hidden" onclick="if(event.target===this)ui.closeModelSwitch()">
|
||||
<div class="modal">
|
||||
<button class="modal-close-btn" onclick="ui.closeModelSwitch()">
|
||||
<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>
|
||||
<p class="empty-tip">为已结束(已完成/已终止)的会话指定一个空闲模型,绑定后继续对话将优先使用该模型。</p>
|
||||
<div class="btn-row" id="bind-model-list" style="flex-direction:column;align-items:stretch;gap:8px;"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新建技能弹窗 -->
|
||||
<div id="skill-create-modal" class="modal-overlay hidden" onclick="if(event.target===this)skillsUI.closeCreate()">
|
||||
<div class="modal">
|
||||
@@ -282,10 +295,10 @@
|
||||
<div class="toast hidden" id="toast"></div>
|
||||
|
||||
<!-- 发版时更新 v 参数,避免移动端浏览器缓存旧 JS -->
|
||||
<script src="/js/core.js?v=20260902b"></script>
|
||||
<script src="/js/tasks.js?v=20260902b"></script>
|
||||
<script src="/js/skills.js?v=20260902b"></script>
|
||||
<script src="/js/models.js?v=20260902b"></script>
|
||||
<script src="/js/settings.js?v=20260902b"></script>
|
||||
<script src="/js/core.js?v=20260902c"></script>
|
||||
<script src="/js/tasks.js?v=20260902c"></script>
|
||||
<script src="/js/skills.js?v=20260902c"></script>
|
||||
<script src="/js/models.js?v=20260902c"></script>
|
||||
<script src="/js/settings.js?v=20260902c"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -483,6 +483,9 @@ function updatePhaseUI(d) {
|
||||
btn.classList.toggle('hidden', !actionable);
|
||||
btn.textContent = state.status === 'held' ? '断开' : '终止';
|
||||
btn.classList.toggle('muted', state.status === 'held');
|
||||
// 已完成/已终止时提供「选择模型」,手动指定空闲模型后继续对话
|
||||
const msBtn = $('model-switch-btn');
|
||||
if (msBtn) msBtn.classList.toggle('hidden', !(state.sessionId && (state.status === 'completed' || state.status === 'cancelled')));
|
||||
}
|
||||
|
||||
// ---------- 文件 ----------
|
||||
@@ -535,6 +538,35 @@ const ui = {
|
||||
$('new-title').focus();
|
||||
},
|
||||
closeCreate() { $('create-modal').classList.add('hidden'); },
|
||||
async openModelSwitch() {
|
||||
if (!state.sessionId) return;
|
||||
const list = $('bind-model-list');
|
||||
list.innerHTML = '<div class="empty-tip">加载中…</div>';
|
||||
$('bind-model-modal').classList.remove('hidden');
|
||||
try {
|
||||
const rows = await req('GET', '/api/models');
|
||||
if (!rows.length) {
|
||||
list.innerHTML = '<div class="empty-tip">还没有配置模型。</div>';
|
||||
return;
|
||||
}
|
||||
list.innerHTML = rows.map(m => m.is_busy
|
||||
? '<button class="ghost-btn" disabled>' + esc(m.display_name || m.id) + ' · 占用中</button>'
|
||||
: '<button class="primary-btn" onclick="ui.bindModel(\'' + esc(m.id) + '\')">' + esc(m.display_name || m.id) + '</button>').join('');
|
||||
} catch (e) {
|
||||
list.innerHTML = '<div class="empty-tip">读取模型列表失败:' + e.message + '</div>';
|
||||
}
|
||||
},
|
||||
closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); },
|
||||
async bindModel(modelId) {
|
||||
if (!state.sessionId) return;
|
||||
try {
|
||||
await req('POST', '/api/sessions/' + state.sessionId + '/bind', { model_id: modelId });
|
||||
toast('已绑定模型 ' + modelId);
|
||||
this.closeModelSwitch();
|
||||
} catch (e) { toast('绑定失败:' + e.message); }
|
||||
// 无论成败都刷新状态(失败多为并发占用,状态可能已变)
|
||||
try { await renderDetail(await req('GET', '/api/sessions/' + state.sessionId)); } catch (_) {}
|
||||
},
|
||||
async createSession() {
|
||||
try {
|
||||
const title = $('new-title').value.trim();
|
||||
|
||||
@@ -120,6 +120,10 @@ router.get('/:id', wrap((req, res) => {
|
||||
});
|
||||
}));
|
||||
|
||||
router.post('/:id/bind', wrap((req, res) => {
|
||||
res.json(engine.bindToSession(req.params.id, req.body && req.body.model_id));
|
||||
}));
|
||||
|
||||
router.delete('/:id', wrap((req, res) => {
|
||||
const delDir = req.query.delete_dir === 'true' || req.query.delete_dir === '';
|
||||
log.info('[task] ' + (req.user || '-') + ' 删除任务 ' + req.params.id + (delDir ? '(含任务目录)' : ''));
|
||||
|
||||
Reference in New Issue
Block a user