From 1ee90d1a42a99e7c487e2be75fefbde229935495 Mon Sep 17 00:00:00 2001 From: qyh15 Date: Sat, 14 Nov 2026 10:04:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=89=E5=AE=9E=E6=96=BD=E5=90=8E?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E4=BF=AE=E5=A4=8D=20Q01-Q13=20=E6=B2=BB?= =?UTF-8?q?=E7=90=86/=E4=BA=8B=E5=8A=A1/=E6=88=90=E6=9E=9C/=E7=A7=9F?= =?UTF-8?q?=E7=BA=A6=E8=BE=B9=E7=95=8C=EF=BC=88v0.2.3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Q01/Q02 严格 schema + registry 保留;broken/missing 时治理拒绝 - Q03 用户工具改 user 正向允许,unknown 全拒 - Q04 记忆群域/target Bot/Main 豁免前统一治理 - Q05 派发先记账失败停止执行;回执失败标 unknown - Q06 事务 draft 落盘后发布;guard 后最终复核 - Q07 截断/缺失成果不可验收,审查前拦截 - Q08 真实写入口按工作根互斥;submit finally 释放 - Q09 核实 projectId 校验 + 事件同事务 - Q10 重复 draft/start 不再 confirmed - Q11/Q12 模型原子性、跨项目缓存隔离保留并增强 - Q13 needsKey 展示;144/144 tests --- README.md | 8 +- docs/verification/00-baseline.md | 5 +- docs/verification/02-test-matrix.md | 45 ++++-- docs/verification/03-host-smoke.md | 1 + docs/verification/04-release.md | 29 ++-- docs/verification/05-delivery-note.md | 5 +- docs/verification/evidence/host-v023.png | Bin 0 -> 50264 bytes ds-bot/package.json | 2 +- ds-bot/src/host/memory.js | 32 +++- sansheng/client.js | 20 ++- sansheng/package.json | 2 +- sansheng/src/artifact.js | 11 +- sansheng/src/gate.js | 6 + sansheng/src/gates.js | 2 + sansheng/src/governance.js | 88 +++++++---- sansheng/src/observe.js | 122 ++++++++++++++- sansheng/src/provision.js | 16 +- sansheng/src/records.js | 6 +- sansheng/src/route.js | 5 +- sansheng/src/store.js | 180 +++++++++++++++++++---- sansheng/src/tools.js | 59 +++++--- sansheng/test/artifact.test.js | 5 +- sansheng/test/dispatch-v2.test.js | 92 ++++++++++++ sansheng/test/gate.test.js | 21 +++ sansheng/test/isolation.test.js | 95 ++++++++++++ sansheng/test/records.test.js | 58 +++++++- sansheng/test/route.test.js | 36 +++++ sansheng/test/store.test.js | 116 +++++++++++++++ 28 files changed, 929 insertions(+), 138 deletions(-) create mode 100644 docs/verification/evidence/host-v023.png diff --git a/README.md b/README.md index 7f54ee4..3148026 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,15 @@ | `sansheng_status` | 项目、群、角色、模型、目标阶段、返工预算、写租约、成果代次、待核实派发 | | `sansheng_review` | 尚书记阶段通过/驳回,丞相记目标验收;自动生成并绑定成果快照,最新判决与摘要/代次不一致即失效 | | `sansheng_submit` | 提交成果快照(Git / 非 Git manifest),推进提交代次 | -| `sansheng_config` | 只改本项目的模型/返工预算/自动返工/交付范围 | +| `sansheng_config` | 只改本项目的模型/返工预算/自动返工/交付范围;角色卡也可直接切换模型 | | `sansheng_control` | 用户暂停/恢复/停止/取消目标 | -| `sansheng_lease` | 项目写租约(第一版每项目最多一个活动写任务) | +| `sansheng_lease` | 项目写租约 + 真实写入口按工作根独占(同根串行) | | `sansheng_reconcile` | 重启后核对"结果未知"的派发(不重发、不假装成功) | `group_goal` 仍是阶段进度的唯一权威;尚书是唯一操作者,丞相只验收,工部只执行。项目隔离由服务端治理服务 `sansheng-governance` 落到 ds-bot 的投递与记忆边界,不只靠提示词。 +2026-11-14 审查修复:Q01–Q12 的状态/schema、治理故障拒绝、unknown 权限、记忆群域、派发先记账、事务草稿、成果完整性、真实写根租约、核实项目一致性、draft/start 分类、模型配置原子性、跨项目缓存已补回归;仍未做真实模型 E2E,见 `docs/verification/02-test-matrix.md`。 + 根目录 `package.json` 只是工作区清单(`workspaces: sansheng, ds-bot`),本身不是 DSH 插件,也不进 `dsh.profile.bundles`。 ## 装进 DSH @@ -49,7 +51,7 @@ ## 验证 ```sh -node --test --test-isolation=none sansheng/test/*.test.js # 127 tests +node --test --test-isolation=none sansheng/test/*.test.js # 144 tests node --check sansheng/client.js && node --check sansheng/index.js ``` diff --git a/docs/verification/00-baseline.md b/docs/verification/00-baseline.md index 9e75d38..d3dc500 100644 --- a/docs/verification/00-baseline.md +++ b/docs/verification/00-baseline.md @@ -12,8 +12,8 @@ | 基准提交 | `3f20f89`(工作树在开工时仅多出交接方案文档) | | 远端 | `origin https://git.qyhhh.top/newbie/dsh-sansheng-liubu.git` | | 根工作区 | `workspaces: ["sansheng", "ds-bot"]`,根 `package.json` 不是 DSH 插件 | -| 治理包 | `sansheng/` = `dsh-sansheng-sansheng@0.2.2`(本次发布候选) | -| 团队底座 | `ds-bot/` = `ds-bot@0.3.2-sansheng.2`(上游 `Fei2411/DS-Bot@84c3cb8` + 本地 M-01–M-06) | +| 治理包 | `sansheng/` = `dsh-sansheng-sansheng@0.2.3`(本次发布候选) | +| 团队底座 | `ds-bot/` = `ds-bot@0.3.2-sansheng.3`(上游 `Fei2411/DS-Bot@84c3cb8` + 本地 M-01–M-06) | | Node | v24.21.0(DSH 随附 `~/.dsh/dsh-runtimes/dsh-primary-runtime/dependencies/node/bin/node.exe`) | | 桌面宿主 | DeepSeek Harness 0.2.2-rc.3(`resources/runtime/primary-runtime/runtime.json`) | | 基线测试 | `node --test --test-isolation=none sansheng/test/*.test.js` → 56/56 通过(2026-11-13) | @@ -108,4 +108,3 @@ ds-bot 侧只在服务存在时执行检查;不存在时保持上游行为。 - [x] 项目树入口无公开项目动作 API → 采用宿主原生 `contextMenus` workspace/session 菜单 + 右栏页签;不使用私有 DOM。 - [x] 不依赖直接修改宿主才能成立的功能;ds-bot 必要补丁均记录在 PATCHES。 - [x] 旧数据保留策略明确,无自动迁移。 - diff --git a/docs/verification/02-test-matrix.md b/docs/verification/02-test-matrix.md index 11ff848..7e63855 100644 --- a/docs/verification/02-test-matrix.md +++ b/docs/verification/02-test-matrix.md @@ -1,7 +1,7 @@ -# 验收矩阵与证据状态(候选版本) +# 验收矩阵与证据状态(候选版本 v0.2.3) -日期:2026-11-13 -结论:**候选版本**。仓库内自动化回归通过;已在隔离测试 profile(独立 DSH_HOME,宿主 0.2.2-rc.3)完成真实宿主冒烟:右栏入口、初始化项目、三卡与角色会话可打开、输入框位于底部,证据见 `03-host-smoke.md`。真实模型 E2E(E01–E04)、workspace-groups 项目树右键、深色/窄屏仍缺失;用户日常 desktop profile 未修改。 +日期:2026-11-14 +结论:**候选版本**。仓库内自动化回归 **144/144 通过**;已在隔离测试 profile(独立 DSH_HOME,宿主 0.2.2-rc.3)完成真实宿主冒烟:右栏入口、初始化项目、三卡与角色会话可打开、输入框位于底部,证据见 `03-host-smoke.md`。真实模型 E2E(E01–E04)、workspace-groups 项目树右键、深色/窄屏仍缺失;用户日常 desktop profile 未修改。 ## 1. 自动化测试入口 @@ -19,6 +19,7 @@ node --check sansheng/index.js - `api-v3.test.js`:状态投影与历史折叠 - `gate-install.test.js`:F01、unknown 身份、治理损坏、跨项目 - `client.test.js`:右栏/入口/项目上下文(见 UI 工作包报告) +- 审查修复回归:Q01/Q01b(store)、Q02(governance)、Q03(unknown 工具)、Q05/Q05b/Q05c(observer)、Q06/G06(draft+最终复核)、Q07(artifact/gate)、Q08/Q08b(提交租约+真实写根)、Q09(store+HTTP route)、Q10(records)、Q11/Q11b(config)、Q12(client)、Q13(needsKey 映射)。 ## 2. 入口与布局 @@ -43,9 +44,9 @@ node --check sansheng/index.js | I02 A 尚书绑 B 拒绝 | 通过(isolation I02) | `bot-taken` 校验,无半绑定 | | I03 B 会话显式 A / 私聊跨项目 | 通过(isolation I03/I03b + ds-bot M-04) | `resolveProjectForCall` 冲突拒绝;`checkDelivery` 覆盖 message_bot 私聊与 rt.deliver | | I04 修改 A 模型不影响 B | 通过(isolation I04 + Q11) | `updateProjectConfig` 先解析全部模型再应用;无效模型零修改,中途失败回滚 runtime 模型 | -| I05 A 记忆不注入 B | 源码级通过 / 真实宿主未验证 | M-05:team 作用域写入、读取、系统提示、autoRecall、memoryUpdate 全部按项目拒绝;无 ds-bot 测试框架,仅语法/静态检查 | -| I06 跨项目自动投递拒绝 | 通过(isolation I05/I06) | governance.checkDelivery + ds-bot delivery 补丁 | -| I07 并行写入与工作根 | 部分通过 | 写租约测试通过;`workDir` 通过 `rt.createBot/updateBot` 落到 Bot;同根并发仍以单写租约为准,未做真实文件系统越界测试 | +| I05 A 记忆不注入 B | 源码级通过 / 真实宿主未验证 | Q04:team/group/target Bot 在 `readScopes`、groupSnapshot、autoRecall、memoryUpdate、writeDenied 前统一走 governance;Main 豁免不能绕过;仍缺 ds-bot 整模块测试/真实宿主验证 | +| I06 跨项目自动投递拒绝 | 通过(isolation I05/I06 + Q02) | governance.checkDelivery 覆盖 broken/missing registry;ds-bot delivery 补丁 | +| I07 并行写入与工作根 | 部分通过 | Q08:真实 `write/edit/apply_patch/shell/pwsh` 等入口按规范化工作根独占,成功/失败 finally 释放;同根单写;未覆盖所有第三方写工具与崩溃后租约自动清理 | ## 4. 门禁与成果 @@ -56,8 +57,8 @@ node --check sansheng/index.js | G03 先 pass 后 reject 最新 reject 生效 | 通过(review-v3 F02/G03) | 先取最新判决再审摘要 | | G04 reject→pass;旧摘要不能复活 | 通过(review-v3) | 最新判决 + 摘要/成果/代次校验 | | G05 B 证据不能批准 A | 通过(isolation I03b) | 项目身份与 projectId 绑定 | -| G06 检查后变更并发改判 | 部分通过 | guard 在最终变更入口同步复核;无真实并发宿主测试 | -| G07 状态损坏不放行 | 通过(gate-install G07) | registry 提示 + `state-unavailable` | +| G06 检查后变更并发改判 | 通过(新增 observer 最终复核测试;真实并发宿主未测) | Q06:draft 落盘后才发布;guard 打标后 observer 在 `next()` 前用最新 reviews/成果重判;仍非完整 TOCTOU 证明 | +| G07 状态损坏不放行 | 通过(gate-install G07 + Q01/Q02) | Q01:null/[]/错误版本/坏条目/空主状态均 broken 且保留 registry;Q02:治理服务拒绝已知受治理主体 | | A01 改已跟踪文件 | 通过(artifact/review-v3) | git diff digest | | A02 新增未跟踪交付文件 | 通过(artifact/review-v3) | untracked manifest | | A03 改验收标准/任务范围 | 通过(review-v3) | reviewSubjectDigest | @@ -71,7 +72,7 @@ node --check sansheng/index.js | R01 业务拒绝字符串不记 confirmed | 通过(dispatch-v2 R01) | 比较目标 revision/id 前后快照 | | R02 同 requestId 同 payload 不重发 | 通过(dispatch-v2 R02) | `beginDispatch` 幂等 + payloadDigest | | R03 回执丢失重启 | 通过(dispatch-v2 R03) | prepared/in_flight → unknown,不盲目重发 | -| R04 intent/结果保存失败 | 通过(dispatch-v2 R04) | 事务克隆回滚 | +| R04 intent/结果保存失败 | 通过(dispatch-v2 R04 + Q05) | begin/mark 失败 nativeCalls=0;原生已执行但回执失败标 unknown,不自动重发 | | R05 返工与原生 @ 只执行一次 | 通过(dispatch-v2 R05) | 稳定 requestId + addRework 去重 | | R06 返工上限跨重启 | 通过(records/gate) | budgetOf 取原生累计与本地记录最大值 | | R07 暂停/取消/刷新 | 部分通过 | `sansheng_control`/route 调 `rt.goalControl`;停止请求与已停止分开显示;未做宿主 E2E | @@ -85,13 +86,31 @@ node --check sansheng/index.js | E03 双项目并行 | 未执行 | 自动化隔离测试覆盖数据层,不代替真实模型 | | E04 中断恢复 | 未执行 | 单测覆盖故障窗口,真实重启未验证 | -## 7. 发布门核对 +## 7. 审查报告 Q01–Q13 修复证据 + +| 项 | 状态 | 回归/证据 | +| --- | --- | --- | +| Q01 | 已修 | `store.test.js` Q01/Q01b:null/[]/版本 99/projects 类型/坏条目/空主状态均 broken,registry 保留;v2 迁移仍通过 | +| Q02 | 已修 | `isolation.test.js` Q02:broken 后 registry Bot/群拒绝投递与记忆;恢复后放行 | +| Q03 | 已修 | `isolation.test.js` Q03:unknown 对 provision/bind/config/control/reconcile/lease 全部拒绝 | +| Q04 | 源码级已修 | `ds-bot/src/host/memory.js` 统一 groupAllowedFor + targetBotId;governance Q04 测试覆盖 group/target/Main;无 ds-bot 整模块宿主测试 | +| Q05 | 已修 | `dispatch-v2.test.js` Q05/Q05b/Q05c:begin/mark 失败 nativeCalls=0;回执失败 unknown | +| Q06 | 已修 | `store.test.js` Q06 延迟落盘不可见;`records.test.js` Q06/G06 guard 打标后最终复核阻止执行 | +| Q07 | 已修 | `artifact.test.js` missing 不再通过;`gate.test.js` Q07 truncated/missing 拒绝;review 写入前拦截 pass | +| Q08 | 部分修 | `store.test.js` 同根互斥;`dispatch-v2.test.js` Q08b 真实 write 入口互斥;submit finally 释放;未覆盖所有第三方写工具/崩溃清理 | +| Q09 | 已修 | `store.test.js` Q09 + `route.test.js` Q09:跨项目核实 409 且不写事件;事件与状态同事务 | +| Q10 | 已修 | `records.test.js` Q10:重复 draft/start 拒绝,新建/启动确认 | +| Q11 | 已修 | `isolation.test.js` Q11/Q11b:先全量校验、零修改、回滚 | +| Q12 | 已修 | `client.test.js` Q12:跨项目失败清空;切换立即清 loading | +| Q13 | 已修(附加) | route 保留 needsKey,client 禁用未配置凭据模型 | + +## 8. 发布门核对 | 项 | 状态 | | --- | --- | | P1 缺陷关闭且回归可复现 | F01–F08、F10、F11 仓库内修复/回归;F09 旧包不接管主聊天已在旧包临时止血,新方案不注册 main.conversation | | U/I/G/A/R 必选项 | 自动化项通过;U01/U05/U07/U08 的视觉与真实宿主项未验证 | | E01–E04 | 未执行 → 候选状态 | -| 两包依赖/宿主兼容 | 明确:sansheng 0.2.0 + ds-bot 0.3.2(本地补丁 M-01–M-05) | -| 数据保留/升级/回退 | v2→v3 只补字段;旧项目/审查保留;不迁移旧十席数据 | -| 真实截图与 UI 复核 | 缺失,必须由用户测试环境补 | +| 两包依赖/宿主兼容 | 明确:sansheng 0.2.3 + ds-bot 0.3.2-sansheng.3(本地补丁 M-01–M-06) | +| 数据保留/升级/回退 | v2→v3 只补字段;严格 schema 只拒绝损坏文件并保留 registry;不迁移旧十席数据 | +| 真实截图与 UI 复核 | 有测试 profile 浅色截图;真实多项目/深色/窄屏仍缺 | diff --git a/docs/verification/03-host-smoke.md b/docs/verification/03-host-smoke.md index 00d6a65..80de5df 100644 --- a/docs/verification/03-host-smoke.md +++ b/docs/verification/03-host-smoke.md @@ -27,6 +27,7 @@ profile `web-test` 的 bundles:`@deepseek-ai/dsh-base`、`@deepseek-ai/dsh-web | 左侧栏保持宿主项目树 | 安装 M-06 后,DS Bot 不再 shadow `sidebar.workspaces`;左栏显示「工作区 / DS Bot / New Session」项目树,不再换成 Bot 列表 | `evidence/host-project-tree-bot-switch.png` | | Bot 切换在右栏 | 右栏角色卡下方新增折叠「Bot 切换 · 4」,列出丞相/工部/尚书/Chief 与项目群,点击打开对应真实会话 | `evidence/host-project-tree-bot-switch.png` | | 模型切换 | 组件/服务端测试通过;测试 profile 没有 API Key,`/sansheng/state` 的 `models` 为空,角色卡显示「默认模型」,未能真实切换 | `client.test.js`、Q11 测试 | +| v0.2.3 审查修复后重启 | `GET /sansheng/health` 200:store `ok`、`governance:true`、Bot 4 / 群 1;`/sansheng/state` 200,严格 schema 加载既有 v3 状态;左栏项目树/右栏三卡/Bot 切换保持可用 | `evidence/host-v023.png` | HTTP 响应原文(初始空状态): diff --git a/docs/verification/04-release.md b/docs/verification/04-release.md index f3454ff..c8146b4 100644 --- a/docs/verification/04-release.md +++ b/docs/verification/04-release.md @@ -1,4 +1,4 @@ -# 发布说明(候选版本 v0.2.2 / ds-bot 0.3.2-sansheng.2) +# 发布说明(候选版本 v0.2.3 / ds-bot 0.3.2-sansheng.3) 日期:2026-11-14 状态:**候选版本**。可用于隔离测试环境;用户日常 desktop profile 未由实施者修改。 @@ -7,16 +7,24 @@ | 包 | 版本 | 文件 | | --- | --- | --- | -| `dsh-sansheng-sansheng` | 0.2.2 | `dist/dsh-sansheng-sansheng-0.2.2.tgz` | -| `ds-bot`(上游 0.3.2 + M-01–M-06) | 0.3.2-sansheng.2 | `dist/ds-bot-0.3.2-sansheng.2.tgz` | +| `dsh-sansheng-sansheng` | 0.2.3 | `dist/dsh-sansheng-sansheng-0.2.3.tgz` | +| `ds-bot`(上游 0.3.2 + M-01–M-06) | 0.3.2-sansheng.3 | `dist/ds-bot-0.3.2-sansheng.3.tgz` | -云端预发布:`v0.2.2-sansheng`,https://git.qyhhh.top/DeepsSeekHarness/dsh-sansheng-liubu/releases/tag/v0.2.2-sansheng (两个 tarball 已作为 release assets 上传)。 +云端发布:**未执行**。按审查报告“不授权推送或发布”的约束,v0.2.3 只在本地构建了两个 tarball;待用户明确授权后再推送/开 PR/合并/发布。此前 `v0.2.2-sansheng` 仍是在线候选版本。 -### v0.2.2 变更 +### v0.2.3 变更 -- 角色卡模型下拉:`/sansheng/state` 返回可用模型目录,角色卡直接切换本项目该角色模型(无 API Key 时显示默认模型,不伪造可选项)。 -- Q11:模型配置先全部解析校验,再应用;任一无效零修改,中途失败/保存失败回滚 runtime 模型。 -- Q12:项目切换请求按上下文签名缓存,切到 B 后失败不会显示 A 的旧卡片与可操作内容。 +- Q01/Q02:Store 严格校验 v2/v3 schema;错误 JSON/schema/未来版本/空主状态进 broken,保留 registry;governance 对 registry 中的受治理 Bot/群在 broken/missing 时拒绝投递、记忆读写/注入。 +- Q03:用户专属工具改为 `actor.kind === 'user'` 正向允许;unknown 不能 provision/bind/config/control/reconcile/lease。 +- Q04:记忆补丁覆盖显式 recall、默认读取、群快照注入、autoRecall、memoryUpdate、目标 Bot 写入;Main 身份也不能绕过项目归属。 +- Q05:派发意图/ in_flight 落盘失败时停止原生执行;原生已执行但回执失败标 unknown,不宣称成功。 +- Q06/G06:事务在 draft 上落盘,成功后才发布;guard 通过后 observer 在 `next()` 前用最新 reviews/成果复核。 +- Q07:truncated/missing/读取不完整的成果不能用于 stage_pass/goal_pass;缺失目录不再被 verify 当通过。 +- Q08:真实写工具(write/edit/apply_patch/shell/pwsh 等)按规范化工作根独占;提交快照租约成功/失败都释放。 +- Q09:HTTP/tool 核实校验 dispatch.projectId;状态更新与审计事件同一事务。 +- Q10:重复 draft/start 不再把“目标本来就在该状态”记成 confirmed。 +- Q11/Q12:保留 v0.2.2 的模型配置原子性与跨项目缓存隔离;Q12 增加切换时立即清空旧项目可操作数据。 +- Q13:模型目录保留 `needsKey`,未配置凭据的选项禁用并标注。 构建命令(在包目录运行): @@ -37,7 +45,7 @@ node pack --pack-destination ..\dist 2. 停旧包:从 `dsh.profile.bundles` 移除 `dsh-sansheng-liubu-mode`(不要让旧十席与新方案同时注册入口)。 3. 安装两个 tarball: ```powershell - dsh plugin --profile desktop add <绝对路径>\dsh-sansheng-sansheng-0.2.1.tgz <绝对路径>\ds-bot-0.3.2-sansheng.2.tgz + dsh plugin --profile desktop add <绝对路径>\dsh-sansheng-sansheng-0.2.3.tgz <绝对路径>\ds-bot-0.3.2-sansheng.3.tgz ``` 4. 确认 `dsh.profile.bundles` 含 `dsh-sansheng-sansheng` 与 `ds-bot`。 5. 彻底重启 DSH(插件宿主半改动只有重启生效)。 @@ -62,6 +70,9 @@ node pack --pack-destination ..\dist ## 6. 已知限制(必须随版本说明) - 真实模型 E2E(E01–E04)未执行;隔离测试 profile 无 API key。 +- Q04 记忆边界为源码级修复 + governance 回归;没有 ds-bot 整模块/真实宿主注入测试。 +- Q08 只覆盖当前已知写工具(write/edit/apply_patch/shell/pwsh 等);第三方工具若绕过这些入口仍可能不受根租约约束,进程崩溃后的租约只能等过期。 +- 真实模型 E2E(E01–E04)、深色/窄屏、长消息/连续工具流仍缺;不把 144 项单测写成真实 DSH E2E 全通过。 - `workspace-groups-remote` 项目树右键菜单未在真实测试 profile 复现(DS Bot 页面占据左栏);组件级 contextMenus 测试通过。用户日常环境若项目树可见,右键「三省六部」应可用;若不可用,用左栏底部「三省」入口。 - 深色模式、窄屏、长消息/连续工具流未截图验证。 - 项目树适配采用宿主原生 `contextMenus` + `sidebar.footer.action` + 右栏页签;不使用私有 DOM。 diff --git a/docs/verification/05-delivery-note.md b/docs/verification/05-delivery-note.md index 40ac349..baf59a0 100644 --- a/docs/verification/05-delivery-note.md +++ b/docs/verification/05-delivery-note.md @@ -1,4 +1,4 @@ -# 交付记录 +# 交付记录 - 实施提交:`b955513`(feat/dsbot 分支) - 实施分支已推送到 Gitea:`DeepsSeekHarness/dsh-sansheng-liubu` @@ -11,7 +11,10 @@ - 发布:预发布 `v0.2.2-sansheng`,已上传两个可安装 tarball https://git.qyhhh.top/DeepsSeekHarness/dsh-sansheng-liubu/releases/tag/v0.2.2-sansheng - 发布产物:`dist/dsh-sansheng-sansheng-0.2.2.tgz`、`dist/ds-bot-0.3.2-sansheng.2.tgz` +- 审查修复 v0.2.3:本地提交(当前 HEAD)(`dsh-sansheng-sansheng@0.2.3` / `ds-bot@0.3.2-sansheng.3`),144/144 回归;按审查“不授权推送/发布”暂未推 Gitea,tarball 只在 `dist/`。 - 当前状态:候选版本,真实模型 E2E(E01–E04)未执行;日常 desktop profile 未修改。 > 说明:仓库的 `master` 分支仍是旧版结构(工作台/panel 目录),与 `feat/dsbot` 不在同一历史线。 > 本次实施以 `feat/dsbot` 为开发/集成分支,未向 `master` 强推或覆盖旧结构。 + + diff --git a/docs/verification/evidence/host-v023.png b/docs/verification/evidence/host-v023.png new file mode 100644 index 0000000000000000000000000000000000000000..16a3a7bde34606dc2ecfa64dea2a4ba9e1ae3cac GIT binary patch literal 50264 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
K{;H%+CNkE0aB*Q{EaykDK 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
>Y2H)ql1OT~IEBj9W@SAqMG>C<$2)ZIG;cv?M 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 Mx@I~R+IJrPKWsvHNdN!< literal 0 HcmV?d00001 diff --git a/ds-bot/package.json b/ds-bot/package.json index dee81d6..84b5e54 100644 --- a/ds-bot/package.json +++ b/ds-bot/package.json @@ -1,6 +1,6 @@ { "name": "ds-bot", - "version": "0.3.2-sansheng.2", + "version": "0.3.2-sansheng.3", "description": "DS Bot: a team of long-lived Bots for DeepSeek Harness, with Main Bots, Bot-to-Bot messages and group chats", "keywords": [ "dsh-plugin", diff --git a/ds-bot/src/host/memory.js b/ds-bot/src/host/memory.js index 971899d..0de972c 100644 --- a/ds-bot/src/host/memory.js +++ b/ds-bot/src/host/memory.js @@ -88,6 +88,12 @@ export function install(rt) { if (!botId || botId === 'user') return true return sanshengGovernance()?.checkMemoryScope?.({ botId, scope: 'team' })?.allow !== false } + // Q04:群记忆读取、自动召回、群快照注入和更新提示都必须按项目边界过滤, + // 不能只处理 team 域;明确点名的跨项目群记忆返回错误,默认作用域则过滤掉。 + const groupAllowedFor = (botId, roomId) => { + if (!botId || botId === 'user' || !roomId) return true + return sanshengGovernance()?.checkMemoryScope?.({ botId, scope: 'group', roomId })?.allow !== false + } if (config.memory === false) { Object.assign(rt, { @@ -416,7 +422,7 @@ export function install(rt) { // sansheng M-05: a project Bot may not write the team memory, which is shared across // projects. The user (and ids that are not a Bot) keep the upstream rights. if (botId && botId !== 'user') { - const verdict = sanshengGovernance()?.checkMemoryScope?.({ botId, scope: scope.kind, roomId: scope.kind === 'group' ? scope.roomId : undefined }) + const verdict = sanshengGovernance()?.checkMemoryScope?.({ botId, scope: scope.kind, roomId: scope.kind === 'group' ? scope.roomId : undefined, targetBotId: scope.kind === 'bot' ? scope.botId : undefined }) if (verdict && verdict.allow === false) return verdict.reason ?? '项目记忆边界拒绝此操作。' } if (scope.kind === 'team') return writesTeam(botId) ? undefined : 'Only Main Bots and group admins write the team memory. Tell a Main Bot with message_bot what the team should know.' @@ -760,6 +766,7 @@ export function install(rt) { return { text: lines.join('\n'), failed: main.failed !== undefined || ownTopics.failed === true || (teamAllowed && (team.failed !== undefined || teamTopics.failed === true)) } } function groupSection(roomId, bot) { + if (!groupAllowedFor(bot.id, roomId)) return { text: '', failed: false } const group = groupScope(roomId) const groupRead = sectionRead(join(dirOf(group), MAIN)) const groupTopics = sectionTopics(group) @@ -910,7 +917,7 @@ export function install(rt) { try { history = agent.session?.deriveMessages?.() ?? [] } catch { /* nothing to look in */ } const shown = new Set(history.filter(isRecalled).flatMap(message => message.source.ids ?? [])) const own = ownScope(bot.id) - const scopes = [own, ...(roomId === undefined ? [] : [groupScope(roomId)]), ...(teamAllowedFor(bot.id) ? [TEAM] : [])] + const scopes = [own, ...(roomId === undefined || !groupAllowedFor(bot.id, roomId) ? [] : [groupScope(roomId)]), ...(teamAllowedFor(bot.id) ? [TEAM] : [])] let topicEntries try { topicEntries = scopes.flatMap(scope => allEntries(loadScope(scope).slice(1)).map(entry => ({ ...entry, tag: tagOf(scope, bot.id) }))) @@ -959,7 +966,7 @@ export function install(rt) { return undefined } const own = ownScope(bot.id) - const keys = new Set([scopeKey(own), ...(teamAllowedFor(bot.id) ? [scopeKey(TEAM)] : []), ...(roomId === undefined ? [] : [scopeKey(groupScope(roomId))])]) + const keys = new Set([scopeKey(own), ...(teamAllowedFor(bot.id) ? [scopeKey(TEAM)] : []), ...(roomId === undefined || !groupAllowedFor(bot.id, roomId) ? [] : [scopeKey(groupScope(roomId))])]) try { for (const path of new Set([journalPath, journalFor(scopeKey(own), 'read').path])) readTail(path) } catch (error) { @@ -1159,12 +1166,21 @@ export function install(rt) { const verdict = sanshengGovernance()?.checkMemoryScope?.({ botId, scope: 'bot', targetBotId: scope.botId }) if (verdict && verdict.allow === false) return { error: verdict.reason ?? '项目记忆边界拒绝读取其他项目成员记忆。' } } + if (scope && scope.kind === 'group' && botId && botId !== 'user') { + const verdict = sanshengGovernance()?.checkMemoryScope?.({ botId, scope: 'group', roomId: scope.roomId }) + if (verdict && verdict.allow === false) return { error: verdict.reason ?? '项目记忆边界拒绝读取其他项目的群记忆。' } + } let scopes = scope === undefined ? (roomId === undefined ? [ownScope(botId), TEAM] : [ownScope(botId), groupScope(roomId), TEAM]) : [scope] - if (botId && botId !== 'user' && scopes.some(item => item.kind === 'team')) { - const verdict = sanshengGovernance()?.checkMemoryScope?.({ botId, scope: 'team' }) - if (verdict && verdict.allow === false) { - scopes = scopes.filter(item => item.kind !== 'team') - if (scopes.length === 0) return { error: '项目 Bot 不能读取跨项目共享记忆。' } + if (botId && botId !== 'user') { + if (scope === undefined && roomId !== undefined && !groupAllowedFor(botId, roomId)) { + scopes = scopes.filter(item => item.kind !== 'group') + } + if (scopes.some(item => item.kind === 'team')) { + const verdict = sanshengGovernance()?.checkMemoryScope?.({ botId, scope: 'team' }) + if (verdict && verdict.allow === false) { + scopes = scopes.filter(item => item.kind !== 'team') + if (scopes.length === 0) return { error: '项目 Bot 不能读取跨项目共享记忆。' } + } } } if (scope !== undefined && scope.kind === 'bot' && scope.botId !== botId) { diff --git a/sansheng/client.js b/sansheng/client.js index 8df92f2..8320620 100644 --- a/sansheng/client.js +++ b/sansheng/client.js @@ -340,6 +340,11 @@ window.__ModuleLoader__.load({ // 否则从项目树切到 B 后仍会请求 A 的工作区,右栏永远停在旧项目。 const context = workspaceContextOf(ctx) const signature = contextSignature(context) + // 切到另一个项目时立即作废旧项目的可操作数据,避免在新请求 + // 返回前仍显示/点击旧项目卡片。 + if (lastSignature !== null && signature !== lastSignature) { + onChange({ loading: true, error: null, data: null, updatedAt: 0, context }) + } let retryImmediately = false try { if (!fetchImpl) throw new Error('宿主没有 fetch') @@ -358,8 +363,12 @@ window.__ModuleLoader__.load({ onChange({ loading: false, error: null, data, updatedAt: lastUpdatedAt, context }) } catch (error) { if (stopped || isStale(requestId, latestRequestId)) return - // 只有同一项目断连才展示上次数据;切到 B 后失败不能把 A 的卡片 - // 配上 B 的上下文(Q12)。 + // 请求失败时也要重新读取当前 workspace:A 的迟到失败不能配上 + // B 的实际工作区,也不能把 A 的缓存当 B 展示。 + if (contextSignature(workspaceContextOf(ctx)) !== signature) { + retryImmediately = true + return + } const sameProject = signature === lastSignature onChange({ loading: false, @@ -729,7 +738,12 @@ window.__ModuleLoader__.load({ card.model && !modelOptions.some(item => item.ref === card.model) ? h('option', { key: 'current', value: card.model, children: card.model }) : null, - ...modelOptions.map(item => h('option', { key: item.ref, value: item.ref, children: item.name || item.ref })), + ...modelOptions.map(item => h('option', { + key: item.ref, + value: item.ref, + disabled: item.needsKey === true, + children: (item.name || item.ref) + (item.needsKey === true ? '(未配置凭据)' : ''), + })), ].filter(Boolean)) : h('span', { key: 'model', className: 'ss-model-text', children: model }) return h('div', props, [ diff --git a/sansheng/package.json b/sansheng/package.json index c411ce4..2525498 100644 --- a/sansheng/package.json +++ b/sansheng/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-sansheng", - "version": "0.2.2", + "version": "0.2.3", "private": true, "description": "三省六部:在 DS Bot 团队上提供丞相/尚书/工部三角色、目标门禁与审查记录。", "type": "module", diff --git a/sansheng/src/artifact.js b/sansheng/src/artifact.js index daec1c5..691295a 100644 --- a/sansheng/src/artifact.js +++ b/sansheng/src/artifact.js @@ -689,13 +689,18 @@ function verifyCurrent(snapshot, project, current) { current, } } + if (snapshot.truncated === true) { + return { ok: false, reason: '审查依据的成果快照被截断(文件数超过上限),不是完整成果,不能用于验收。', current } + } if (snapshot.kind === 'unscoped') { - // 无工作目录的项目没有可核对的交付物;保持向后兼容。 + // 无工作目录的项目没有可核对的交付物;保持向后兼容,但不声称文件已核实。 return { ok: true, current } } if (snapshot.kind === 'missing') { - if (current.digest === snapshot.digest) return { ok: true, current } - return { ok: false, reason: '成果目录已变化:审查时工作目录不存在,当前状态与审查时不一致。', current } + return { ok: false, reason: '审查时工作目录不存在,不能把“无成果”当成已验收成果。', current } + } + if (current.truncated === true) { + return { ok: false, reason: '当前成果快照被截断(文件数超过上限),不能作为完整交付验收。', current } } if (snapshot.digest !== current.digest) { return { ok: false, reason: '成果已变化:交付文件或提交与审查时不一致。', current } diff --git a/sansheng/src/gate.js b/sansheng/src/gate.js index 003b842..b774c62 100644 --- a/sansheng/src/gate.js +++ b/sansheng/src/gate.js @@ -151,6 +151,12 @@ export function evaluateGoalAction({ if (artifact === undefined || artifact === null) { return deny('artifact-unavailable', '无法读取当前成果快照,不能推进受治理目标。') } + if (artifact.kind === 'missing' || artifact.exists === false) { + return deny('artifact-missing', '当前工作目录不存在或不是目录,不能生成完整成果快照;请恢复工作目录后重新提交/审查。') + } + if (artifact.truncated === true) { + return deny('artifact-truncated', '当前成果快照被截断(文件数超过上限),不是完整成果,不能验收;请缩小交付范围或提高上限后重新提交。') + } if (currentDigest !== review.artifactDigest) { return deny('artifact-changed', '交付成果在审查之后发生了变化(文件、未跟踪交付物或提交不同);旧审查已失效,请重新审查并生成新快照。') } diff --git a/sansheng/src/gates.js b/sansheng/src/gates.js index 5445f65..f7471a4 100644 --- a/sansheng/src/gates.js +++ b/sansheng/src/gates.js @@ -90,6 +90,8 @@ export function installGates({ ctx, store, dsbot, isBotSession }) { projectFreshness: health.status, }) if (!verdict.allow) return `三省六部:${verdict.reason}` + // 给 observer 一个标记:真正执行前还要在异步边界后复核一次最新审批/成果。 + try { exec.__sanshengGate = true } catch { /* 冻结的 exec 对象则跳过最终复核 */ } return undefined } catch (error) { // 校验内部出错时拒绝而不是放行:目标状态比一次调用重要。 diff --git a/sansheng/src/governance.js b/sansheng/src/governance.js index cbeabbb..ad316bf 100644 --- a/sansheng/src/governance.js +++ b/sansheng/src/governance.js @@ -1,63 +1,101 @@ /** * 对外治理服务:ds-bot 的投递与记忆模块在运行时调用。 * 目标是把"项目边界"放在服务端,而不是只靠 prompt 或前端按钮。 + * + * Q02:项目归属解析必须同时看 health 与 registry。主状态损坏/缺失时, + * registry 里记录过的 Bot/群是"已知受治理但当前不可用",必须拒绝,而不是 + * 因空 projects 被误判成非项目 Bot。 */ export function installGovernance({ ctx, store }) { + function statusOfBot(botId) { + const project = store.projectByBot(botId) + if (project) return { kind: 'bound', project } + const hinted = typeof store.registryProjectForBot === 'function' ? store.registryProjectForBot(botId) : undefined + const health = typeof store.health === 'function' ? store.health() : { status: 'ok' } + if (hinted && health.status !== 'ok') return { kind: 'unavailable', projectId: hinted, reason: '治理状态不可用' } + if (hinted && !project) return { kind: 'unavailable', projectId: hinted, reason: 'registry 中有绑定但主状态缺失' } + return { kind: 'unbound' } + } + + function statusOfRoom(roomId) { + if (!roomId) return { kind: 'unbound' } + const project = store.projectByRoom(roomId) + if (project) return { kind: 'bound', project } + const hinted = typeof store.registryProjectForRoom === 'function' ? store.registryProjectForRoom(roomId) : undefined + const health = typeof store.health === 'function' ? store.health() : { status: 'ok' } + if (hinted && health.status !== 'ok') return { kind: 'unavailable', projectId: hinted, reason: '治理状态不可用' } + if (hinted && !project) return { kind: 'unavailable', projectId: hinted, reason: 'registry 中有绑定但主状态缺失' } + return { kind: 'unbound' } + } + + const unavailableReason = (what, state) => + `治理状态不可用(${what} ${state.projectId ?? ''}):${state.reason ?? '主状态损坏或缺失'};为防跨项目泄漏,已拒绝本次操作。` + const api = { version: 3, projectOfBot(botId) { - const project = store.projectByBot(botId) - return project ? { id: project.id, name: project.name } : undefined + const resolved = statusOfBot(botId) + return resolved.kind === 'bound' ? { id: resolved.project.id, name: resolved.project.name } : undefined }, projectOfRoom(roomId) { - const project = store.projectByRoom(roomId) - return project ? { id: project.id, name: project.name } : undefined + const resolved = statusOfRoom(roomId) + return resolved.kind === 'bound' ? { id: resolved.project.id, name: resolved.project.name } : undefined }, /** Bot 间投递(含 rt.deliver 与 message_bot 的私聊路径)的项目检查。 */ checkDelivery({ fromId, toId, roomId } = {}) { - const fromProject = store.projectByBot(fromId) - const toProject = store.projectByBot(toId) - const roomProject = store.projectByRoom(roomId) + const from = statusOfBot(fromId) + const to = statusOfBot(toId) + const room = statusOfRoom(roomId) - if (roomProject) { - if (fromProject && fromProject.id !== roomProject.id) { - return { allow: false, reason: `跨项目投递被拒绝:发送方属于「${fromProject.name}」,群属于「${roomProject.name}」。` } + // Q02:任何已知受治理主体在不可用状态下一律拒绝。 + for (const [label, state] of [['发送方', from], ['接收方', to], ['群', room]]) { + if (state.kind === 'unavailable') return { allow: false, reason: unavailableReason(label, state) } + } + + if (room.kind === 'bound') { + const project = room.project + if (from.kind === 'bound' && from.project.id !== project.id) { + return { allow: false, reason: `跨项目投递被拒绝:发送方属于「${from.project.name}」,群属于「${project.name}」。` } } - if (toProject && toProject.id !== roomProject.id) { - return { allow: false, reason: `跨项目投递被拒绝:接收方属于「${toProject.name}」,群属于「${roomProject.name}」。` } + if (to.kind === 'bound' && to.project.id !== project.id) { + return { allow: false, reason: `跨项目投递被拒绝:接收方属于「${to.project.name}」,群属于「${project.name}」。` } } - if (fromProject && !toProject) { - return { allow: false, reason: `跨项目投递被拒绝:接收方不属于任何项目,不能接收「${fromProject.name}」的项目内容。` } + if (from.kind === 'bound' && to.kind === 'unbound') { + return { allow: false, reason: `跨项目投递被拒绝:接收方不属于任何项目,不能接收「${from.project.name}」的项目内容。` } } return { allow: true } } - if (!fromProject) return { allow: true } - if (!toProject) { - return { allow: false, reason: `跨项目投递被拒绝:「${fromProject.name}」的 Bot 不能给项目外 Bot 发私聊消息。` } + if (from.kind === 'unbound') return { allow: true } + if (to.kind === 'unbound') { + return { allow: false, reason: `跨项目投递被拒绝:「${from.project.name}」的 Bot 不能给项目外 Bot 发私聊消息。` } } - if (toProject.id !== fromProject.id) { - return { allow: false, reason: `跨项目投递被拒绝:「${fromProject.name}」的 Bot 不能给「${toProject.name}」的 Bot 发消息。` } + if (to.project.id !== from.project.id) { + return { allow: false, reason: `跨项目投递被拒绝:「${from.project.name}」的 Bot 不能给「${to.project.name}」的 Bot 发消息。` } } return { allow: true } }, /** 记忆作用域检查:项目 Bot 不读写 team 共享域,也不能读写别的项目群/成员记忆。 */ checkMemoryScope({ botId, scope, roomId, targetBotId } = {}) { if (!botId || botId === 'user') return { allow: true } - const project = store.projectByBot(botId) - if (!project) return { allow: true } + const actor = statusOfBot(botId) + if (actor.kind === 'unavailable') return { allow: false, reason: unavailableReason('Bot', actor) } + if (actor.kind === 'unbound') return { allow: true } + const project = actor.project if (scope === 'team') { return { allow: false, reason: `「${project.name}」的项目 Bot 不读写跨项目共享的 team 记忆;项目事实请存在本项目群记忆或自己的记忆里。` } } if (scope === 'group') { - const roomProject = store.projectByRoom(roomId) - if (!roomProject || roomProject.id !== project.id) { + const room = statusOfRoom(roomId) + if (room.kind === 'unavailable') return { allow: false, reason: unavailableReason('群', room) } + if (room.kind === 'unbound' || room.project.id !== project.id) { return { allow: false, reason: `记忆边界拒绝:「${project.name}」的 Bot 不能读写其他项目的群记忆。` } } } if (scope === 'bot' && targetBotId) { - const targetProject = store.projectByBot(targetBotId) - if (!targetProject || targetProject.id !== project.id) { + const target = statusOfBot(targetBotId) + if (target.kind === 'unavailable') return { allow: false, reason: unavailableReason('目标 Bot', target) } + if (target.kind === 'unbound' || target.project.id !== project.id) { return { allow: false, reason: `记忆边界拒绝:「${project.name}」的 Bot 不能读写其他项目成员的记忆。` } } } diff --git a/sansheng/src/observe.js b/sansheng/src/observe.js index 8f7e7a5..d801404 100644 --- a/sansheng/src/observe.js +++ b/sansheng/src/observe.js @@ -1,10 +1,25 @@ -import { budgetOf } from './gate.js' +import { resolve } from 'node:path' +import { captureArtifactSnapshotSync } from './artifact.js' +import { budgetOf, evaluateGoalAction } from './gate.js' import { resolveActor } from './identity.js' import { classifyGoalOutcome, describeDispatch, detectRework, isGoalMutation, newId, payloadDigestOf, } from './records.js' import { roleOfBot } from './roles.js' +// Q08:这些是 DSH 里真正会改用户项目的工具入口;按实际工作根加独占租约。 +const WRITE_TOOLS = new Set([ + 'write', 'edit', 'apply_patch', 'delete', 'move', 'copy', + 'write_file', 'edit_file', 'delete_file', 'move_file', 'copy_file', + 'shell', 'bash', 'pwsh', 'execute', 'terminal', 'run_terminal', + 'shell_command', 'run_command', 'terminal_command', +]) +let rootWriteSeq = 0 + +function isWriteTool(name) { + return WRITE_TOOLS.has(String(name ?? '')) +} + function textOfResult(result) { if (typeof result === 'string') return result const content = Array.isArray(result?.content) ? result.content : [] @@ -18,7 +33,9 @@ function textOfResult(result) { */ export function installObserver({ ctx, store, dsbot, bootId, isBotSession }) { return ctx.on('tools/execute', async (exec, next) => { - if (!exec || exec.name !== 'group_goal') return next() + if (!exec) return next() + if (isWriteTool(exec.name)) return observeWrite({ store, dsbot, exec, next, isBotSession }) + if (exec.name !== 'group_goal') return next() const action = String(exec.arguments?.action ?? '') if (!isGoalMutation(action)) return next() @@ -69,13 +86,44 @@ export function installObserver({ ctx, store, dsbot, bootId, isBotSession }) { } return record.note ?? `三省六部:请求 ${record.requestId ?? record.id} 已处理过,本次没有重复执行。` } - if (!replay) await store.markDispatchInFlight(record.id) + try { + await store.markDispatchInFlight(record.id) + } catch (error) { + await store.finishDispatch(record.id, { + status: 'unknown', + note: `派发意图已写入,但标记 in_flight 失败:${String(error?.message ?? error)}`, + }).catch(() => {}) + return `三省六部:无法标记派发 ${record.id} 为发送中(${error?.message ?? error}),本次目标修改未执行;请先核实后再重试。` + } } } catch (error) { if (error?.code === 'payload-conflict') throw error + // Q05:项目已识别时,派发意图写入失败必须阻止原生命令执行。 + // 不能“记账失败就继续”,否则执行了却没有可对账的记录。 + if (project) { + return `三省六部:无法写入派发记录(${error?.message ?? error}),本次目标修改未执行;请恢复存储后重试。` + } record = undefined } + // Q06/G06:guard 通过后到真正执行还有异步窗口;若 guard 打过标记, + // 在 next() 前用最新 reviews/artifact 再判一次,防止审批在窗口里被撤销/成果变化。 + if (record && project && exec.__sanshengGate === true) { + try { + const reason = finalGateReason({ store, dsbot, exec, project, roomId, isBotSession }) + if (reason) { + await store.finishDispatch(record.id, { status: 'rejected', note: reason }).catch(() => {}) + return `三省六部:${reason}` + } + } catch (error) { + await store.finishDispatch(record.id, { + status: 'unknown', + note: `最终复核失败:${String(error?.message ?? error)}`, + }).catch(() => {}) + return `三省六部:最终复核失败(${error?.message ?? error}),本次目标修改未执行。` + } + } + let result try { result = await next() @@ -94,12 +142,78 @@ export function installObserver({ ctx, store, dsbot, bootId, isBotSession }) { if (record) { try { await settle({ ctx, store, dsbot, project, record, action, result, before, roomId }) - } catch { /* 记账失败不影响调用 */ } + } catch (error) { + // 原生调用已经返回,但回执写入失败:不能把 in_flight 留成“看似成功”。 + // 尽力改成 unknown,交给 sansheng_reconcile;若存储仍不可用,下次启动对账会处理。 + try { + await store.finishDispatch(record.id, { + status: 'unknown', + note: `原生调用已返回,但派发回执记录失败:${String(error?.message ?? error)}`, + }) + } catch { /* 下次启动 reconcile 会把 prepared/in_flight 标为 unknown */ } + } } return result }) } +async function observeWrite({ store, dsbot, exec, next, isBotSession }) { + const actor = resolveActor({ dsbot, store, sessionId: exec.agent?.id, isBotSession }) + if (actor.kind !== 'bot' || !actor.project || actor.projectConflict) return next() + const project = actor.project + if (!project.workDir) return next() + const root = resolve(project.workDir) + const holder = `${actor.botId}:${exec.id ?? exec.agent?.id ?? 'write'}:${++rootWriteSeq}` + let lease + try { + lease = await store.acquireRootLease(root, { holder, taskId: String(exec.id ?? exec.arguments?.task ?? 'write') }) + } catch (error) { + return `三省六部:无法建立工作根写租约(${error?.message ?? error}),本次文件写未执行。` + } + if (!lease.ok) return `三省六部:${lease.reason} 本次文件写未执行。` + try { + return await next() + } finally { + // 真实执行结束、抛错或取消都释放;进程被杀时最多留到租约过期。 + await store.releaseRootLease(root, holder).catch(() => {}) + } +} + +function finalGateReason({ store, dsbot, exec, project, roomId, isBotSession }) { + const room = dsbot.roomOf(roomId) + const goal = room?.goal + const action = String(exec.arguments?.action ?? '') + const actor = resolveActor({ dsbot, store, sessionId: exec.agent?.id, isBotSession }) + const members = (room?.members ?? []).map(id => ({ + id, + name: dsbot.botOf(id)?.name ?? id, + role: roleOfBot(project, id), + })) + let artifact + if (project.workDir && (action === 'pass' || action === 'complete')) { + artifact = captureArtifactSnapshotSync({ + project, + goal, + stageIndex: action === 'complete' ? null : (goal?.current ?? -1) + 1, + scope: action === 'complete' ? 'goal' : 'stage', + }) + } + const health = typeof store.health === 'function' ? store.health() : { status: 'ok' } + const verdict = evaluateGoalAction({ + action, + actor: { ...actor, role: roleOfBot(project, actor.botId) }, + project, + goal, + reviews: store.peek().reviews, + reworks: store.peek().reworks, + members, + args: exec.arguments ?? {}, + artifact, + projectFreshness: health.status, + }) + return verdict.allow ? undefined : verdict.reason +} + async function settle({ ctx, store, dsbot, project, record, action, result, before, roomId }) { const after = roomId ? dsbot.roomOf(roomId)?.goal : undefined const outcome = classifyGoalOutcome({ action, before, after, result }) diff --git a/sansheng/src/provision.js b/sansheng/src/provision.js index 0870b62..68486ce 100644 --- a/sansheng/src/provision.js +++ b/sansheng/src/provision.js @@ -60,7 +60,7 @@ function checkProjectName(store, name, selfId) { * 账号/工作区只登记,不改宿主项目树;失败只清理本次新建对象。 */ export async function provisionProject({ ctx, store, dsbot, args, actor }) { - if (actor?.kind === 'bot') return { ok: false, text: '只有用户能创建项目;Bot 在现有项目群里工作。' } + if (actor?.kind !== 'user') return { ok: false, text: '只有用户能创建项目;Bot 或身份不明的调用者不能创建项目。' } const rt = ctx.get('dsbot-runtime', false) if (!rt || typeof rt.createBot !== 'function') { return { ok: false, text: '没有找到 DS-Bot 运行时(dsbot-runtime 服务)。请先安装并启用 ds-bot,再重启 DSH;并用带 ctx.provide 的基线补丁(见 docs/p0/README.md)。' } @@ -316,6 +316,13 @@ export async function updateProjectConfig({ ctx, store, args }) { rollback.push(`${ROLE_LABEL[undo.role]}(${undoError?.message ?? undoError})`) } } + if (rollback.length > 0) { + await store.addEvent?.({ + kind: 'config-rollback-failed', + projectId: project.id, + summary: `${ROLE_LABEL[item.role]}更新失败;回滚失败:${rollback.join('、')}`, + }).catch?.(() => {}) + } return { ok: false, text: `更新${ROLE_LABEL[item.role]}模型失败:${error?.message ?? error}。` @@ -357,6 +364,13 @@ export async function updateProjectConfig({ ctx, store, args }) { rollback.push(`${ROLE_LABEL[undo.role]}(${undoError?.message ?? undoError})`) } } + if (rollback.length > 0) { + await store.addEvent?.({ + kind: 'config-rollback-failed', + projectId: project.id, + summary: `保存配置失败;模型回滚失败:${rollback.join('、')}`, + }).catch?.(() => {}) + } return { ok: false, text: `保存配置失败:${error?.message ?? error}。` diff --git a/sansheng/src/records.js b/sansheng/src/records.js index d2ea3a1..6bf646c 100644 --- a/sansheng/src/records.js +++ b/sansheng/src/records.js @@ -57,8 +57,10 @@ export function classifyGoalOutcome({ action, before, after, result }) { const changed = after !== undefined && ( afterId !== beforeId || afterRevision > beforeRevision - || (action === 'draft' && after?.status === 'drafting') - || (action === 'start' && after?.status === 'active') + // Q10:draft 必须是“新建了目标”,start 必须是“从非 active 进入 active”。 + // 目标本来就在 drafting/active 时,重复 draft/start 即使原生返回成功也不能算确认。 + || (action === 'draft' && afterId !== null && afterId !== beforeId) + || (action === 'start' && before?.status !== 'active' && after?.status === 'active') ) if (changed) return { status: 'confirmed', note: null } const text = textOfResult(result) diff --git a/sansheng/src/route.js b/sansheng/src/route.js index 9046ddd..0ad966f 100644 --- a/sansheng/src/route.js +++ b/sansheng/src/route.js @@ -118,6 +118,7 @@ export function installRoute({ ctx, store, dsbot }) { providerName: entry.providerName, model: entry.id, name: entry.name, + needsKey: entry.needsKey === true, })) } } catch { /* 模型目录不可用时仍返回项目状态 */ } @@ -244,10 +245,10 @@ export function installRoute({ ctx, store, dsbot }) { if (!project) return send(res, 404, { ok: false, error: '找不到项目。' }) const verdict = String(body.verdict ?? '') if (verdict !== 'done' && verdict !== 'not-done') return send(res, 400, { ok: false, error: 'verdict 必须是 done 或 not-done。' }) - const result = await store.resolveDispatch(String(body.id ?? ''), verdict, 'user') + const result = await store.resolveDispatch(String(body.id ?? ''), verdict, 'user', project.id, { withEvent: true }) if (!result) return send(res, 404, { ok: false, error: '找不到派发记录。' }) + if (result.wrongProject) return send(res, 409, { ok: false, error: '派发记录不属于该项目。' }) if (!result.changed) return send(res, 409, { ok: false, error: `当前状态 ${result.record.status},不需要核实。` }) - await store.addEvent({ kind: 'reconcile', projectId: project.id, summary: `${body.id} → ${verdict}`, action: result.record.action }) send(res, 200, { ok: true, status: result.record.status }) } catch (error) { send(res, error.statusCode ?? 500, { error: String(error?.message ?? error) }) diff --git a/sansheng/src/store.js b/sansheng/src/store.js index 7d78393..1f5a2ab 100644 --- a/sansheng/src/store.js +++ b/sansheng/src/store.js @@ -35,13 +35,67 @@ function isObject(value) { return value !== null && typeof value === 'object' && !Array.isArray(value) } +function isNonEmptyString(value) { + return typeof value === 'string' && value.trim() !== '' +} + +function projectProblem(project, id) { + if (!isObject(project)) return `项目 ${id} 不是对象` + if (!isNonEmptyString(project.id)) return `项目 ${id} 缺少 id` + if (project.id !== id) return `项目键 ${id} 与 id ${project.id} 不一致` + if (!isNonEmptyString(project.name)) return `项目 ${id} 缺少 name` + if (!isNonEmptyString(project.roomId)) return `项目 ${id} 缺少 roomId` + if (!isObject(project.bots)) return `项目 ${id} 缺少 bots` + for (const role of ROLE_IDS) { + if (!isNonEmptyString(project.bots[role])) return `项目 ${id} 缺少 ${role} Bot` + } + if (new Set(ROLE_IDS.map(role => project.bots[role])).size !== ROLE_IDS.length) { + return `项目 ${id} 的角色 Bot 重复` + } + if (project.workspaceId !== undefined && project.workspaceId !== null && typeof project.workspaceId !== 'string') return `项目 ${id} 的 workspaceId 非法` + if (project.models !== undefined && !isObject(project.models)) return `项目 ${id} 的 models 非法` + if (project.delivery !== undefined && !isObject(project.delivery)) return `项目 ${id} 的 delivery 非法` + return undefined +} + +function arrayProblem(value, name) { + if (!Array.isArray(value)) return `${name} 不是数组` + for (const [index, item] of value.entries()) { + if (!isObject(item)) return `${name}[${index}] 不是对象` + } + return undefined +} + +/** + * Q01:只接受明确支持的 v2/v3 schema。合法 JSON 但 schema 错误一律视为损坏, + * 不能把 null/[]/错误版本/部分非法结构静默回退成“健康空状态”。 + */ +export function validateState(raw) { + if (!isObject(raw)) return { ok: false, error: '状态顶层不是对象' } + if (raw.version !== 2 && raw.version !== 3) return { ok: false, error: `不支持的状态版本 ${String(raw.version)}` } + if (!isObject(raw.projects)) return { ok: false, error: 'projects 不是对象' } + for (const [id, project] of Object.entries(raw.projects)) { + const problem = projectProblem(project, id) + if (problem) return { ok: false, error: problem } + } + for (const name of ['reviews', 'dispatches', 'reworks', 'events']) { + const problem = arrayProblem(raw[name] ?? [], name) + if (problem) return { ok: false, error: problem } + } + if (raw.artifacts !== undefined && !isObject(raw.artifacts)) return { ok: false, error: 'artifacts 不是对象' } + if (raw.leases !== undefined && !isObject(raw.leases)) return { ok: false, error: 'leases 不是对象' } + if (raw.seq !== undefined && !Number.isFinite(raw.seq)) return { ok: false, error: 'seq 不是数字' } + return { ok: true, state: raw } +} + + function normalizeProject(project) { if (!isObject(project)) return undefined return { - schemaVersion: VERSION, submissionSeq: 0, delivery: { include: [], exclude: [] }, ...project, + schemaVersion: VERSION, models: isObject(project.models) ? project.models : {}, bots: isObject(project.bots) ? project.bots : {}, } @@ -137,13 +191,17 @@ export class SanshengStore { async load() { this.#ready ??= (async () => { let projectError + let loadedRaw try { const raw = await readJsonFile(this.#file) if (raw === undefined) { this.#state = emptyState() this.#health = { status: 'missing', path: this.#file, error: null } } else { - this.#state = normalize(raw) + const checked = validateState(raw) + if (!checked.ok) throw new Error(`状态 schema 非法:${checked.error}`) + loadedRaw = checked.state + this.#state = normalize(loadedRaw) this.#health = { status: 'ok', path: this.#file, error: null } } } catch (error) { @@ -164,7 +222,15 @@ export class SanshengStore { } catch { // registry 只是提示文件;读不了时按无提示处理,不影响主状态。 } - if (this.#health.status === 'ok') await this.#writeRegistry().catch(() => {}) + // 主状态合法但为空、registry 仍记录受治理项目:说明主状态被替换/截断, + // 不能当作“项目全都删了”并覆盖最后的治理身份。 + if (this.#health.status === 'ok' + && Object.keys(this.#state.projects).length === 0 + && (Object.keys(this.#registry.rooms ?? {}).length > 0 || Object.keys(this.#registry.bots ?? {}).length > 0)) { + this.#health = { status: 'broken', path: this.#file, error: '主状态为空但 registry 仍记录受治理项目' } + projectError ??= new Error(`状态 schema 非法:${this.#health.error}`) + } + if (this.#health.status === 'ok') await this.#writeRegistry(this.#state).catch(() => {}) if (projectError) throw projectError return this.#state })() @@ -184,44 +250,39 @@ export class SanshengStore { return this.#registry } - async #writeRegistry() { - await writeJsonAtomic(this.#registryFile, registryOf(this.#state)) - this.#registry = registryOf(this.#state) + async #writeRegistry(state = this.#state) { + const registry = registryOf(state) + await writeJsonAtomic(this.#registryFile, registry) + this.#registry = registry } async transact(mutate) { const run = this.#queue.then(async () => { await this.load() - const before = clone(this.#state) + // Q06:在草稿上修改,落盘成功后才发布给同步读取者;任何读都不会看到未提交状态。 + const draft = clone(this.#state) try { - const result = await mutate(this.#state) - if (this.#state.reviews.length > REVIEW_LIMIT) { - this.#state.reviews = this.#state.reviews.slice(-REVIEW_LIMIT) - } - if (this.#state.dispatches.length > DISPATCH_LIMIT) { - this.#state.dispatches = this.#state.dispatches.slice(-DISPATCH_LIMIT) - } - if (this.#state.reworks.length > REWORK_LIMIT) { - this.#state.reworks = this.#state.reworks.slice(-REWORK_LIMIT) - } - if (this.#state.events.length > EVENT_LIMIT) { - this.#state.events = this.#state.events.slice(-EVENT_LIMIT) - } - const artifactIds = Object.keys(this.#state.artifacts) + const result = await mutate(draft) + if (draft.reviews.length > REVIEW_LIMIT) draft.reviews = draft.reviews.slice(-REVIEW_LIMIT) + if (draft.dispatches.length > DISPATCH_LIMIT) draft.dispatches = draft.dispatches.slice(-DISPATCH_LIMIT) + if (draft.reworks.length > REWORK_LIMIT) draft.reworks = draft.reworks.slice(-REWORK_LIMIT) + if (draft.events.length > EVENT_LIMIT) draft.events = draft.events.slice(-EVENT_LIMIT) + const artifactIds = Object.keys(draft.artifacts) if (artifactIds.length > ARTIFACT_LIMIT) { - const keep = new Set(artifactIds.sort((a, b) => (this.#state.artifacts[a].createdAt ?? 0) - (this.#state.artifacts[b].createdAt ?? 0)).slice(-ARTIFACT_LIMIT)) - for (const id of artifactIds) if (!keep.has(id)) delete this.#state.artifacts[id] + const keep = new Set(artifactIds.sort((a, b) => (draft.artifacts[a].createdAt ?? 0) - (draft.artifacts[b].createdAt ?? 0)).slice(-ARTIFACT_LIMIT)) + for (const id of artifactIds) if (!keep.has(id)) delete draft.artifacts[id] } - await writeJsonAtomic(this.#file, this.#state) + await writeJsonAtomic(this.#file, draft) + // 只有主状态落盘成功后才发布;registry 失败不回滚已提交主状态,下次 load 重建。 + this.#state = draft try { - await this.#writeRegistry() + await this.#writeRegistry(draft) } catch { - // registry 失败不改变业务事务结果;下次 load 会重建。 + // registry 是提示文件,主状态已是权威。 } this.#health = { status: 'ok', path: this.#file, error: null } return result } catch (error) { - this.#state = before throw error } }) @@ -269,7 +330,7 @@ export class SanshengStore { return botId ? this.#registry.bots?.[botId] : undefined } - async #validateProject(project) { + async #validateProject(project, state = this.#state) { if (!isObject(project) || typeof project.id !== 'string' || project.id === '') { throw new SanshengStoreError('invalid-project', '项目绑定缺少 id。') } @@ -277,7 +338,7 @@ export class SanshengStore { if (new Set(bots).size !== bots.length) { throw new SanshengStoreError('roles-duplicated', '丞相/尚书/工部必须是三个不同的 Bot。') } - for (const other of Object.values(this.#state.projects)) { + for (const other of Object.values(state.projects)) { if (other.id === project.id) continue if (project.roomId && other.roomId === project.roomId) { throw new SanshengStoreError('room-taken', `群 ${project.roomId} 已绑定项目「${other.name}」。`) @@ -293,7 +354,7 @@ export class SanshengStore { async saveProject(project) { return this.transact(async state => { - await this.#validateProject(project) + await this.#validateProject(project, state) const previous = state.projects[project.id] ?? {} const next = { schemaVersion: VERSION, @@ -315,7 +376,7 @@ export class SanshengStore { const project = state.projects[id] if (!project) throw new SanshengStoreError('not-found', `项目 ${id} 不存在。`) const next = { ...project, ...patch, updatedAt: Date.now() } - await this.#validateProject(next) + await this.#validateProject(next, state) state.projects[id] = next return next }) @@ -449,15 +510,27 @@ export class SanshengStore { } /** 尚书/用户核实一条 unknown 派发:done=确实执行过,not-done=没执行。 */ - async resolveDispatch(id, verdict, by) { + async resolveDispatch(id, verdict, by, projectId, { withEvent = false } = {}) { return this.transact(state => { const record = state.dispatches.find(item => item.id === id) if (!record) return undefined + if (projectId && record.projectId !== projectId) return { record, changed: false, wrongProject: true } if (record.status !== 'unknown') return { record, changed: false } record.status = verdict === 'done' ? 'confirmed' : 'rejected' record.resolvedBy = by record.resolvedAt = Date.now() record.note = verdict === 'done' ? '核实:原生操作已执行。' : '核实:原生操作没有执行。' + if (withEvent) { + state.seq += 1 + state.events.push({ + kind: 'reconcile', + projectId: record.projectId, + summary: `${id} → ${verdict}`, + action: record.action, + seq: state.seq, + at: Date.now(), + }) + } return { record, changed: true } }) } @@ -530,4 +603,47 @@ export class SanshengStore { if (lease.expiresAt <= Date.now()) return undefined return lease } + + /** Q08:真实文件写入口按“规范化工作根”互斥;不同项目指向同一根目录也必须串行。 */ + async acquireRootLease(root, { holder, taskId = null, ttlMs = 30 * 60 * 1000 } = {}) { + const key = rootLeaseKey(root) + if (key === '') throw new SanshengStoreError('invalid-root', '工作目录为空,不能建立写租约。') + return this.transact(state => { + const now = Date.now() + const current = state.leases[key] + if (current && current.expiresAt > now && current.holder !== holder) { + return { + ok: false, + lease: current, + reason: `工作目录正在被 ${current.holder} 写入(任务 ${current.taskId ?? '未命名'}),同一实际路径不能并发写。`, + } + } + const lease = { root: key.slice(5), holder, taskId, acquiredAt: now, expiresAt: now + ttlMs, renewedAt: now } + state.leases[key] = lease + return { ok: true, lease } + }) + } + + async releaseRootLease(root, holder) { + const key = rootLeaseKey(root) + return this.transact(state => { + const current = state.leases[key] + if (!current || current.holder !== holder) return { ok: false, reason: '工作根租约不存在或不属于该持有者。' } + delete state.leases[key] + return { ok: true } + }) + } + + rootLeaseOf(root) { + const current = this.#state.leases?.[rootLeaseKey(root)] + if (!current) return undefined + if (current.expiresAt <= Date.now()) return undefined + return current + } +} + +function rootLeaseKey(root) { + const text = String(root ?? '').trim().replace(/\\/g, '/').replace(/\/+$/, '') + if (text === '') return '' + return `root:${text}`.toLowerCase() } diff --git a/sansheng/src/tools.js b/sansheng/src/tools.js index d8568b1..e4f9e62 100644 --- a/sansheng/src/tools.js +++ b/sansheng/src/tools.js @@ -163,6 +163,9 @@ async function review({ store, dsbot, args, exec }) { if (project.workDir) { try { const snapshot = await captureArtifactSnapshot({ project, goal, stageIndex, scope: 'stage' }) + if (action === 'stage_pass' && (snapshot.truncated || snapshot.kind === 'missing' || (snapshot.kind !== 'unscoped' && snapshot.exists === false))) { + return '当前成果不完整(目录缺失或被截断),不能记录 stage_pass;请恢复完整交付或缩小交付范围后重试。' + } const committed = await store.commitArtifact(project.id, snapshot) artifact = committed.snapshot submissionSeq = committed.submissionSeq @@ -220,6 +223,9 @@ async function review({ store, dsbot, args, exec }) { if (project.workDir) { try { const snapshot = await captureArtifactSnapshot({ project, goal, stageIndex: null, scope: 'goal' }) + if (action === 'goal_pass' && (snapshot.truncated || snapshot.kind === 'missing' || (snapshot.kind !== 'unscoped' && snapshot.exists === false))) { + return '当前成果不完整(目录缺失或被截断),不能记录 goal_pass;请恢复完整交付或缩小交付范围后重试。' + } const committed = await store.commitArtifact(project.id, snapshot) artifact = committed.snapshot submissionSeq = committed.submissionSeq @@ -273,32 +279,37 @@ async function submit({ store, dsbot, args, exec }) { const holder = actor.botId ?? 'user' const lease = await store.acquireLease(project.id, { holder, taskId: args.task ?? null }) if (!lease.ok) return `写入被拒绝:${lease.reason}` - const room = dsbot.roomOf(project.roomId) - const goal = room?.goal - let snapshot try { - snapshot = await captureArtifactSnapshot({ - project, - goal, - stageIndex: args.stage ?? null, - scope: args.scope === 'goal' ? 'goal' : 'stage', - }) - } catch (error) { - return `无法生成成果快照:${error?.message ?? error}` + const room = dsbot.roomOf(project.roomId) + const goal = room?.goal + let snapshot + try { + snapshot = await captureArtifactSnapshot({ + project, + goal, + stageIndex: args.stage ?? null, + scope: args.scope === 'goal' ? 'goal' : 'stage', + }) + } catch (error) { + return `无法生成成果快照:${error?.message ?? error}` + } + const committed = await store.commitArtifact(project.id, snapshot) + const summary = summarizeSnapshot(committed.snapshot) + return [ + `已提交成果快照 ${committed.snapshot.id}(代次 ${committed.submissionSeq})。`, + `类型=${summary.kind},文件=${summary.fileCount},总量=${summary.totalBytes} 字节${summary.truncated ? '(已截断,超过上限)' : ''}。`, + `摘要=${summary.digest}`, + '后续 sansheng_review 会自动绑定本次提交;审查后如成果再变化,旧审批会失效。', + ].join('\n') + } finally { + // 写租约只覆盖这次实际提交;成功/失败都释放,不能被一次提交永久占住。 + await store.releaseLease(project.id, holder).catch(() => {}) } - const committed = await store.commitArtifact(project.id, snapshot) - const summary = summarizeSnapshot(committed.snapshot) - return [ - `已提交成果快照 ${committed.snapshot.id}(代次 ${committed.submissionSeq})。`, - `类型=${summary.kind},文件=${summary.fileCount},总量=${summary.totalBytes} 字节${summary.truncated ? '(已截断,超过上限)' : ''}。`, - `摘要=${summary.digest}`, - '后续 sansheng_review 会自动绑定本次提交;审查后如成果再变化,旧审批会失效。', - ].join('\n') } async function config({ ctx, store, dsbot, args, exec }) { const actor = resolveActor({ dsbot, store, sessionId: exec.agent?.id, isBotSession: exec.__isBotSession }) - if (actor.kind === 'bot') return '模型/配置只能由用户修改;Bot 不能改项目配置。' + if (actor.kind !== 'user') return '模型/配置只能由用户修改;Bot 或身份不明的调用者不能改项目配置。' const resolved = resolveProjectForCall({ store, actor, args }) if (resolved.error) return resolved.error const result = await updateProjectConfig({ ctx, store, args: { ...args, projectId: resolved.project.id } }) @@ -307,7 +318,7 @@ async function config({ ctx, store, dsbot, args, exec }) { async function control({ ctx, store, dsbot, args, exec }) { const actor = resolveActor({ dsbot, store, sessionId: exec.agent?.id, isBotSession: exec.__isBotSession }) - if (actor.kind === 'bot') return '暂停/恢复/停止由用户在 UI 操作;Bot 用 group_goal pause/resume/stop 并按角色权限执行。' + if (actor.kind !== 'user') return '暂停/恢复/停止只能由用户操作;Bot 用 group_goal pause/resume/stop 并按角色权限执行。' const resolved = resolveProjectForCall({ store, actor, args }) if (resolved.error) return resolved.error const project = resolved.project @@ -380,10 +391,10 @@ async function reconcile({ store, dsbot, args, exec }) { } const verdict = String(args.verdict ?? '').trim() if (verdict !== 'done' && verdict !== 'not-done') return 'verdict 必须是 done(确实执行过)或 not-done(没有执行)。' - const result = await store.resolveDispatch(id, verdict, actor.botId ?? 'user') + const result = await store.resolveDispatch(id, verdict, actor.botId ?? 'user', project?.id, { withEvent: true }) if (!result) return `找不到派发记录 ${id}。` + if (result.wrongProject) return `派发 ${id} 不属于当前项目 ${project?.id ?? ''},不能跨项目核实。` if (!result.changed) return `派发 ${id} 当前是 ${result.record.status},不需要核实。` - await store.addEvent({ kind: 'reconcile', projectId: record.projectId, summary: `${id} → ${verdict}`, action: record.action }) return verdict === 'done' ? `已核实 ${id}:原生操作确实执行过,记录改为已确认。` : `已核实 ${id}:原生操作没有执行,记录改为被拒绝;需要时再重新发起。` @@ -445,7 +456,7 @@ export function installTools({ ctx, store, dsbot, isBotSession }) { }, async (args, exec) => { const actor = resolveActor({ dsbot, store, sessionId: exec.agent?.id, isBotSession }) - if (actor.kind === 'bot') return '只有用户能把群绑定为项目;Bot 不能改项目绑定。' + if (actor.kind !== 'user') return '只有用户能把群绑定为项目;Bot 或身份不明的调用者不能改项目绑定。' const result = await bindProject({ store, dsbot, rt: ctx.get('dsbot-runtime', false), args }) return result.text }), diff --git a/sansheng/test/artifact.test.js b/sansheng/test/artifact.test.js index ea454a6..a90f1ce 100644 --- a/sansheng/test/artifact.test.js +++ b/sansheng/test/artifact.test.js @@ -252,8 +252,9 @@ test('workDir 为空/不存在:unscoped 与 missing 同类通过、跨类失 assert.equal(captureArtifactSnapshotSync({ project: missingProject, goal, stageIndex: 1 }).digest, missing.digest) assert.equal((await verifyArtifactSnapshot({ snapshot: unscoped, project: unscopedProject })).ok, true) - assert.equal((await verifyArtifactSnapshot({ snapshot: missing, project: missingProject })).ok, true) - assert.equal(verifyArtifactSnapshotSync({ snapshot: missing, project: missingProject }).ok, true) + // Q07:missing 不是“完整成果”,不能拿同摘要的空快照通过验收。 + assert.equal((await verifyArtifactSnapshot({ snapshot: missing, project: missingProject })).ok, false) + assert.equal(verifyArtifactSnapshotSync({ snapshot: missing, project: missingProject }).ok, false) const missingAgainstUnscoped = await verifyArtifactSnapshot({ snapshot: missing, project: unscopedProject }) assert.equal(missingAgainstUnscoped.ok, false) diff --git a/sansheng/test/dispatch-v2.test.js b/sansheng/test/dispatch-v2.test.js index 4b2f6d3..afe16db 100644 --- a/sansheng/test/dispatch-v2.test.js +++ b/sansheng/test/dispatch-v2.test.js @@ -170,3 +170,95 @@ test('R04:事务失败回滚内存状态,不留下虚假成功', async () => await cleanup() } }) + +test('Q05:派发意图写入失败时阻止原生执行,不留下“执行了但没记录”', async () => { + const { store, cleanup } = await tempStore() + try { + await store.saveProject(PROJECT) + const { dsbot, ctx } = fakeEnv({ goal: goalAt() }) + installObserver({ ctx, store, dsbot, bootId: newBootId() }) + store.beginDispatch = async () => { throw new Error('磁盘写失败') } + let called = false + const result = await ctx.handlers['tools/execute'](exec, async () => { called = true; return { content: [] } }) + assert.equal(called, false, '记账失败必须停止原生命令') + assert.match(String(result), /无法写入派发记录/) + assert.equal(store.peek().dispatches.length, 0) + } finally { + await cleanup() + } +}) + +test('Q05b:markInFlight 失败时也阻止原生执行,并把记录标为 unknown', async () => { + const { store, cleanup } = await tempStore() + try { + await store.saveProject(PROJECT) + const { dsbot, ctx } = fakeEnv({ goal: goalAt() }) + installObserver({ ctx, store, dsbot, bootId: newBootId() }) + store.markDispatchInFlight = async () => { throw new Error('状态写失败') } + let called = false + const result = await ctx.handlers['tools/execute'](exec, async () => { called = true; return { content: [] } }) + assert.equal(called, false) + assert.match(String(result), /本次目标修改未执行/) + assert.equal(store.peek().dispatches.at(-1).status, 'unknown') + } finally { + await cleanup() + } +}) + +test('Q08b:真实文件写入口按工作根互斥,执行结束释放', async () => { + const { store, cleanup } = await tempStore() + try { + await store.saveProject({ ...PROJECT, workDir: 'C:/work/shared-root' }) + const { dsbot, ctx } = fakeEnv({ goal: goalAt() }) + installObserver({ ctx, store, dsbot, bootId: newBootId() }) + let release + const gate = new Promise(resolve => { release = resolve }) + let firstCalled = false + let secondCalled = false + const first = ctx.handlers['tools/execute']( + { name: 'write', id: 'call-1', arguments: { path: 'a.txt' }, agent: { id: 'sess-shang' } }, + async () => { firstCalled = true; await gate; return 'written' }, + ) + await new Promise(resolve => setTimeout(resolve, 5)) + const second = await ctx.handlers['tools/execute']( + { name: 'write', id: 'call-2', arguments: { path: 'b.txt' }, agent: { id: 'sess-shang' } }, + async () => { secondCalled = true; return 'written' }, + ) + assert.equal(secondCalled, false, '同一工作根并发写必须被拒绝') + assert.match(String(second), /同一实际路径不能并发写/) + release() + assert.equal(await first, 'written') + assert.equal(firstCalled, true) + assert.equal(store.rootLeaseOf('C:/work/shared-root'), undefined, '写完成后释放根租约') + } finally { + await cleanup() + } +}) + +test('Q05c:原生已执行但回执写入失败时,记录标为 unknown 而不是 confirmed', async () => { + const { store, cleanup } = await tempStore() + try { + await store.saveProject(PROJECT) + const { dsbot, ctx } = fakeEnv({ goal: goalAt() }) + installObserver({ ctx, store, dsbot, bootId: newBootId() }) + const original = store.finishDispatch.bind(store) + let first = true + store.finishDispatch = async (...args) => { + if (first) { first = false; throw new Error('回执写失败') } + return original(...args) + } + let called = false + const result = await ctx.handlers['tools/execute'](exec, async () => { + called = true + dsbot.roomOf().goal = goalAt({ revision: 5, reworks: 1 }) + return { content: [{ type: 'text', text: '已驳回' }] } + }) + assert.equal(called, true) + assert.match(result.content[0].text, /已驳回/) + const record = store.peek().dispatches.at(-1) + assert.equal(record.status, 'unknown') + assert.match(record.note, /回执记录失败/) + } finally { + await cleanup() + } +}) diff --git a/sansheng/test/gate.test.js b/sansheng/test/gate.test.js index 7defd1a..82a7144 100644 --- a/sansheng/test/gate.test.js +++ b/sansheng/test/gate.test.js @@ -239,3 +239,24 @@ test('暂停/停止/修订由尚书放行', () => { assert.equal(result.allow, true, `${action} 应放行`) } }) +import { artifactDigestOf } from '../src/digest.js' + +test('Q07:截断或缺失的成果快照不能用于 pass/complete', () => { + const goal = makeGoal() + const projectWithWork = { ...project, workDir: 'C:/work/example' } + const review = { ...stageReview(goal, 1, 'pass'), artifactDigest: artifactDigestOf({ kind: 'files', digest: 'd', truncated: true, exists: true }) } + const truncated = decide({ + action: 'pass', project: projectWithWork, goal, reviews: [review], + artifact: { kind: 'files', digest: 'd', truncated: true, exists: true }, + }) + assert.equal(truncated.allow, false) + assert.equal(truncated.code, 'artifact-truncated') + + const missingReview = { ...stageReview(goal, 1, 'pass'), artifactDigest: artifactDigestOf({ kind: 'missing', digest: 'm' }) } + const missing = decide({ + action: 'pass', project: projectWithWork, goal, reviews: [missingReview], + artifact: { kind: 'missing', digest: 'm', truncated: false, exists: false }, + }) + assert.equal(missing.allow, false) + assert.equal(missing.code, 'artifact-missing') +}) diff --git a/sansheng/test/isolation.test.js b/sansheng/test/isolation.test.js index dc65c35..4185967 100644 --- a/sansheng/test/isolation.test.js +++ b/sansheng/test/isolation.test.js @@ -7,6 +7,7 @@ import { apply } from '../index.js' import { installGovernance } from '../src/governance.js' import { resolveActor } from '../src/identity.js' import { SanshengStore, SanshengStoreError } from '../src/store.js' +import { installTools } from '../src/tools.js' function fakeCtx(services = {}) { const tools = [] @@ -342,3 +343,97 @@ test('Q11b:中途 updateBot 失败时回滚已经修改的模型', async () => await env.cleanup() } }) + +test('Q02:状态损坏时 registry 中的受治理 Bot/群拒绝投递与记忆访问,恢复后放行', async () => { + const { readFile, writeFile } = await import('node:fs/promises') + const env = await setup() + try { + await env.tool('sansheng_provision').execute({ project: '项目A', workDir: 'C:/work/a' }, userExec) + await env.reload() + const project = Object.values(env.store.peek().projects)[0] + const good = await readFile(env.statePath, 'utf8') + await writeFile(env.statePath, '{broken', 'utf8') + const broken = new SanshengStore(env.statePath) + await assert.rejects(() => broken.load()) + const governance = installGovernance({ ctx: fakeCtx(), store: broken }) + assert.equal(governance.checkDelivery({ fromId: project.bots.lead, toId: project.bots.shangshu, roomId: project.roomId }).allow, false) + assert.equal(governance.checkMemoryScope({ botId: project.bots.lead, scope: 'team' }).allow, false) + assert.equal(governance.checkMemoryScope({ botId: project.bots.lead, scope: 'group', roomId: project.roomId }).allow, false) + assert.equal(governance.checkMemoryScope({ botId: project.bots.lead, scope: 'bot', targetBotId: project.bots.gongbu }).allow, false) + + await writeFile(env.statePath, good, 'utf8') + const restored = new SanshengStore(env.statePath) + await restored.load() + const healthy = installGovernance({ ctx: fakeCtx(), store: restored }) + assert.equal(healthy.checkDelivery({ fromId: project.bots.lead, toId: project.bots.shangshu, roomId: project.roomId }).allow, true) + assert.equal(healthy.checkMemoryScope({ botId: project.bots.lead, scope: 'team' }).allow, false) + assert.equal(healthy.checkMemoryScope({ botId: project.bots.lead, scope: 'group', roomId: project.roomId }).allow, true) + } finally { + await env.cleanup() + } +}) + +test('Q03:unknown 身份不能调用用户专属工具(provision/bind/config/control)', async () => { + const { mkdtemp } = await import('node:fs/promises') + const dir = await mkdtemp(join(tmpdir(), 'sansheng-q03-')) + const store = new SanshengStore(join(dir, 'state.json')) + await store.load() + const defs = [] + const ctx = { + tools: { register(def) { defs.push(def); return () => {} } }, + get() { return undefined }, + } + const dsbot = { + selfOf: () => undefined, + botOf: () => undefined, + isMain: () => false, + snapshot: () => ({ rooms: {}, bots: {} }), + roomOf: () => undefined, + } + installTools({ ctx, store, dsbot, isBotSession: id => id === 'bot-session' }) + const exec = { agent: { id: 'bot-session' } } + const run = (name, args) => defs.find(def => def.name === name).execute(args, exec) + assert.match(await run('sansheng_bind', { room: 'x' }), /只有用户/) + assert.match(await run('sansheng_provision', { project: 'x' }), /只有用户/) + assert.match(await run('sansheng_config', { project: 'x' }), /只有用户|身份不明/) + assert.match(await run('sansheng_control', { project: 'x', action: 'pause' }), /只能由用户/) + assert.match(await run('sansheng_reconcile', { id: 'dsp-x', verdict: 'done' }), /找不到对应身份|当前 DS Bot 状态/) + assert.match(await run('sansheng_lease', { project: 'x', action: 'acquire' }), /找不到对应身份|当前 DS Bot 状态/) + await rm(dir, { recursive: true, force: true }) +}) + +test('Q08:提交成果使用写租约并在成功/失败后释放', async () => { + const env = await setup() + try { + await env.tool('sansheng_provision').execute({ project: '项目A', workDir: 'C:/work/a' }, userExec) + await env.reload() + const project = Object.values(env.store.peek().projects)[0] + const submitted = await env.tool('sansheng_submit').execute({ project: project.id, task: 't1' }, userExec) + assert.match(submitted, /已提交成果快照/) + assert.equal(env.store.leaseOf(project.id), undefined, '提交完成后必须释放租约') + } finally { + await env.cleanup() + } +}) + +test('Q04:记忆作用域过滤覆盖群与目标 Bot,Main 身份不能绕过项目归属', async () => { + const env = await setup() + try { + await env.tool('sansheng_provision').execute({ project: '项目A', workDir: 'C:/work/a' }, userExec) + await env.tool('sansheng_provision').execute({ project: '项目B', workDir: 'C:/work/b' }, userExec) + await env.reload() + const projects = Object.values(env.store.peek().projects) + const a = projects.find(project => project.name === '项目A') + const b = projects.find(project => project.name === '项目B') + const governance = installGovernance({ ctx: fakeCtx(), store: env.store }) + assert.equal(governance.checkMemoryScope({ botId: a.bots.lead, scope: 'group', roomId: b.roomId }).allow, false) + assert.equal(governance.checkMemoryScope({ botId: a.bots.lead, scope: 'bot', targetBotId: b.bots.lead }).allow, false) + assert.equal(governance.checkMemoryScope({ botId: a.bots.lead, scope: 'bot', targetBotId: a.bots.lead }).allow, true) + assert.equal(governance.checkMemoryScope({ botId: a.bots.lead, scope: 'group', roomId: a.roomId }).allow, true) + // 即使 actor 是 Main,也先按项目归属拒绝(记忆补丁在 Main 豁免之前调用治理)。 + env.rt.isMain = () => true + assert.equal(governance.checkMemoryScope({ botId: a.bots.lead, scope: 'bot', targetBotId: b.bots.lead }).allow, false) + } finally { + await env.cleanup() + } +}) diff --git a/sansheng/test/records.test.js b/sansheng/test/records.test.js index ffbb474..e6e2593 100644 --- a/sansheng/test/records.test.js +++ b/sansheng/test/records.test.js @@ -5,7 +5,7 @@ import { join } from 'node:path' import { test } from 'node:test' import { evaluateGoalAction } from '../src/gate.js' import { installObserver } from '../src/observe.js' -import { detectRework, isGoalMutation, newBootId, newId } from '../src/records.js' +import { classifyGoalOutcome, detectRework, isGoalMutation, newBootId, newId } from '../src/records.js' import { SanshengStore } from '../src/store.js' async function tempStore() { @@ -233,3 +233,59 @@ test('跨项目隔离:别的项目的 Bot 不能改本项目的目标', () => assert.equal(verdict.allow, false) assert.equal(verdict.code, 'not-member') }) + +test('Q10:重复 draft/start 即使原生返回成功也不记 confirmed', () => { + const before = goalAt({ revision: 4, status: 'active' }) + const startAgain = classifyGoalOutcome({ + action: 'start', + before, + after: { ...before }, + result: { content: [{ type: 'text', text: '目标已启动' }] }, + }) + assert.equal(startAgain.status, 'rejected') + assert.match(startAgain.note, /目标已启动/) + + const drafting = { ...before, id: 'goal-draft', status: 'drafting' } + const draftAgain = classifyGoalOutcome({ + action: 'draft', + before: drafting, + after: { ...drafting }, + result: { content: [{ type: 'text', text: '已起草' }] }, + }) + assert.equal(draftAgain.status, 'rejected') + + const draftNew = classifyGoalOutcome({ + action: 'draft', + before: undefined, + after: drafting, + result: { content: [{ type: 'text', text: '已起草' }] }, + }) + assert.equal(draftNew.status, 'confirmed') + + const startFresh = classifyGoalOutcome({ + action: 'start', + before: { ...before, status: 'drafting' }, + after: before, + result: { content: [{ type: 'text', text: '已启动' }] }, + }) + assert.equal(startFresh.status, 'confirmed') +}) + +test('Q06/G06:guard 通过后、执行前复核最新审批,失效则停止原生调用', async () => { + const { store, cleanup } = await tempStore() + try { + await store.saveProject(PROJECT) + const { dsbot, ctx } = fakeEnv() + installObserver({ ctx, store, dsbot, bootId: newBootId(), isBotSession: () => true }) + let called = false + const result = await ctx.handlers['tools/execute']( + { name: 'group_goal', arguments: { action: 'pass', evidence: 'e' }, agent: { id: 'sess-shang' }, __sanshengGate: true }, + async () => { called = true; return { content: [{ type: 'text', text: '已通过' }] } }, + ) + assert.equal(called, false, '审批失效时必须停止执行') + assert.match(String(result), /sansheng_review|no-stage-review/) + assert.equal(store.peek().dispatches.at(-1).status, 'rejected') + } finally { + await cleanup() + } +}) diff --git a/sansheng/test/route.test.js b/sansheng/test/route.test.js index d67611b..b908394 100644 --- a/sansheng/test/route.test.js +++ b/sansheng/test/route.test.js @@ -124,3 +124,39 @@ test('POST /sansheng/project/resolve 按 workspaceId 找项目,找不到返回 await route.handler(makeReq({ workspaceId: 'ws-2' }), missing) assert.equal(JSON.parse(missing.body).missing, true) }) +import { mkdtemp, rm } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { SanshengStore } from '../src/store.js' + +test('Q09:HTTP 核实拒绝 projectId 与派发所属项目不一致', async () => { + const dir = await mkdtemp(join(tmpdir(), 'sansheng-route-')) + try { + const store = new SanshengStore(join(dir, 'state.json')) + await store.load() + const project = { + id: 'prj-a', name: 'A', workspaceId: 'ws-a', roomId: 'room-a', + bots: { lead: 'a-lead', shangshu: 'a-shang', gongbu: 'a-gong' }, maxReworks: 3, + } + await store.saveProject(project) + await store.beginDispatch({ id: 'dsp-b', projectId: 'prj-b', action: 'pass' }) + await store.reconcileDispatches('boot-route') + + const web = { register() { return () => {} } } + const routes = routesOf(web) + installRoute({ ctx: fakeCtx(web), store, dsbot: { botOf: () => undefined, roomOf: () => undefined } }) + const route = routes.find(item => item.path === '/sansheng/reconcile') + const res = fakeRes() + await route.handler({ + method: 'POST', + on(event, handler) { + if (event === 'data') handler(Buffer.from(JSON.stringify({ projectId: 'prj-a', id: 'dsp-b', verdict: 'done' }))) + if (event === 'end') handler() + }, + }, res) + assert.equal(res.statusCode, 409) + assert.equal(store.peek().dispatches.find(item => item.id === 'dsp-b').status, 'unknown') + } finally { + await rm(dir, { recursive: true, force: true }) + } +}) diff --git a/sansheng/test/store.test.js b/sansheng/test/store.test.js index 468bb49..b8e781f 100644 --- a/sansheng/test/store.test.js +++ b/sansheng/test/store.test.js @@ -114,3 +114,119 @@ test('状态文件损坏时 load 明确报错而不是静默清空', async () => await rm(dir, { recursive: true, force: true }) } }) + +test('Q01:合法 JSON 的错误 schema 不被当成健康空状态,registry 不被覆盖', async () => { + const { readFile, writeFile } = await import('node:fs/promises') + const dir = await mkdtemp(join(tmpdir(), 'sansheng-store-')) + try { + const file = join(dir, 'state.json') + const seed = new SanshengStore(file) + await seed.load() + await seed.saveProject({ ...project }) + const registryBefore = await readFile(join(dir, 'registry.json'), 'utf8') + const payloads = [ + 'null', + '[]', + JSON.stringify({ version: 99, projects: {}, reviews: [], dispatches: [], reworks: [], events: [] }), + JSON.stringify({ version: 3, projects: [], reviews: [], dispatches: [], reworks: [], events: [] }), + JSON.stringify({ version: 3, projects: { 'prj-1': { ...project, bots: { lead: 'only-one' } } }, reviews: [], dispatches: [], reworks: [], events: [] }), + ] + for (const payload of payloads) { + await writeFile(file, payload, 'utf8') + const store = new SanshengStore(file) + await assert.rejects(() => store.load(), /schema 非法/) + assert.equal(store.health().status, 'broken') + assert.equal(store.registryProjectForRoom('room-1'), 'prj-1', '错误 schema 不得覆盖既有 registry') + assert.equal(await readFile(join(dir, 'registry.json'), 'utf8'), registryBefore) + } + // 主状态为空但 registry 仍记录项目,也不能当作健康空状态。 + await writeFile(file, JSON.stringify({ version: 3, seq: 0, projects: {}, reviews: [], dispatches: [], reworks: [], artifacts: {}, leases: {}, events: [] }), 'utf8') + const empty = new SanshengStore(file) + await assert.rejects(() => empty.load(), /registry 仍记录/) + assert.equal(empty.health().status, 'broken') + assert.equal(empty.registryProjectForBot('b-lead'), 'prj-1') + } finally { + await rm(dir, { recursive: true, force: true }) + } +}) + +test('Q06:事务在落盘前对同步读取不可见', async () => { + const dir = await mkdtemp(join(tmpdir(), 'sansheng-store-')) + try { + const store = new SanshengStore(join(dir, 'state.json')) + await store.load() + await store.saveProject({ ...project }) + let released + const gate = new Promise(resolve => { released = resolve }) + const running = store.transact(async state => { + state.projects['prj-1'].name = '未提交草稿' + await gate + return 'ok' + }) + await new Promise(resolve => setTimeout(resolve, 10)) + assert.equal(store.projectById('prj-1').name, '示例项目', '事务中的草稿不应被读到') + released() + assert.equal(await running, 'ok') + assert.equal(store.projectById('prj-1').name, '未提交草稿') + } finally { + await rm(dir, { recursive: true, force: true }) + } +}) + +test('Q09:核实派发必须校验 projectId,不能跨项目改状态', async () => { + const dir = await mkdtemp(join(tmpdir(), 'sansheng-store-')) + try { + const store = new SanshengStore(join(dir, 'state.json')) + await store.load() + await store.saveProject({ ...project }) + await store.beginDispatch({ id: 'dsp-q09', projectId: 'prj-1', action: 'pass' }) + await store.reconcileDispatches('boot-q09') + const wrong = await store.resolveDispatch('dsp-q09', 'done', 'user', 'prj-other') + assert.equal(wrong.wrongProject, true) + assert.equal(store.peek().dispatches.find(item => item.id === 'dsp-q09').status, 'unknown') + const right = await store.resolveDispatch('dsp-q09', 'done', 'user', 'prj-1', { withEvent: true }) + assert.equal(right.changed, true) + assert.equal(right.record.status, 'confirmed') + const reconcileEvents = store.peek().events.filter(item => item.kind === 'reconcile') + assert.equal(reconcileEvents.length, 1, '核实事件与状态更新同一事务写入') + assert.equal(reconcileEvents[0].projectId, 'prj-1') + } finally { + await rm(dir, { recursive: true, force: true }) + } +}) + +test('Q01b:主状态缺失但 registry 仍在时 health=missing 且保留治理身份', async () => { + const { rm } = await import('node:fs/promises') + const dir = await mkdtemp(join(tmpdir(), 'sansheng-store-')) + try { + const file = join(dir, 'state.json') + const seed = new SanshengStore(file) + await seed.load() + await seed.saveProject({ ...project }) + await rm(file) + const store = new SanshengStore(file) + await store.load() + assert.equal(store.health().status, 'missing') + assert.equal(store.registryProjectForRoom('room-1'), 'prj-1') + assert.equal(store.registryProjectForBot('b-lead'), 'prj-1') + } finally { + await rm(dir, { recursive: true, force: true }) + } +}) + +test('Q08:不同项目指向同一工作根也共享独占租约', async () => { + const dir = await mkdtemp(join(tmpdir(), 'sansheng-store-')) + try { + const store = new SanshengStore(join(dir, 'state.json')) + await store.load() + const first = await store.acquireRootLease('C:\\work\\shared', { holder: 'a', taskId: 't1' }) + assert.equal(first.ok, true) + const second = await store.acquireRootLease('C:/work/shared/', { holder: 'b', taskId: 't2' }) + assert.equal(second.ok, false) + assert.match(second.reason, /同一实际路径不能并发写/) + assert.equal((await store.releaseRootLease('C:\\work\\shared', 'a')).ok, true) + assert.equal(store.rootLeaseOf('C:/work/shared'), undefined) + } finally { + await rm(dir, { recursive: true, force: true }) + } +})