模型保持占用(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:
@@ -82,7 +82,10 @@ models:
|
||||
|---|---|---|---|
|
||||
| **排队中** | 无模型空闲,用户可输入,消息暂存并进入全局等待队列 | 无 | 可输入,AI 不应答(灰色图标) |
|
||||
| **活跃中** | 已绑定模型,实时对话/执行 | 有 | 消息实时发给模型 |
|
||||
| **已完成/已取消** | 任务结束或终止,模型已释放 | 无 | 可继续输入,自动再次进入排队 |
|
||||
| **保持中(held)** | AI 已答完,在租约内继续占用模型等待追问 | 有(临时保持) | 消息直接复用已绑模型,免排队 |
|
||||
| **已完成/已取消** | 租约到期释放、任务结束或用户终止,模型已释放 | 无 | 可继续输入,自动再次进入排队 |
|
||||
|
||||
> held 租约规则(`model_hold` 可配置):页面无观看者超过 `idle_release_ms`(默认 3 分钟)即释放;有人观看最长保持 `active_max_ms`(默认 30 分钟),防止挂着页面霸占模型池。
|
||||
|
||||
> 「已完成」和「已取消」本质相同,都回到“空闲”状态,仅记录一个结束原因。
|
||||
|
||||
@@ -90,11 +93,10 @@ models:
|
||||
|
||||
1. **创建会话**:生成任务 ID,创建任务目录,尝试绑定空闲模型。
|
||||
2. **用户输入**:
|
||||
- 活跃中 → 实时发送。
|
||||
- 活跃中 / 保持中 → 实时发送(held 直接复用已绑模型)。
|
||||
- 排队中 / 已完成 → 消息暂存,会话自动进入全局等待队列。
|
||||
3. **模型分配**:模型空闲时,从全局队列 FIFO 取会话,绑定,将暂存消息一次性发出。
|
||||
4. **开始执行**:用户点击状态开关,系统追加 user 消息,阶段切换。
|
||||
5. **任务结束**:AI 完成或用户终止,模型释放,会话回到空闲状态。
|
||||
4. **回合结束**:AI 答完,会话进入 held(模型不释放,可无缝追问);租约到期无追问 → 释放变 completed;用户终止 → cancelled 并立即释放。
|
||||
|
||||
---
|
||||
|
||||
@@ -736,13 +738,14 @@ To use a Skill:
|
||||
CREATE TABLE sessions (
|
||||
id TEXT PRIMARY KEY, -- 任务 ID,如 "task-20260830-001"
|
||||
title TEXT DEFAULT '', -- 会话标题(可由 AI 生成或用户填写)
|
||||
status TEXT NOT NULL, -- queued | active | completed | cancelled
|
||||
status TEXT NOT NULL, -- queued | active | held | completed | cancelled
|
||||
phase TEXT NOT NULL DEFAULT 'planning', -- planning | execution
|
||||
model_id TEXT, -- 绑定的模型 ID(ds1/ds2/ds3),排队时为空
|
||||
created_at INTEGER NOT NULL,
|
||||
updated_at INTEGER NOT NULL,
|
||||
completed_at INTEGER,
|
||||
cancelled_at INTEGER
|
||||
cancelled_at INTEGER,
|
||||
held_at INTEGER -- 进入 held(保持租约)的时间
|
||||
);
|
||||
|
||||
-- 消息表
|
||||
|
||||
@@ -28,6 +28,13 @@ agent:
|
||||
max_tool_iterations: 50
|
||||
max_retries: 2
|
||||
|
||||
# 模型保持占用(held)租约:AI 答完后不立即释放模型,用户追问可直接复用。
|
||||
# 页面无人观看超过 idle_release_ms 释放;有人观看最长保持 active_max_ms;sweep_ms 巡检间隔。
|
||||
model_hold:
|
||||
idle_release_ms: 180000 # 3 分钟
|
||||
active_max_ms: 1800000 # 30 分钟
|
||||
sweep_ms: 10000 # 10 秒
|
||||
|
||||
# 内置 basic auth(可选)。若已在前面放 nginx-proxy 做认证,此处留空即可。
|
||||
# auth:
|
||||
# user: admin
|
||||
|
||||
@@ -11,6 +11,9 @@ const DEFAULTS = {
|
||||
db_path: '', // 默认为 workspace_root/.agent.db
|
||||
terminal: { default_timeout_ms: 30000, max_output_chars: 10000 },
|
||||
agent: { temperature: 1.0, max_tool_iterations: 50, max_retries: 2 },
|
||||
// 回合结束后模型保持占用(held)的租约:页内无人观看超过 idle_release_ms 则释放;
|
||||
// 即便一直有人观看,最长也只保持 active_max_ms;sweep_ms 为巡检间隔。
|
||||
model_hold: { idle_release_ms: 180000, active_max_ms: 1800000, sweep_ms: 10000 },
|
||||
models: [],
|
||||
auth: null, // { user, password },为空则不启用内置 basic auth(可交给 nginx-proxy)
|
||||
// web_search 工具:内网 MCP 服务(JSON-RPC over HTTP,无状态)
|
||||
|
||||
+5
-1
@@ -19,7 +19,8 @@ function initDb(dbPath) {
|
||||
created_at INTEGER NOT NULL,
|
||||
updated_at INTEGER NOT NULL,
|
||||
completed_at INTEGER,
|
||||
cancelled_at INTEGER
|
||||
cancelled_at INTEGER,
|
||||
held_at INTEGER
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS messages (
|
||||
@@ -60,6 +61,9 @@ function initDb(dbPath) {
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id, id);
|
||||
CREATE INDEX IF NOT EXISTS idx_files_session ON files(session_id);
|
||||
`);
|
||||
// 迁移:旧库补 held_at 列(held 保持租约起始时间)
|
||||
const cols = db.prepare('PRAGMA table_info(sessions)').all();
|
||||
if (!cols.some(c => c.name === 'held_at')) db.exec('ALTER TABLE sessions ADD COLUMN held_at INTEGER');
|
||||
return db;
|
||||
}
|
||||
|
||||
|
||||
+61
-13
@@ -95,14 +95,16 @@ function syncModelPool() {
|
||||
for (const row of db.prepare('SELECT id FROM model_pool').all()) {
|
||||
if (!ids.includes(row.id)) db.prepare('DELETE FROM model_pool WHERE id = ?').run(row.id);
|
||||
}
|
||||
// 进程重启后:释放所有绑定、把 active 会话退回队列
|
||||
// 进程重启后:释放所有绑定、把 active 会话退回队列;held 会话直接结版(释放)
|
||||
db.prepare('UPDATE model_pool SET is_busy = 0, current_session_id = NULL').run();
|
||||
db.prepare("UPDATE sessions SET status='completed', completed_at=?, held_at=NULL, model_id=NULL WHERE status='held'").run(now());
|
||||
for (const s of db.prepare("SELECT id FROM sessions WHERE status = 'active'").all()) {
|
||||
db.prepare("UPDATE sessions SET status='queued', model_id=NULL, updated_at=? WHERE id=?").run(now(), s.id);
|
||||
enqueue(s.id);
|
||||
}
|
||||
// 兜底:queued 会话必须在队列中
|
||||
// 兑底:queued 会话必须在队列中
|
||||
for (const s of db.prepare("SELECT id FROM sessions WHERE status='queued'").all()) enqueue(s.id);
|
||||
startHoldSweeper();
|
||||
}
|
||||
|
||||
function freeModel() {
|
||||
@@ -160,6 +162,40 @@ function dispatchQueued() {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- held 保持租约 ----------
|
||||
// 回合结束后会话进入 held:继续占用模型(用户追问免排队),由 sweeper 按规则释放:
|
||||
// - 页面无 SSE 观看者:超过 idle_release_ms 释放;
|
||||
// - 有人观看:最长保持 active_max_ms(防止挂着页面霸占模型池)。
|
||||
function releaseHeld(sessionId) {
|
||||
const s = getSession(sessionId);
|
||||
if (!s || s.status !== 'held') return;
|
||||
touch(sessionId, { status: 'completed', completed_at: now(), held_at: null });
|
||||
releaseModel(sessionId);
|
||||
bus.emit(sessionId, 'done', { status: 'completed' });
|
||||
emitStatus(sessionId);
|
||||
dispatchQueued();
|
||||
}
|
||||
|
||||
function sweepHeld() {
|
||||
const holdCfg = (cfg && cfg.model_hold) || {};
|
||||
const idleMs = holdCfg.idle_release_ms || 180000;
|
||||
const activeMs = holdCfg.active_max_ms || 1800000;
|
||||
const t = now();
|
||||
for (const s of db.prepare("SELECT * FROM sessions WHERE status='held'").all()) {
|
||||
const heldSince = t - (s.held_at || s.updated_at || 0);
|
||||
const present = bus.clientCount && bus.clientCount(s.id) > 0;
|
||||
if (heldSince >= (present ? activeMs : idleMs)) releaseHeld(s.id);
|
||||
}
|
||||
}
|
||||
|
||||
let holdTimer = null;
|
||||
function startHoldSweeper() {
|
||||
if (holdTimer) return;
|
||||
const ms = (cfg && cfg.model_hold && cfg.model_hold.sweep_ms) || 10000;
|
||||
holdTimer = setInterval(sweepHeld, ms);
|
||||
if (holdTimer.unref) holdTimer.unref(); // 不阻止进程退出
|
||||
}
|
||||
|
||||
// ---------- 运行控制 ----------
|
||||
function getRun(sessionId, create) {
|
||||
let run = runs.get(sessionId);
|
||||
@@ -199,16 +235,20 @@ function finalize(sessionId, run) {
|
||||
const s = getSession(sessionId);
|
||||
if (!s || s.status !== 'active') { runs.delete(sessionId); return; }
|
||||
const cancelled = run.cancelled;
|
||||
touch(sessionId, {
|
||||
status: cancelled ? 'cancelled' : 'completed',
|
||||
cancelled_at: cancelled ? now() : null,
|
||||
completed_at: cancelled ? null : now(),
|
||||
});
|
||||
releaseModel(sessionId);
|
||||
if (cancelled) {
|
||||
touch(sessionId, { status: 'cancelled', cancelled_at: now(), completed_at: null });
|
||||
releaseModel(sessionId);
|
||||
runs.delete(sessionId);
|
||||
bus.emit(sessionId, 'done', { status: 'cancelled' });
|
||||
emitStatus(sessionId);
|
||||
dispatchQueued();
|
||||
return;
|
||||
}
|
||||
// 正常结束:进入 held 保持租约,不释放模型,用户追问可直接复用
|
||||
touch(sessionId, { status: 'held', held_at: now(), completed_at: null, cancelled_at: null });
|
||||
runs.delete(sessionId);
|
||||
bus.emit(sessionId, 'done', { status: cancelled ? 'cancelled' : 'completed' });
|
||||
bus.emit(sessionId, 'done', { status: 'held' });
|
||||
emitStatus(sessionId);
|
||||
dispatchQueued();
|
||||
}
|
||||
|
||||
async function runLoopInner(sessionId, run) {
|
||||
@@ -346,12 +386,19 @@ function postUserMessage(sessionId, content, opts) {
|
||||
// 正在跑:下一轮迭代会从 DB 重新加载历史,自动带上这条消息
|
||||
return { message_id: messageId, delivered: 'live' };
|
||||
}
|
||||
if (session.status === 'held') {
|
||||
// 保持租约期内:直接复用当前绑定的模型,无需排队
|
||||
touch(sessionId, { status: 'active', held_at: null });
|
||||
emitStatus(sessionId);
|
||||
runLoop(sessionId);
|
||||
return { message_id: messageId, delivered: 'live' };
|
||||
}
|
||||
if (session.status === 'active' && (!run || !run.looping)) {
|
||||
runLoop(sessionId);
|
||||
return { message_id: messageId, delivered: 'live' };
|
||||
}
|
||||
// 排队 / 已完成 / 已取消 → 重新入队;若派发后已立即拿到空闲模型,则算直接送达
|
||||
touch(sessionId, { status: 'queued', cancelled_at: null, completed_at: null });
|
||||
touch(sessionId, { status: 'queued', cancelled_at: null, completed_at: null, held_at: null });
|
||||
enqueue(sessionId);
|
||||
dispatchQueued();
|
||||
const after = getSession(sessionId);
|
||||
@@ -381,13 +428,14 @@ function stop(sessionId) {
|
||||
if (session.status === 'active') {
|
||||
// run 在循环退出处会 finalize;若无循环在跑则直接收尾
|
||||
if (!run || !run.looping) {
|
||||
touch(sessionId, { status: 'cancelled', cancelled_at: now() });
|
||||
touch(sessionId, { status: 'cancelled', cancelled_at: now(), held_at: null });
|
||||
releaseModel(sessionId);
|
||||
runs.delete(sessionId);
|
||||
bus.emit(sessionId, 'done', { status: 'cancelled' });
|
||||
}
|
||||
} else {
|
||||
touch(sessionId, { status: 'cancelled', cancelled_at: now(), model_id: null });
|
||||
touch(sessionId, { status: 'cancelled', cancelled_at: now(), model_id: null, held_at: null, completed_at: null });
|
||||
releaseModel(sessionId); // held 会话同时释放模型保持租约
|
||||
}
|
||||
emitStatus(sessionId);
|
||||
dispatchQueued();
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
|
||||
// ---------- 文件 ----------
|
||||
|
||||
+6
-1
@@ -33,7 +33,12 @@ function createBus() {
|
||||
clients.delete(sessionId);
|
||||
}
|
||||
|
||||
return { addClient, removeClient, emit, closeAll };
|
||||
function clientCount(sessionId) {
|
||||
const set = clients.get(sessionId);
|
||||
return set ? set.size : 0;
|
||||
}
|
||||
|
||||
return { addClient, removeClient, emit, closeAll, clientCount };
|
||||
}
|
||||
|
||||
module.exports = { createBus };
|
||||
|
||||
@@ -19,3 +19,9 @@ agent:
|
||||
temperature: 1.0
|
||||
max_tool_iterations: 20
|
||||
max_retries: 1
|
||||
|
||||
# 冒烟测试用短租约,验证 held → 自动释放
|
||||
model_hold:
|
||||
idle_release_ms: 1500
|
||||
active_max_ms: 8000
|
||||
sweep_ms: 300
|
||||
|
||||
+10
-3
@@ -69,10 +69,17 @@ async function main() {
|
||||
let d = await waitSession(s.id, x => x.session.status === 'active', 5000, '绑定模型');
|
||||
ok(d.session.model_id === 'ds1', '绑定第一个空闲模型 ds1', d.session.model_id);
|
||||
await api('POST', '/api/sessions/' + s.id + '/messages', { content: '你好呀' });
|
||||
d = await waitSession(s.id, x => x.session.status === 'completed', 8000, 'AI 回复完成');
|
||||
d = await waitSession(s.id, x => x.session.status === 'held', 8000, 'AI 回复完成(held)');
|
||||
const asst = d.messages.filter(m => m.role === 'assistant');
|
||||
ok(asst.length === 1 && asst[0].content.includes('你好呀'), 'AI 文本回复流式落库', asst.map(m => m.content).join('|'));
|
||||
ok(d.session.model_id === null, '完成后释放模型');
|
||||
ok(d.session.model_id === 'ds1', '回复完成后模型不释放(held 保持租约)', d.session.model_id);
|
||||
// held 期间追问:直接复用已绑模型,不重新排队
|
||||
const r2 = await api('POST', '/api/sessions/' + s.id + '/messages', { content: '再来一条' });
|
||||
ok(r2 && r2.delivered === 'live', 'held 期间追问直接送达(不排队)', r2 && r2.delivered);
|
||||
d = await waitSession(s.id, x => x.session.status === 'held' && x.messages.filter(m => m.role === 'assistant').length >= 2, 8000, '第二次回复');
|
||||
ok(d.session.model_id === 'ds1', '追问复用同一模型', d.session.model_id);
|
||||
// held 租约到期自动释放(测试配置 idle_release_ms=1500)
|
||||
d = await waitSession(s.id, x => x.session.status === 'completed' && x.session.model_id === null, 6000, 'held 租约到期自动释放');
|
||||
|
||||
// ---- 2. 工具调用 write_file ----
|
||||
console.log('\n[2] 工具调用');
|
||||
@@ -80,7 +87,7 @@ async function main() {
|
||||
await waitSession(s.id, x => x.session.status === 'active', 5000, '绑定');
|
||||
await api('POST', '/api/sessions/' + s.id + '/start');
|
||||
await api('POST', '/api/sessions/' + s.id + '/messages', { content: '请写文件' });
|
||||
d = await waitSession(s.id, x => x.session.status === 'completed' && x.messages.some(m => m.role === 'tool'), 15000, '工具回合完成');
|
||||
d = await waitSession(s.id, x => x.session.status === 'held' && x.messages.some(m => m.role === 'tool'), 15000, '工具回合完成(held)');
|
||||
const toolMsgs = d.messages.filter(m => m.role === 'tool');
|
||||
ok(toolMsgs.length === 1 && toolMsgs[0].name === 'write_file', 'tool 消息落库', JSON.stringify(toolMsgs.map(m => m.name)));
|
||||
ok(toolMsgs[0].content.includes('hello.txt'), '工具结果包含文件名', toolMsgs[0].content);
|
||||
|
||||
Reference in New Issue
Block a user