From 7ab64ff998e456aad3e658039e39e7cb17300f83 Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 28 Sep 2026 10:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E4=BC=9A=E8=AF=9D=E8=BF=9E?= =?UTF-8?q?=E5=B8=A6=E6=B8=85=E7=90=86=20/tmp=EF=BC=9AclearSessionMessages?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20wipeSessionTmp=E2=80=94=E2=80=94?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E7=BA=A7=20/tmp=20=E7=9A=84=E5=AE=BF?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=AE=9E=E4=BD=93=E6=98=AF=20<=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9B=AE=E5=BD=95>/.tmp=EF=BC=88executor=20wrapper=20?= =?UTF-8?q?bind=20=E8=BF=9B=E5=AE=B9=E5=99=A8=E3=80=81HOME/TMPDIR=20?= =?UTF-8?q?=E5=90=8C=E6=8C=87=E3=80=81=E8=B7=A8=20/exec=20=E4=BF=9D?= =?UTF-8?q?=E7=95=99=EF=BC=89=EF=BC=8C=E3=80=8C=E6=B8=85=E7=A9=BA=3D?= =?UTF-8?q?=E4=BB=8E=E9=9B=B6=E5=BC=80=E5=A7=8B=E3=80=8D=E7=9A=84=E8=AF=AD?= =?UTF-8?q?=E4=B9=89=E4=B8=8B=E4=B8=8A=E4=B8=80=E8=BD=AE=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E4=BA=A7=E7=89=A9=E4=B8=8D=E8=AF=A5=E5=B8=A6=E8=BF=9B=E6=96=B0?= =?UTF-8?q?=E4=B8=80=E8=BD=AE=EF=BC=9B=E4=BB=BB=E5=8A=A1=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=9C=AC=E4=BD=93=E6=96=87=E4=BB=B6=E7=85=A7=E6=97=A7=E4=BF=9D?= =?UTF-8?q?=E7=95=99=EF=BC=8C=E6=89=A7=E8=A1=8C=E5=AE=B9=E5=99=A8=E4=B8=8B?= =?UTF-8?q?=E6=AC=A1=E9=81=87=E5=88=B0=E7=BC=BA=E5=A4=B1=E7=9A=84=20.tmp?= =?UTF-8?q?=20=E6=87=92=E9=87=8D=E5=BB=BA=E6=97=A0=E5=89=AF=E4=BD=9C?= =?UTF-8?q?=E7=94=A8=E3=80=82=E9=98=B2=E5=BE=A1=E7=BB=86=E8=8A=82=EF=BC=9A?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E9=93=BE=E6=8E=A5=E5=8F=AA=E6=96=AD=E4=B8=8D?= =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E3=80=81=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=B9=82?= =?UTF-8?q?=E7=AD=89=E8=B7=B3=E8=BF=87=E3=80=81=E5=A4=B1=E8=B4=A5=E5=8F=AA?= =?UTF-8?q?=E8=AE=B0=E6=97=A5=E5=BF=97=E4=B8=8D=E9=98=BB=E6=96=AD=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=EF=BC=88=E6=B8=85=E7=A9=BA=E6=97=B6=E5=BF=85=E6=97=A0?= =?UTF-8?q?=20looping=20=E5=9B=9E=E5=90=88=EF=BC=8C=E6=97=A0=20mount=20?= =?UTF-8?q?=E7=AB=9E=E4=BA=89=EF=BC=89=E3=80=82channel=20/help=E3=80=81Web?= =?UTF-8?q?=20=E5=8E=8B=E7=BC=A9=E5=BC=B9=E7=AA=97=E6=96=87=E6=A1=88?= =?UTF-8?q?=E3=80=81ARCHITECTURE=20=E5=90=8C=E6=AD=A5=EF=BC=9B=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=86=85=E6=8E=A2=E9=92=88=E5=85=A8=E9=93=BE=E8=B7=AF?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=88=E5=90=AB=E9=93=BE=E6=8E=A5=E9=98=B2?= =?UTF-8?q?=E5=BE=A1=EF=BC=89=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/engine.js | 20 +++++++++++++++++++- app/server/public/js/sessions.js | 2 +- app/server/routes/channel.js | 2 +- docs/ARCHITECTURE.md | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/server/engine.js b/app/server/engine.js index 8894992..aa4a545 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -1085,7 +1085,24 @@ function maybeAutoCompress(sessionId, run, wasCompressTurn) { } } -// 清空会话的对话内容:删除该会话的全部消息记录,但保留会话本身与任务目录文件(绑定也保持,下次发言沿用原模型)。 +// 会话级 /tmp 的宿主机实体:<任务目录>/.tmp(executor wrapper 把它 bind 进容器 /tmp,HOME/TMPDIR 也指这里, +// 跨 /exec 保留)。清空对话时一并抹掉:临时产物不该带进新一轮;删了下次执行 executor 懒重建,无副作用。 +// 尽力而为:不存在不动;符号链接只断不跟进;失败只记日志不阻断清空。 +function wipeSessionTmp(sessionId) { + try { + const dir = path.join(taskDirOf(sessionId), '.tmp'); + let st; + try { st = fs.lstatSync(dir); } catch (_) { return; } // 不存在 = 无可清理 + if (st.isSymbolicLink()) { fs.unlinkSync(dir); return; } + fs.rmSync(dir, { recursive: st.isDirectory(), force: true }); + } catch (e) { + log.warn('msg', sessionId + ' 清理会话 .tmp 失败(不影响清空):' + (e && e.message || e)); + } +} + +// 清空会话的对话内容:删除该会话的全部消息记录,但保留会话本身与任务目录文件(绑定也保持,下次发言沿用原模型); +// 会话级 /tmp(宿主机即 <任务目录>/.tmp,执行容器 bind 成容器内 /tmp)一并清空:清空的语义是“从零开始”, +// 上一轮留下的临时产物不该带进新一轮;执行容器遇到不存在的 .tmp 会懒重建,无副作用。 // 状态收尾为 completed;此后再次发言从零开始,不再携带旧历史。执行中的会话不允许清空,需先「终止」。 // 阶段语义:清空是 executing 唯一回头路——回到 advising 重新规划(单会话只解决一个问题), // 旧任务书 mv 进 .task-history/ 防污染(archiveTaskBrief);压缩不碰 phase,不在此列。 @@ -1104,6 +1121,7 @@ function clearSessionMessages(sessionId) { runs.delete(sessionId); db.prepare('DELETE FROM messages WHERE session_id = ?').run(sessionId); archiveTaskBrief(sessionId); // 旧任务书先归档(mv),新一轮 advising 不会被上一问题的约定污染 + wipeSessionTmp(sessionId); // 会话级 /tmp 随清空一并抹掉(尽力而为,失败只记日志不阻断) autoCompressProposed.delete(sessionId); // 历史清零,恢复自动压缩提议额度 // 标题随历史一并清零:旧标题描述的是已删除的对话,留着会让新对话文不对题; // 新一轮交互结束后 maybeGenerateTitle 见 title 为空会自动重新生成。 diff --git a/app/server/public/js/sessions.js b/app/server/public/js/sessions.js index 6f204ec..8b998dd 100644 --- a/app/server/public/js/sessions.js +++ b/app/server/public/js/sessions.js @@ -597,7 +597,7 @@ '' + '
' + '' + diff --git a/app/server/routes/channel.js b/app/server/routes/channel.js index 340cafa..c7c08e2 100644 --- a/app/server/routes/channel.js +++ b/app/server/routes/channel.js @@ -89,7 +89,7 @@ const HELP_TEXT = [ '- `/new [msg]` 新建会话并切换)', '- `/stop` 终止当前回合', '- `/compact` 压缩上下文', - '- `/clear` 清空当前会话', + '- `/clear` 清空当前会话(临时文件 /tmp 一并清理)', '- `/status` 查看当前会话状态', '- `/help` 显示本帮助', ].join('\n'); diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index b41e481..65019c0 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -285,7 +285,7 @@ stateDiagram-v2 | `createSession` | 生成 id(`task-YYYYMMDD-NNN`,序号从历史 + `meta.task_seq` 取大)→ mkdir 任务目录 → phase 默认 advising → **创建即绑模型落 held**(指定模型优先其平台,无效退回全局;空池直接报错不建吊着会话) | | `postUserMessage` | 用户消息入口;除 looping(下一迭代自动带上新消息)外任意状态都是「保绑定→转 active→立即开跑」,`delivered` 恒 `'live'` | | `bindToSession` / `releaseHold` | 手动换绑(任意模型即点即换,仅输出中拒绝,无「占用」概念);「断开」= held→completed 纯状态动作(无资源可释放,绑定仍在可继续用) | -| `summarizeContext` / `clearSessionMessages` / `deleteMessage` | 收尾 + 上下文压缩(清空同时把 phase 打回 advising 并归档旧 task.md) | +| `summarizeContext` / `clearSessionMessages` / `deleteMessage` | 收尾 + 上下文压缩(清空同时把 phase 打回 advising、归档旧 task.md、连带清空会话 .tmp 即执行容器里的 /tmp) | | `enterExecuting` / `archiveTaskBrief` | 阶段切换:批尾接 `handoff` 成功标记(brief 已由 handler 落盘)→ 全史存档 + 插 task_brief 快照 + phase='executing' + SSE 广播;清空时旧 task.md mv 进 `.task-history/` | | `checkToolArgs` / `unwrapToolArgs` | 工具参数校验 + 部分弱模型参数包裹外层自动解包 | | `ensureSessionContext` | 注入/刷新"会话上下文"首条 user 消息(日期/任务目录/模型名/vision 能力) |