新增删除单条消息:DELETE /api/sessions/:id/messages/:messageId + 消息行删除按钮
- engine.deleteMessage:assistant 的 tool_calls 轮连带删除其 tool 回执,防孤儿 tool 行破坏协议;tool 行拒绝单独删 - 删除后库行消失,下次发给模型的历史自然不含该条(buildMessages 只看库) - index.html:复制按钮后加删除按钮(× 图标),点击 confirm 后调接口并重拉详情重建消息区;发送成功的实时用户消息也带删除按钮 - style.css:删除按钮悬停变红、请求中禁用态
This commit is contained in:
@@ -900,6 +900,30 @@ function clearSessionMessages(sessionId) {
|
|||||||
return { ok: true };
|
return { ok: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 删除单条消息:消息行直接从库里消失,下次模型请求的历史里就没有它了(buildMessages 只看库)。
|
||||||
|
// assistant 带 tool_calls 时连带删掉该轮的 tool 回执:只删 assistant 会留下无 tool_call 配对的
|
||||||
|
// 孤儿 tool 行,上游会拒收整个请求。tool 回执不允许单独删:删了它其父 assistant 的
|
||||||
|
// tool_calls 就没有回执,同样破坏协议;要删请删对应的 assistant 消息整轮。
|
||||||
|
function deleteMessage(sessionId, messageId) {
|
||||||
|
const session = getSession(sessionId);
|
||||||
|
if (!session) throw Object.assign(new Error('会话不存在'), { status_code: 404 });
|
||||||
|
const row = db.prepare('SELECT * FROM messages WHERE id = ? AND session_id = ?').get(messageId, sessionId);
|
||||||
|
if (!row) throw Object.assign(new Error('消息不存在'), { status_code: 404 });
|
||||||
|
if (row.role === 'tool') throw Object.assign(new Error('工具回执不能单独删除,请删它对应的 AI 消息'), { status_code: 400 });
|
||||||
|
let removed = 0;
|
||||||
|
if (row.tool_calls) {
|
||||||
|
let calls = [];
|
||||||
|
try { calls = JSON.parse(row.tool_calls) || []; } catch (_) {}
|
||||||
|
for (const c of calls) {
|
||||||
|
if (!c || !c.id) continue;
|
||||||
|
removed += db.prepare("DELETE FROM messages WHERE session_id = ? AND role = 'tool' AND tool_call_id = ?")
|
||||||
|
.run(sessionId, c.id).changes;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
db.prepare('DELETE FROM messages WHERE id = ?').run(messageId);
|
||||||
|
return { ok: true, id: messageId, removed: removed + 1 };
|
||||||
|
}
|
||||||
|
|
||||||
function setModelPool(cfg_, db_, bus_) { cfg = cfg_; db = db_; bus = bus_; }
|
function setModelPool(cfg_, db_, bus_) { cfg = cfg_; db = db_; bus = bus_; }
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
@@ -917,6 +941,7 @@ module.exports = {
|
|||||||
renameSession,
|
renameSession,
|
||||||
deleteSession,
|
deleteSession,
|
||||||
clearSessionMessages,
|
clearSessionMessages,
|
||||||
|
deleteMessage,
|
||||||
getSession,
|
getSession,
|
||||||
getRun,
|
getRun,
|
||||||
taskDirOf,
|
taskDirOf,
|
||||||
|
|||||||
@@ -255,6 +255,9 @@ main { flex: 1; min-height: 0; display: flex; flex-direction: column; }
|
|||||||
.msg-actions .act { display: flex; color: var(--gray-light); padding: 3px; border-radius: 6px; }
|
.msg-actions .act { display: flex; color: var(--gray-light); padding: 3px; border-radius: 6px; }
|
||||||
.msg-actions .act:active, .msg-actions .act:hover { color: var(--ink); }
|
.msg-actions .act:active, .msg-actions .act:hover { color: var(--ink); }
|
||||||
.msg-actions .act.copied { color: var(--active); }
|
.msg-actions .act.copied { color: var(--active); }
|
||||||
|
/* 删除本条:悬停变红点明破坏性;禁用态(请求中)半透且不响应 */
|
||||||
|
.msg-actions .act-del:hover { color: #c0392b; }
|
||||||
|
.msg-actions .act-del[disabled] { opacity: .4; pointer-events: none; }
|
||||||
|
|
||||||
/* ================= 底部输入区 ================= */
|
/* ================= 底部输入区 ================= */
|
||||||
footer { flex: none; padding: 8px 12px calc(10px + env(safe-area-inset-bottom, 0px)); background: var(--page); }
|
footer { flex: none; padding: 8px 12px calc(10px + env(safe-area-inset-bottom, 0px)); background: var(--page); }
|
||||||
|
|||||||
@@ -287,6 +287,7 @@
|
|||||||
* POST /api/sessions/:id/stop | /release 状态栏「终止/断开」
|
* POST /api/sessions/:id/stop | /release 状态栏「终止/断开」
|
||||||
* POST /api/sessions/:id/bind {model_id} 状态栏「选择模型」(已完成/已终止会话)
|
* POST /api/sessions/:id/bind {model_id} 状态栏「选择模型」(已完成/已终止会话)
|
||||||
* DELETE /api/sessions/:id/messages 状态栏「清空」(会话内删除已移除,清空由这里承担)
|
* DELETE /api/sessions/:id/messages 状态栏「清空」(会话内删除已移除,清空由这里承担)
|
||||||
|
* DELETE /api/sessions/:id/messages/:messageId 删除单条消息(assistant 轮连带其工具回执)
|
||||||
* GET /api/models 状态栏「选择模型」弹窗模型列表
|
* GET /api/models 状态栏「选择模型」弹窗模型列表
|
||||||
*
|
*
|
||||||
* 设置区(侧边栏用户区整行点击进入;页面搬自 index.html,未新增任何接口):
|
* 设置区(侧边栏用户区整行点击进入;页面搬自 index.html,未新增任何接口):
|
||||||
@@ -303,7 +304,6 @@
|
|||||||
* 无后端支撑、仅前端占位的概念(先不实现):
|
* 无后端支撑、仅前端占位的概念(先不实现):
|
||||||
* · 「文秘助理 / 识图专家」模式 —— 后端无 mode 字段,当前仅影响提示文案
|
* · 「文秘助理 / 识图专家」模式 —— 后端无 mode 字段,当前仅影响提示文案
|
||||||
* · 「思考过程」折叠块(已思考 N 秒) —— 后端不产出 reasoning,已移除 mock
|
* · 「思考过程」折叠块(已思考 N 秒) —— 后端不产出 reasoning,已移除 mock
|
||||||
* · 按条删除消息 —— 后端无消息级删除接口;消息下方的删除会话按钮已整体移除(改用状态栏「清空」)
|
|
||||||
* 鉴权:任意请求 401 时跳转 /login(与 core.js 的 req 一致)。
|
* 鉴权:任意请求 401 时跳转 /login(与 core.js 的 req 一致)。
|
||||||
* ============================================================================
|
* ============================================================================
|
||||||
*/
|
*/
|
||||||
@@ -462,13 +462,20 @@
|
|||||||
return { text: m[2] || '', files: files };
|
return { text: m[2] || '', files: files };
|
||||||
}
|
}
|
||||||
|
|
||||||
function actionsHtml(ts, content) {
|
function actionsHtml(ts, content, msgId) {
|
||||||
const b64 = btoa(unescape(encodeURIComponent(content)));
|
const b64 = btoa(unescape(encodeURIComponent(content)));
|
||||||
|
// 删除本条:仅已落库消息可删(传 m.id);流式未落库时无 id,不渲染
|
||||||
|
const del = msgId
|
||||||
|
? '<button class="act act-del" title="删除本条" data-msg-id="' + msgId + '">' +
|
||||||
|
'<svg class="ic sm" viewBox="0 0 24 24"><path d="M18 6 6 18"></path><path d="m6 6 12 12"></path></svg>' +
|
||||||
|
'</button>'
|
||||||
|
: '';
|
||||||
return '<div class="msg-actions">' +
|
return '<div class="msg-actions">' +
|
||||||
'<span>' + fmtTime(ts) + '</span>' +
|
'<span>' + fmtTime(ts) + '</span>' +
|
||||||
'<button class="act act-copy" title="复制" data-b64="' + b64 + '">' +
|
'<button class="act act-copy" title="复制" data-b64="' + b64 + '">' +
|
||||||
'<svg class="ic sm" viewBox="0 0 24 24"><rect x="9" y="9" width="13" height="13" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>' +
|
'<svg class="ic sm" viewBox="0 0 24 24"><rect x="9" y="9" width="13" height="13" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>' +
|
||||||
'</button>' +
|
'</button>' +
|
||||||
|
del +
|
||||||
'</div>';
|
'</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -480,7 +487,7 @@
|
|||||||
// 复制内容取纯文本(不含【系统通知】附件行),与气泡里显示一致
|
// 复制内容取纯文本(不含【系统通知】附件行),与气泡里显示一致
|
||||||
return '<div class="msg me">' +
|
return '<div class="msg me">' +
|
||||||
'<div class="bubble-user' + (r.fmt ? ' md' : '') + '">' + attach + r.html + '</div>' +
|
'<div class="bubble-user' + (r.fmt ? ' md' : '') + '">' + attach + r.html + '</div>' +
|
||||||
actionsHtml(m.created_at, p.text) +
|
actionsHtml(m.created_at, p.text, m.id) +
|
||||||
'</div>';
|
'</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -490,7 +497,7 @@
|
|||||||
if (!text && !reason) return null; // 纯工具调用的应答:不渲染气泡,工具卡由 appendToolCardsFromAssistant 铺
|
if (!text && !reason) return null; // 纯工具调用的应答:不渲染气泡,工具卡由 appendToolCardsFromAssistant 铺
|
||||||
const think = reason ? thinkPanelHtml(m.reasoning) : '';
|
const think = reason ? thinkPanelHtml(m.reasoning) : '';
|
||||||
const bubble = text ? (() => { const r = mdHtml(m.content); return '<div class="bubble-ai' + (r.fmt ? ' md' : '') + '">' + r.html + '</div>'; })() : '';
|
const bubble = text ? (() => { const r = mdHtml(m.content); return '<div class="bubble-ai' + (r.fmt ? ' md' : '') + '">' + r.html + '</div>'; })() : '';
|
||||||
return '<div class="msg other">' + think + bubble + actionsHtml(m.created_at, m.content || '') + '</div>';
|
return '<div class="msg other">' + think + bubble + actionsHtml(m.created_at, m.content || '', m.id) + '</div>';
|
||||||
}
|
}
|
||||||
// 思考过程折叠面板:summary 固定名「思考过程」,body 展示推理全文
|
// 思考过程折叠面板:summary 固定名「思考过程」,body 展示推理全文
|
||||||
function thinkPanelHtml(text) {
|
function thinkPanelHtml(text) {
|
||||||
@@ -615,14 +622,14 @@
|
|||||||
updateScrollBottomBtn();
|
updateScrollBottomBtn();
|
||||||
}
|
}
|
||||||
|
|
||||||
function appendUserMsg(content, fileNames) {
|
function appendUserMsg(content, fileNames, msgId) {
|
||||||
const attach = fileNames && fileNames.length
|
const attach = fileNames && fileNames.length
|
||||||
? '<div class="attach-line">📎 ' + esc(fileNames.join('、')) + '</div>' : '';
|
? '<div class="attach-line">📎 ' + esc(fileNames.join('、')) + '</div>' : '';
|
||||||
const r = mdHtml(content);
|
const r = mdHtml(content);
|
||||||
const wrap = document.createElement('div');
|
const wrap = document.createElement('div');
|
||||||
wrap.className = 'msg me';
|
wrap.className = 'msg me';
|
||||||
wrap.innerHTML = '<div class="bubble-user' + (r.fmt ? ' md' : '') + '">' + attach + r.html + '</div>' +
|
wrap.innerHTML = '<div class="bubble-user' + (r.fmt ? ' md' : '') + '">' + attach + r.html + '</div>' +
|
||||||
actionsHtml(Date.now(), content);
|
actionsHtml(Date.now(), content, msgId);
|
||||||
$('chat-view').appendChild(wrap);
|
$('chat-view').appendChild(wrap);
|
||||||
scrollBottom();
|
scrollBottom();
|
||||||
}
|
}
|
||||||
@@ -989,9 +996,9 @@
|
|||||||
if (pending.length) atts = await uploadFiles(id, pending);
|
if (pending.length) atts = await uploadFiles(id, pending);
|
||||||
const body = { content, deepThink: !!state.deepThink };
|
const body = { content, deepThink: !!state.deepThink };
|
||||||
if (atts.length) body.attachments = atts;
|
if (atts.length) body.attachments = atts;
|
||||||
await req('POST', '/api/sessions/' + id + '/messages', body);
|
const sent = await req('POST', '/api/sessions/' + id + '/messages', body);
|
||||||
|
|
||||||
appendUserMsg(content, atts.map(a => a.name));
|
appendUserMsg(content, atts.map(a => a.name), sent && sent.message_id);
|
||||||
if (!state.sessionTitle && content) {
|
if (!state.sessionTitle && content) {
|
||||||
state.sessionTitle = content.length > 24 ? content.slice(0, 24) : content;
|
state.sessionTitle = content.length > 24 ? content.slice(0, 24) : content;
|
||||||
}
|
}
|
||||||
@@ -1169,6 +1176,27 @@
|
|||||||
$('chat-view').addEventListener('click', onCopyClick);
|
$('chat-view').addEventListener('click', onCopyClick);
|
||||||
$('fs-viewer').addEventListener('click', onCopyClick);
|
$('fs-viewer').addEventListener('click', onCopyClick);
|
||||||
|
|
||||||
|
// ---------- 删除本条消息(复制按钮旁) ----------
|
||||||
|
// 后端连带删 assistant 轮的 tool 回执;成功后重拉详情重建消息区(工具卡需随该轮一起拆)。
|
||||||
|
// 执行中也可删:库行没了,下一轮组装模型历史时自然不含这条。
|
||||||
|
$('chat-view').addEventListener('click', async e => {
|
||||||
|
const btn = e.target.closest('.act-del');
|
||||||
|
if (!btn) return;
|
||||||
|
const msgId = Number(btn.dataset.msgId);
|
||||||
|
if (!msgId || !state.sessionId) return;
|
||||||
|
if (!window.confirm('删除本条消息?它将不再发给 AI。')) return;
|
||||||
|
btn.disabled = true;
|
||||||
|
try {
|
||||||
|
await req('DELETE', '/api/sessions/' + state.sessionId + '/messages/' + msgId);
|
||||||
|
toast('已删除');
|
||||||
|
const detail = await req('GET', '/api/sessions/' + state.sessionId);
|
||||||
|
if (state.view === 'chat') renderDetail(detail);
|
||||||
|
} catch (err) {
|
||||||
|
toast('删除失败:' + err.message);
|
||||||
|
btn.disabled = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// ---------- 全屏查看器(双击气泡/工具卡放大;图片单击放大;均同步 index) ----------
|
// ---------- 全屏查看器(双击气泡/工具卡放大;图片单击放大;均同步 index) ----------
|
||||||
function openFullscreen(el) {
|
function openFullscreen(el) {
|
||||||
const body = $('fs-body');
|
const body = $('fs-body');
|
||||||
|
|||||||
@@ -70,6 +70,15 @@ router.delete('/:id/messages', wrap((req, res) => {
|
|||||||
res.json(r);
|
res.json(r);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// 删除单条消息:assistant 的 tool_calls 轮连带删除其 tool 回执(见 engine.deleteMessage)。
|
||||||
|
// 库中没了,后续发给模型的消息里自然也没有;执行中删除会在下一轮组装历史时生效。
|
||||||
|
router.delete('/:id/messages/:messageId', wrap((req, res) => {
|
||||||
|
const r = engine.deleteMessage(req.params.id, Number(req.params.messageId));
|
||||||
|
log.info('[msg] ' + (req.user || '-') + ' ' + req.params.id + ' 删除消息 ' + req.params.messageId +
|
||||||
|
(r.removed > 1 ? '(连带 ' + (r.removed - 1) + ' 条工具回执)' : ''));
|
||||||
|
res.json(r);
|
||||||
|
}));
|
||||||
|
|
||||||
// SSE 事件流
|
// SSE 事件流
|
||||||
router.get('/:id/stream', (req, res) => {
|
router.get('/:id/stream', (req, res) => {
|
||||||
const session = engine.getSession(req.params.id);
|
const session = engine.getSession(req.params.id);
|
||||||
|
|||||||
Reference in New Issue
Block a user