@mingmaple/dsh-handover 0.9.14 → 0.9.22

package/scripts/e2e-migration.mjs

@@ -15,7 +15,7 @@ const argIdx = process.argv.indexOf('--dist');
 const dist = argIdx !== -1 ? path.resolve(process.argv[argIdx + 1]) : path.join(repo, 'dist');
 
 const imp = (rel) => import(pathToFileURL(path.join(dist, rel)).href);
-const { pmPackTool } = await imp('tools/ho_pack.mjs');
+const { pmBackupTool } = await imp('tools/ho_backup.mjs');
 const { resolveConfig } = await imp('lib/config.mjs');
 
 const fails = [];
@@ -47,7 +47,7 @@ const env = {
   selfId: () => null,
   selfCwd: () => null,
 };
-const packTool = pmPackTool(env);
+const packTool = pmBackupTool(env);
 /** action 分流：pack／verify／restore 都走同一个工具（合并口径）。 */
 const run = (args) => packTool.execute(args, null);
 

package/scripts/office.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * 命令行查在任登记表：`node scripts/office.mjs 全局 全局3 Mingent`
+ * 命令行查在任登记表：`node scripts/office.mjs 全局 全局3 Demo1`
  *
  * 与工具 ho_office 同一份实现、同一份记录（_Control_Center/records/Office.json），
  * 区别只是不起会话也能查。工作区根按 --root → DSH_OFFICE_ROOT → 从 cwd 向上找 _Control_Center 的顺序解析。
@@ -32,14 +32,14 @@ for (let i = 0; i < argv.length; i++) {
   if (a === '--all' || a === '-a') { all = true; continue; }
   if (a === '-h' || a === '--help') {
     console.log('用法：node scripts/office.mjs [查询…] [--all] [--json] [--root <工作区根>]');
-    console.log('示例：node scripts/office.mjs 全局 全局3 Mingent');
+    console.log('示例：node scripts/office.mjs 全局 全局3 Demo1');
     process.exit(0);
   }
   queries.push(a);
 }
 if (!root) root = walkUp(process.cwd());
 if (!root) {
-  console.error('找不到工作区根（没有 _Control_Center）：用 --root 指定，例如 --root E:\\_Project_Mate\\_Workspace');
+  console.error('找不到工作区根（没有 _Control_Center）：用 --root 指定，例如 --root <全局根绝对路径>');
   process.exit(2);
 }
 

package/src/client.js

@@ -64,7 +64,6 @@ window.__ModuleLoader__.load({
       document.head.appendChild(tag);
     }
 
-    /** 依次尝试候选地址取状态；全失败时抛出带全部原因的错。 */
     /** 带超时的 fetch（旧通道回退用；没有超时就会永远「读取中」）。 */
     async function fetchWithTimeout(url, opts, ms) {
       const ac = new AbortController();
@@ -76,6 +75,7 @@ window.__ModuleLoader__.load({
       }
     }
 
+    /** 依次尝试候选地址取状态；全失败时抛出带全部原因的错。 */
     async function fetchStatus() {
       const reasons = [];
       for (const url of ENDPOINTS) {
@@ -107,7 +107,7 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * 可折叠表格：先显示 pageSize 行，点「再展开」继续加 pageSize 行。
+     * 可折叠表格：先显示 pageSize 行，点击「再展开」继续追加 pageSize 行。
      * 列宽由 widths 百分比给定（表头固定、不横向滚动）。
      */
     function Folded(props) {
@@ -142,7 +142,7 @@ window.__ModuleLoader__.load({
       return "可用（参数 " + (conn.rpc.call.length || "?") + "）";
     }
 
-    /** 与超时赛跑：宿主 rpc.call 不理会 AbortSignal，光 abort 会让页面永远「读取中」。 */
+    /** 与超时竞速：宿主 rpc.call 不理会 AbortSignal，仅中止请求无法结束等待，页面会停在「读取中」。 */
     function raceTimeout(promise, ms, label) {
       return new Promise((resolve, reject) => {
         const timer = setTimeout(() => reject(new Error(label + " 超时 " + ms + " ms")), ms);
@@ -160,7 +160,7 @@ window.__ModuleLoader__.load({
       // "[object Object]/api" 并报 invalid RPC target。
       const rpcObj = conn && conn.rpc && typeof conn.rpc.call === "function" ? conn.rpc : null;
       if (!rpcObj) throw new Error("宿主没有 connection.rpc（载体=" + carrierKind() + "）");
-      // 不用 AbortController 主动中止：宿主处理可能超过 8 秒，只做与超时赛跑，
+      // 不用 AbortController 主动中止：宿主处理可能超过 8 秒，只做与超时竞速，
       // 让请求在宿主侧自然完成，慢一点也能拿到结果。
       const ac = new AbortController();
       const limit = ms || 30000;
@@ -267,19 +267,19 @@ window.__ModuleLoader__.load({
       const [globalMsg, setGlobalMsg] = React.useState("");
       const [globalBad, setGlobalBad] = React.useState(false);
       const [working, setWorking] = React.useState(false);
-      // 追加系统提示词
+      // 全局前置提示词
       const [extra, setExtra] = React.useState("");
       const [extraMsg, setExtraMsg] = React.useState("");
       const [extraBad, setExtraBad] = React.useState(false);
       const [channel, setChannel] = React.useState("");
-      // 搬迁：探针 / 复制 / 状态
+      // 迁移：探针 / 复制 / 状态
       const [mvTo, setMvTo] = React.useState("");
       const [mvBusy, setMvBusy] = React.useState(false);
       const [mvMsg, setMvMsg] = React.useState("");
       const [mvBad, setMvBad] = React.useState(false);
       const [mvProbe, setMvProbe] = React.useState(null);
       const [mvStatus, setMvStatus] = React.useState(null);
-      // 删除旧副本的确认词。
+      // 删除旧备份的确认词。
       const [delWord, setDelWord] = React.useState("");
 
       const load = React.useCallback(() => {
@@ -335,7 +335,7 @@ window.__ModuleLoader__.load({
         setWorking(true); setSetupBad(false); setSetupMsg("");
         post("register", { path: created, title: "全局" }, 20000)
           .then((r) => {
-            if (r && r.ok) setSetupMsg("已注册工作区：" + (r.title || "全局") + "（" + (r.id || "?") + "）。点「刷新」后可继续。");
+            if (r && r.ok) setSetupMsg("已注册工作区：" + (r.title || "全局") + "（" + (r.id || "?") + "）。点击「刷新」后可继续。");
             else { setSetupBad(true); setSetupMsg(((r && r.error) || "注册失败") + (r && r.hint ? "；" + r.hint : "")); }
           })
           .catch((e) => { setSetupBad(true); setSetupMsg("请求未完成：" + (e && e.message ? e.message : String(e))); })
@@ -389,7 +389,7 @@ window.__ModuleLoader__.load({
           .then((r) => {
             if (r && r.ok) {
               if (r.unchanged) setExtraMsg(r.note || "内容未变，已跳过写入。");
-              else setExtraMsg((r.chars ? "已保存，共 " + r.chars + " 字符，位置在工具说明之前。" : "已清空，不再注册提示段。") + (r.cacheNote ? " " + r.cacheNote : ""));
+              else setExtraMsg((r.chars ? "已保存，共 " + r.chars + " 字符。" : "已清空，不再注册提示段。") + (r.cacheNote ? " " + r.cacheNote : ""));
             }
             else { setExtraBad(true); setExtraMsg((r && r.error) || "保存失败"); }
           })
@@ -442,7 +442,7 @@ window.__ModuleLoader__.load({
           .then(() => setWorking(false));
       }, [load]);
 
-      // 搬迁：探针 → 复制并校验 → 状态 → 清旧副本
+      // 迁移：探针 → 复制并校验 → 状态 → 清旧备份
       const refreshMove = React.useCallback(() => {
         rpc("move.status", {}, 10000).then((st) => setMvStatus(st)).catch(() => {});
       }, []);
@@ -479,20 +479,20 @@ window.__ModuleLoader__.load({
           if (!r) return;
           setMvBad(false);
           setMvMsg(r.already
-            ? "当前已处于切换完成状态（原路径为链接），无需再次切换。"
-            : "已就绪：请完全退出 DSH，退出后约 1 秒完成切换，等待 10 秒后再打开。日志：" + (r.log || ""));
+            ? "已处于切换完成状态（原路径为链接），无需再次切换。"
+            : "已就绪：完全退出 DSH 后约 1 秒完成切换，等待 10 秒再打开。日志：" + (r.log || ""));
           refreshMove();
         });
       }, [callMove, refreshMove]);
 
-      // 压缩授权：只有用户在这里点一下，压缩才排得进去（AI 不能自己批）
+      // 压缩授权：只有用户在此授权，压缩才排得进；模型不能自批。
       const [csSid, setCsSid] = React.useState("");
       const [csMsg, setCsMsg] = React.useState("");
       const doGrant = React.useCallback((kind) => {
         setWorking(true); setCsMsg("");
         post("consent.grant", { session_id: csSid, kind: kind === "succeed" ? "succeed" : "compact" }, 15000)
           .then((r) => {
-            if (r && r.ok) { setCsMsg("已授权会话 " + r.sessionId + "，5 分钟内可" + (r.kind === "succeed" ? "换任" : "压缩") + "一次，用后失效。"); load(); }
+            if (r && r.ok) { setCsMsg("已授权会话 " + r.sessionId + "：5 分钟内可" + (r.kind === "succeed" ? "换任" : "压缩") + "一次，用后失效。"); load(); }
             else setCsMsg("授权未完成：" + ((r && r.error) || "原因未知"));
           })
           .catch((e) => setCsMsg("请求未完成：" + (e && e.message ? e.message : String(e))))
@@ -502,7 +502,7 @@ window.__ModuleLoader__.load({
         setWorking(true); setCsMsg("");
         post("consent.grant", { session_id: sid, kind: kind === "succeed" ? "succeed" : "compact" }, 15000)
           .then((r) => {
-            if (r && r.ok) { setCsMsg("已授权会话 " + r.sessionId + "，5 分钟内可" + (r.kind === "succeed" ? "换任" : "压缩") + "一次，用后失效。"); load(); }
+            if (r && r.ok) { setCsMsg("已授权会话 " + r.sessionId + "：5 分钟内可" + (r.kind === "succeed" ? "换任" : "压缩") + "一次，用后失效。"); load(); }
             else setCsMsg("授权未完成：" + ((r && r.error) || "原因未知"));
           })
           .catch((e) => setCsMsg("请求未完成：" + (e && e.message ? e.message : String(e))))
@@ -539,7 +539,7 @@ window.__ModuleLoader__.load({
       const doCleanup = React.useCallback(() => {
         if (String(delWord || "").trim() !== "删除") {
           setMvBad(true);
-          setMvMsg("确认词不正确。请输入「删除」两个字后再执行。");
+          setMvMsg("确认词不正确。输入「删除」后重试。");
           return;
         }
         callMove("move.cleanup", { confirm: true }, 180000).then((r) => {
@@ -557,13 +557,13 @@ window.__ModuleLoader__.load({
       const head = h("div", { className: "dshh-head" },
         h("h2", { className: "dshh-title" }, "dsh-handover"),
         h("button", { className: "dshh-btn", onClick: load, disabled: busy, type: "button" }, busy ? (data ? "正在刷新" : "正在读取") : "刷新"),
-        h("span", { className: "dshh-muted" }, "数据通道 " + (channel || carrierKind()) + (diag.lastError ? "；上次失败 " + diag.lastError.slice(0, 90) : "")),
+        diag.lastError ? h("span", { className: "dshh-bad" }, "读取失败（通道 " + (channel || carrierKind()) + "）：" + diag.lastError.slice(0, 90)) : null,
         data ? h("span", { className: "dshh-muted" }, "读数时间 " + data.generatedAt) : null);
 
       if (err && !data) {
         return h("div", { className: "dshh-root" }, head,
           h("div", { className: "dshh-bad" }, "无法取得状态：" + err),
-          h("div", { className: "dshh-muted" }, "若插件刚安装，请确认已在配置中启用本插件，并已重启 DSH。"));
+          h("div", { className: "dshh-muted" }, "插件刚安装时，确认已在配置中启用并重启 DSH。"));
       }
       if (!data) {
         return h("div", { className: "dshh-root" }, head, h("div", { className: "dshh-muted" }, "正在读取状态数据。"));
@@ -577,7 +577,7 @@ window.__ModuleLoader__.load({
       const allSessions = (data.sessions && Array.isArray(data.sessions.all)) ? data.sessions.all : [];
       const byActivity = allSessions.slice().sort((a, b) => String(b.seen || "").localeCompare(String(a.seen || "")));
 
-      // 排序原则：进来大概率要做的事在前，只读数据居中，说明文字最后。
+      // 排序原则：高频操作在前，只读数据居中，说明文字在后。
       const sections = [];
 
       // 一、首次安装与全局会话：未接入时给一键部署；已接入但还没有全局会话时给补建入口。
@@ -590,15 +590,17 @@ window.__ModuleLoader__.load({
       if (notReady) {
         const msg = setupMsg ? h("div", { className: setupBad ? "dshh-bad" : "dshh-ok" }, setupMsg) : null;
         const steps = (setup && setup.steps) || [];
+        const notes = Array.isArray(data.notes) ? data.notes : [];
         sections.push(card("首次安装",
           h("div", null,
-            h("div", { className: "dshh-muted" }, "插件已加载，工具与本页可用；闸门、交接体检与会话水位在接入工作区后显示。"),
+            h("div", { className: "dshh-muted" }, "本页与工具已可用；接入工作区后显示闸门、交接体检与会话水位。"),
             h("ol", { className: "dshh-list" }, steps.map((s, i) => h("li", { key: i }, s))),
+            notes.length ? h("ul", { className: "dshh-list" }, notes.map((n, i) => h("li", { key: i }, n))) : null,
             h("input", {
               className: "dshh-input",
               type: "text",
               value: parent,
-              placeholder: "粘贴一个绝对路径：全局根 _Workspace 会建在它里面",
+              placeholder: "填写绝对路径：全局根 _Workspace 将建在该目录下",
               onChange: (e) => setParent(e.target.value),
             }),
             h("div", { className: "dshh-row" },
@@ -610,78 +612,89 @@ window.__ModuleLoader__.load({
       } else if (globalCount === 0) {
         sections.push(card("全局会话",
           h("div", null,
-            h("div", { className: "dshh-muted" }, "工作区已接入，但还没有「全局」会话。点下面的按钮新建一个，插件会把它登记为全局角色。"),
+            h("div", { className: "dshh-muted" }, "工作区已接入，尚无「全局」会话。点击下方按钮新建，插件会将其登记为全局角色。"),
             h("div", { className: "dshh-muted" }, "全局根：" + (ws.root || "")),
             h("div", { className: "dshh-row" },
               h("button", { className: "dshh-btn", type: "button", disabled: working, onClick: makeGlobalSession }, working ? "正在创建" : "创建全局会话")),
             globalMsg ? h("div", { className: globalBad ? "dshh-bad" : "dshh-ok" }, globalMsg) : null)));
       }
 
-      // 二、压缩与换任授权：唯一合法的「用户同意」入口，置顶。
-      const consentRows = Array.isArray(data.consent) ? data.consent : [];
-      sections.push(card("压缩授权",
-        h("div", null,
-          h("div", { className: "dshh-muted" }, "压缩须由你授权：点「允许」后，该会话可在 5 分钟内压缩一次，用后失效。也可在对话中发送 /allow-compact。"),
-          h("div", { className: "dshh-pick" },
-            byActivity.slice(0, 10).map((r, i) => h("button", {
-              className: "dshh-btn",
-              type: "button",
-              key: i,
-              disabled: working,
-              title: r.title || r.sid,
-              onClick: () => doGrantSid(r.sid, "compact"),
-            }, "允许 " + shortSid(r.sid)))),
-          h("div", { className: "dshh-muted" }, "换任由在任会话自己执行，同样须由你授权：点「允许换任」后，该会话可在 5 分钟内换任一次。也可在对话中发送 /allow-succeed。"),
-          h("div", { className: "dshh-pick" },
-            byActivity.slice(0, 10).map((r, i) => h("button", {
-              className: "dshh-btn",
-              type: "button",
-              key: i,
-              disabled: working,
-              title: r.title || r.sid,
-              onClick: () => doGrantSid(r.sid, "succeed"),
-            }, "允许换任 " + shortSid(r.sid)))),
-          h("div", { className: "dshh-row" },
-            h("input", {
-              className: "dshh-inputSm",
-              type: "text",
-              value: csSid,
-              placeholder: "或输入会话 id 或 8 位短号",
-              onChange: (e) => setCsSid(e.target.value),
-            }),
-            h("button", { className: "dshh-btn", type: "button", disabled: working || !csSid, onClick: () => doGrant("compact") }, working ? "正在授权" : "授权"),
-            h("button", { className: "dshh-btn", type: "button", disabled: working || !csSid, onClick: () => doGrant("succeed") }, "授权换任")),
-          consentRows.length
-            ? h("table", { className: "dshh-table" },
-              h("colgroup", null, h("col", { style: { width: "62%" } }), h("col", { style: { width: "18%" } }), h("col", { style: { width: "20%" } })),
-              h("thead", null, h("tr", null, h("th", null, "已授权会话"), h("th", null, "剩余"), h("th", null, "操作"))),
-              h("tbody", null, consentRows.map((r, i) => h("tr", { key: i },
-                h("td", { className: "dshh-code", title: r.sessionId }, shortSid(r.sessionId) + (r.kind === "succeed" ? " · 换任" : " · 压缩")),
-                h("td", { className: "dshh-num" }, Math.round((r.leftMs || 0) / 1000) + " 秒"),
-                h("td", null, h("button", { className: "dshh-btn", type: "button", disabled: working, onClick: () => doRevoke(r.sessionId, r.kind) }, "撤销"))))))
-            : h("div", { className: "dshh-muted" }, "当前无有效授权。"),
-          csMsg ? h("div", { className: "dshh-ok" }, csMsg) : null)));
+      // 二、授权：唯一合法的「用户同意」入口，置顶；只列在任会话，超过 5 个折叠。
+      const consentRows = (Array.isArray(data.consent) ? data.consent : []).filter((r) => r.onduty !== false);
+      const dutyRows = byActivity.filter((r) => r.onduty !== false);
+      const grantRow = (kind) => (r, i) => h("tr", { key: i },
+        h("td", null, r.title || "（无标题）"),
+        h("td", { className: "dshh-code dshh-num" }, shortSid(r.sid)),
+        h("td", null, h("button", {
+          className: "dshh-btn",
+          type: "button",
+          disabled: working,
+          title: r.sid,
+          onClick: () => doGrantSid(r.sid, kind),
+        }, kind === "succeed" ? "授权换任" : "授权压缩")));
+      const grantTable = (kind) => h(Folded, {
+        rows: dutyRows,
+        pageSize: 5,
+        cols: ["会话", "短号", "操作"],
+        widths: ["58%", "12%", "30%"],
+        render: grantRow(kind),
+      });
+      const authKids = [];
+      if (dutyRows.length) {
+        authKids.push(h("div", { className: "dshh-muted" }, "点击「授权压缩」后，该会话 5 分钟内可压缩一次，用后失效；也可在会话中发送 /allow-compact。"));
+        authKids.push(grantTable("compact"));
+        authKids.push(h("div", { className: "dshh-muted" }, "换任同样须授权：点击「授权换任」后 5 分钟内可换任一次；也可在会话中发送 /allow-succeed。"));
+        authKids.push(grantTable("succeed"));
+      } else {
+        authKids.push(h("div", { className: "dshh-muted" }, "暂无可点选的在任会话；可在下方直接填会话 id 授权。"));
+      }
+      authKids.push(h("div", { className: "dshh-row" },
+        h("input", {
+          className: "dshh-inputSm",
+          type: "text",
+          value: csSid,
+          placeholder: "或填写会话 id 或 8 位短号",
+          onChange: (e) => setCsSid(e.target.value),
+        }),
+        h("button", { className: "dshh-btn", type: "button", disabled: working || !csSid, onClick: () => doGrant("compact") }, working ? "正在授权" : "授权压缩"),
+        h("button", { className: "dshh-btn", type: "button", disabled: working || !csSid, onClick: () => doGrant("succeed") }, "授权换任")));
+      if (consentRows.length) {
+        authKids.push(h("div", { className: "dshh-ok" }, "有授权"));
+        authKids.push(h("table", { className: "dshh-table" },
+          h("colgroup", null, h("col", { style: { width: "62%" } }), h("col", { style: { width: "18%" } }), h("col", { style: { width: "20%" } })),
+          h("thead", null, h("tr", null, h("th", null, "已授权会话"), h("th", null, "剩余"), h("th", null, "操作"))),
+          h("tbody", null, consentRows.map((r, i) => h("tr", { key: i },
+            h("td", { className: "dshh-code", title: r.sessionId }, shortSid(r.sessionId) + (r.kind === "succeed" ? " · 换任" : " · 压缩")),
+            h("td", { className: "dshh-num" }, Math.round((r.leftMs || 0) / 1000) + " 秒"),
+            h("td", null, h("button", { className: "dshh-btn", type: "button", disabled: working, onClick: () => doRevoke(r.sessionId, r.kind) }, "撤销")))))));
+      }
+      if (csMsg) authKids.push(h("div", { className: "dshh-ok" }, csMsg));
+      sections.push(card("授权", h("div", null, authKids)));
 
       // 三、移动全局根目录：常态折叠为一行状态。
       {
         const st = mvStatus;
         const phaseLabel = {
           none: "尚无迁移记录",
-          verified: "已复制并校验，等待切换",
+          verified: "已复制并校验，待切换",
           switched: "已切换，原路径为链接",
-          "switched+cleaned": "已切换，旧副本已删除",
+          "switched+cleaned": "已切换，旧备份已删除",
           partial: "校验有差异，需重新复制",
         };
-        const attention = !!(st && (st.linkBroken || st.srcExists === false || st.phase === "verified" || st.phase === "partial" || (st.retarget && st.retarget.needed) || (st.phase === "switched" && (st.olds || []).length)));
-        const stateText = st ? "状态：" + (phaseLabel[st.phase] || st.phase) + (st.dst ? "（" + st.dst + "）" : "") : "正在读取迁移状态";
+        // 旧备份是否保留不影响使用，因此不计入「需要处理」；需要处理的只有会妨碍使用的情形。
+        const hasOlds = !!(st && st.phase === "switched" && (st.olds || []).length);
+        const attention = !!(st && (st.linkBroken || st.srcExists === false || st.phase === "verified" || st.phase === "partial" || (st.retarget && st.retarget.needed)));
+        const stateText = st
+          ? "状态：" + (phaseLabel[st.phase] || st.phase) + (st.dst ? "（" + st.dst + "）" : "") + (hasOlds ? "；旧备份保留，不影响使用" : "")
+          : "正在读取迁移状态";
         const kids = [];
-        kids.push(h("div", { className: "dshh-muted" }, "复制并校验通过后才能切换；切换只改名与建立链接，不改动文件内容。"));
+        kids.push(h("div", { className: "dshh-muted" }, "切换只改名与建链接，不改动文件内容。"));
         if (st && st.phase && st.phase.indexOf("switched") === 0) {
-          kids.push(h("div", { className: "dshh-muted" }, "原路径现为链接，请勿删除；若已删除，用「重建链接」恢复。"));
+          kids.push(h("div", { className: "dshh-muted" }, "原路径为指向新位置的链接；若已删除，可用「重建链接」恢复。"));
         }
         if (st && (st.srcExists === false || st.linkBroken)) {
           kids.push(h("div", { className: "dshh-bad" }, st.linkBroken
-            ? "链接指向的新位置不存在：" + (st.dst || "") + "。请先确认真实数据位置；本页不改动文件。"
+            ? "链接指向的新位置不存在：" + (st.dst || "") + "。应先确认真实数据位置；本页不改动文件。"
             : "原路径不存在（可能已被删除）：" + (st.src || "") + "。数据仍在 " + (st.dst || "") + "。"));
           if (st.canRepair) {
             kids.push(h("div", { className: "dshh-row" },
@@ -698,7 +711,7 @@ window.__ModuleLoader__.load({
             h("li", null, "回到本页，状态应为「已切换，原路径为链接」。")));
           kids.push(h("div", { className: "dshh-row" },
             h("button", { className: "dshh-btn", type: "button", disabled: mvBusy, onClick: doSwitch }, mvBusy ? "正在准备" : "准备切换（退出 DSH 后自动完成）")));
-          kids.push(h("div", { className: "dshh-muted" }, "日志末行出现「切换完成」即为成功；失败会写明原因且不改动文件，可重试。助手未运行时手工执行：" + ((st.script && st.script.helper) || "")));
+          kids.push(h("div", { className: "dshh-muted" }, "助手未运行时手工执行：" + ((st.script && st.script.helper) || "")));
         }
         if (st && st.retarget && st.retarget.needed) {
           kids.push(h("div", { className: "dshh-warn" }, "DSH 登记仍指向旧路径：" + st.retarget.total + " 处，涉及 " + st.retarget.files.length + " 个文件。"));
@@ -712,8 +725,8 @@ window.__ModuleLoader__.load({
         if (st && st.retarget && st.retarget.needed === false) {
           kids.push(h("div", { className: "dshh-ok" }, "DSH 登记已指向新位置：" + (st.dst || "") + "。"));
         }
-        if (st && st.phase === "switched" && (st.olds || []).length) {
-          kids.push(h("div", { className: "dshh-muted" }, "旧副本：" + st.olds.map((o) => o.path + "（" + fmtBytes(o.bytes) + "）").join("、") + "。删除后无法恢复。"));
+        if (hasOlds) {
+          kids.push(h("div", { className: "dshh-muted" }, "旧备份：" + st.olds.map((o) => o.path + "（" + fmtBytes(o.bytes) + "）").join("、") + "。保留不影响使用；删除后无法恢复。"));
           kids.push(h("div", { className: "dshh-row" },
             h("input", {
               className: "dshh-inputSm",
@@ -722,7 +735,7 @@ window.__ModuleLoader__.load({
               placeholder: "输入「删除」以确认",
               onChange: (e) => setDelWord(e.target.value),
             }),
-            h("button", { className: "dshh-btn", type: "button", disabled: mvBusy || delWord.trim() !== "删除", onClick: doCleanup }, "删除旧副本（不可撤销）")));
+            h("button", { className: "dshh-btn", type: "button", disabled: mvBusy || delWord.trim() !== "删除", onClick: doCleanup }, "删除旧备份（不可撤销）")));
         }
         kids.push(h("div", { className: "dshh-row" },
           h("input", {
@@ -755,7 +768,23 @@ window.__ModuleLoader__.load({
               h("div", { className: "dshh-wrap" }, kids)))));
       }
 
-      // 四、会话角色：角色列即当前值，设置成功后按钮切换为「通知该会话」。
+      // 四、会话角色：按 DSH 工作区分组，默认全部折叠；组内按全局、项目、杂项、普通排列。
+      const ROLE_ORDER = { global: 0, project: 1, misc: 2, plain: 3 };
+      const byRole = byActivity.slice().sort((a, b) => {
+        const ra = ROLE_ORDER[a.role] === undefined ? 9 : ROLE_ORDER[a.role];
+        const rb = ROLE_ORDER[b.role] === undefined ? 9 : ROLE_ORDER[b.role];
+        return ra !== rb ? ra - rb : String(b.seen || "").localeCompare(String(a.seen || ""));
+      });
+      const wsList = (ss && Array.isArray(ss.workspaces)) ? ss.workspaces : [];
+      const roleGroups = [];
+      const claimed = {};
+      for (const w of wsList) {
+        const rows = byRole.filter((r) => r.wsKey === w.key);
+        claimed[w.key] = true;
+        if (rows.length) roleGroups.push({ key: w.key, title: w.title || w.path || "工作区", path: w.path || "", rows });
+      }
+      const restRows = byRole.filter((r) => !claimed[r.wsKey]);
+      if (restRows.length) roleGroups.push({ key: "", title: "未归属工作区", path: "", rows: restRows });
       const roleRow = (r, i) => {
         const draft = (roleSel && roleSel[r.sid]) || {};
         const role = draft.role !== undefined ? draft.role : (r.role || "plain");
@@ -777,10 +806,10 @@ window.__ModuleLoader__.load({
             value: role,
             onChange: (e) => setRoleValue(r.sid, { role: e.target.value }),
           },
-            h("option", { value: "plain" }, "普通"),
             h("option", { value: "global" }, "全局"),
             h("option", { value: "project" }, "项目"),
-            h("option", { value: "misc" }, "杂项"))),
+            h("option", { value: "misc" }, "杂项"),
+            h("option", { value: "plain" }, "普通"))),
           h("td", null, wide ? h("input", {
             className: "dshh-inputSm",
             type: "text",
@@ -792,22 +821,25 @@ window.__ModuleLoader__.load({
       };
       sections.push(card("会话角色",
         h("div", null,
-          h("div", { className: "dshh-muted" }, "选定角色后点「设置角色」，当场生效；按钮随即变为「通知该会话」，再点一次即向它发送整理指令并唤醒一轮。"),
-          byActivity.length
-            ? h(Folded, {
-              rows: byActivity,
-              pageSize: 5,
-              cols: ["会话", "短号", "水位", "角色", "项目或任务名", "操作"],
-              widths: ["30%", "9%", "7%", "12%", "20%", "22%"],
-              render: roleRow,
-            })
-            : h("div", { className: "dshh-muted" }, "暂无可设置角色的会话。空白会话不在此列出。"),
+          roleGroups.length
+            ? roleGroups.map((g, gi) => h("details", { key: gi },
+              h("summary", { className: "dshh-sum" }, g.title + "（" + g.rows.length + " 个会话）"),
+              h("div", { className: "dshh-wrap" },
+                g.path ? h("div", { className: "dshh-muted dshh-code" }, g.path) : null,
+                h(Folded, {
+                  rows: g.rows,
+                  pageSize: 5,
+                  cols: ["会话", "短号", "水位", "角色", "项目或任务名", "操作"],
+                  widths: ["30%", "9%", "7%", "12%", "20%", "22%"],
+                  render: roleRow,
+                }))))
+            : h("div", { className: "dshh-muted" }, "暂无可设置角色的会话。空白会话不列出。"),
           roleMsg ? h("div", { className: roleBad ? "dshh-bad" : "dshh-ok" }, roleMsg) : null)));
 
       // 五、全局前置提示词：默认折叠，只显示已保存字数。
       sections.push(card("全局前置提示词",
         h("div", null,
-          h("div", { className: "dshh-muted" }, "只注入你填写的内容，不含插件约束；对全部会话生效，位置在工具说明之前。留空保存即不注册提示段。"),
+          h("div", { className: "dshh-muted" }, "只注入你填写的内容，不含插件约束；对全部会话生效，留空保存即不注册提示段。"),
           h("details", null,
             h("summary", { className: "dshh-sum" }, "已保存 " + (extra ? extra.length : 0) + " 字符，点击编辑"),
             h("textarea", {
@@ -822,12 +854,13 @@ window.__ModuleLoader__.load({
               h("span", { className: "dshh-muted" }, extra.length + " 字符")),
             extraMsg ? h("div", { className: extraBad ? "dshh-bad" : "dshh-ok" }, extraMsg) : null))));
 
-      // 六、会话水位：只读数据区从这里开始。
+      // 六、会话水位：只读数据区从这里开始；只列在任会话（全局、项目、杂项各一行）。
       if (ss) {
-        const byRecent = (ss.rows || []).slice().sort((a, b) => String(b.seen || "").localeCompare(String(a.seen || "")));
+        const byRecent = (ss.rows || []).filter((r) => r.onduty !== false).slice().sort((a, b) => String(b.seen || "").localeCompare(String(a.seen || "")));
         const waterRow = (r, i) => h("tr", { key: i },
-          h("td", null, r.project),
+          h("td", null, r.dutyName || r.dutyKey || r.title || r.project || "（无名）"),
           h("td", { className: "dshh-code dshh-num" }, shortSid(r.sid)),
+          h("td", null, r.dutyKind || r.roleLabel || ""),
           h("td", { className: "dshh-num" }, r.pct === null || r.pct === undefined ? "?" : r.pct.toFixed(1) + "%"),
           h("td", null, r.state),
           h("td", null, r.active ? "活跃" : "沉默"),
@@ -836,17 +869,17 @@ window.__ModuleLoader__.load({
           h("div", null,
             h("div", { className: "dshh-muted" }, ss.verdict + "。活跃线 " + ss.cutoff + "，回溯 " + ss.silentHours + " 小时。"),
             (ss.notify || []).length
-              ? h("div", null, "本轮需通知：" + ss.notify.map((r) => r.project + "（" + shortSid(r.sid) + "）").join("、"))
+              ? h("div", null, "本轮需通知：" + ss.notify.map((r) => (r.name || r.key || "") + "（" + shortSid(r.sid) + "）").join("、"))
               : h("div", { className: "dshh-muted" }, "本轮无需通知。"),
             byRecent.length
               ? h(Folded, {
                 rows: byRecent,
                 pageSize: 5,
-                cols: ["项目", "会话", "水位", "状态", "活跃", "最后活动"],
-                widths: ["22%", "13%", "9%", "9%", "9%", "38%"],
+                cols: ["会话", "短号", "类别", "水位", "状态", "活跃", "最后活动"],
+                widths: ["20%", "11%", "7%", "8%", "8%", "7%", "31%"],
                 render: waterRow,
               })
-              : h("div", { className: "dshh-muted" }, "暂无可显示的项目会话。"))));
+              : h("div", { className: "dshh-muted" }, "暂无可显示的在任会话。"))));
       }
 
       // 七、通用约束条闸门
@@ -868,20 +901,25 @@ window.__ModuleLoader__.load({
                 h("tbody", null, rows)))));
       }
 
-      // 八、交接文档体检：问题列只留问题本身，去掉括注与时间要求。
+      // 八、交接文档体检：全局一行，项目与杂项同一张表；问题列只留问题本身。
       if (ho) {
         const cleanReason = (x) => String(x || "").replace(/（[^）]*）/g, "").replace(/\s+/g, " ").trim();
-        const prows = (ho.projects || []).map((r, i) => h("tr", { key: i },
+        const rows = (ho.projects || []).map((r) => Object.assign({}, r, { kind: "项目" }))
+          .concat((ho.misc || []).map((r) => Object.assign({}, r, { kind: "杂项" })));
+        const prows = rows.map((r, i) => h("tr", { key: i },
+          h("td", null, r.kind),
           h("td", null, r.name),
-          h("td", null, r.verdict === "通过" ? verdict("通过", true) : r.verdict === "缺节" ? h("span", { className: "dshh-warn" }, "缺节") : verdict(r.verdict, false)),
+          h("td", null, r.verdict === "通过" ? verdict("通过", true) : (r.verdict === "缺节" || r.verdict === "读不到" || r.verdict === "未找到") ? h("span", { className: "dshh-warn" }, r.verdict) : verdict(r.verdict, false)),
           h("td", null, (r.reasons || []).map(cleanReason).filter(Boolean).join("；"))));
         sections.push(card("交接文档体检",
           h("div", null,
             h("div", null, "全局 Global_Handover.md：", ho.global.verdict === "通过" ? verdict("通过", true) : verdict(ho.global.verdict, false),
               (ho.global.reasons || []).length ? h("span", { className: "dshh-muted" }, (ho.global.reasons || []).map(cleanReason).filter(Boolean).join("；")) : null),
-            h("table", { className: "dshh-table" },
-              h("thead", null, h("tr", null, h("th", null, "项目"), h("th", null, "结论"), h("th", null, "问题"))),
-              h("tbody", null, prows)))));
+            prows.length
+              ? h("table", { className: "dshh-table" },
+                h("thead", null, h("tr", null, h("th", null, "类别"), h("th", null, "名称"), h("th", null, "结论"), h("th", null, "问题"))),
+                h("tbody", null, prows))
+              : h("div", { className: "dshh-muted" }, "暂无已登记的项目或杂项。"))));
       }
 
       // 九、插件信息
@@ -890,26 +928,21 @@ window.__ModuleLoader__.load({
         ["工具数", String(p.tools)],
         ["压缩调度器", p.scheduler],
         ["注入项", (p.inject || []).join("、")],
-        ["初始化", (p.initErrors && p.initErrors.length) ? h("span", { className: "dshh-bad" }, p.initErrors.join("；")) : verdict("无错误", true)],
+        ["初始化", (p.initErrors && p.initErrors.length) ? h("span", { className: "dshh-bad" }, p.initErrors.join("；")) : verdict("正常", true)],
         ["工作区", ws.found ? h("span", { className: "dshh-code" }, ws.root) : verdict("未接入（未找到 _Control_Center）", false)],
       ])));
 
-      // 十、会话间通信守卫
+      // 十、最近一次会话间通信判定：只有存在判定时才出现。
       const g = data.guardLast;
-      sections.push(card("会话间通信守卫",
-        g
-          ? kv([
-            ["结论", g.allow ? verdict("允许", true) : verdict("拒绝", false)],
-            ["依据", g.source + (g.title ? "；会话标题 " + g.title : "")],
-            ["会话", h("span", { className: "dshh-code" }, g.sid || "-")],
-          ])
-          : h("div", { className: "dshh-muted" }, "本进程尚未收到会话间通信请求，暂无判定。")));
-
-      if ((data.notes || []).length) {
-        sections.push(card("待处理", h("ul", { className: "dshh-list" }, data.notes.map((n, i) => h("li", { key: i }, n)))));
+      if (g) {
+        sections.push(card("最近一次会话间通信判定", kv([
+          ["结论", g.allow ? verdict("允许", true) : verdict("拒绝", false)],
+          ["依据", g.source + (g.title ? "；会话标题 " + g.title : "")],
+          ["会话", h("span", { className: "dshh-code" }, g.sid || "-")],
+        ])));
       }
 
-      // 末、使用说明：参考性质，放最后，默认折叠。
+      // 末、工具明细与使用说明：参考性质，放最后，默认折叠。
       const gd = data.guide;
       if (gd) {
         const sit = (gd.situations || []).map((r, i) => h("tr", { key: i },
@@ -921,16 +954,22 @@ window.__ModuleLoader__.load({
           h("table", { className: "dshh-table" }, h("tbody", null, (gr.tools || []).map((t, j) => h("tr", { key: j },
             h("td", { className: "dshh-code" }, t[0]),
             h("td", { className: "dshh-muted" }, t[1])))))));
+        const toolCount = (gd.groups || []).reduce((a, gr) => a + ((gr.tools || []).length), 0);
+        if (toolCount) {
+          sections.push(card("工具明细",
+            h("details", null,
+              h("summary", { className: "dshh-sum" }, "共 " + toolCount + " 个工具，点击展开"),
+              h("div", { className: "dshh-wrap" }, groups))));
+        }
         sections.push(card("使用说明",
           h("details", null,
-            h("summary", { className: "dshh-sum" }, "交互方式、常见请求、工具清单与约定"),
+            h("summary", { className: "dshh-sum" }, "交互方式、常见请求与约定"),
             h("div", { className: "dshh-wrap" },
               (gd.intro || []).map((t, i) => h("div", { key: i }, t)),
               h("div", { className: "dshh-sub" }, "常见请求与对应动作"),
               h("table", { className: "dshh-table" },
                 h("thead", null, h("tr", null, h("th", null, "时机"), h("th", null, "可以这样说"), h("th", null, "插件会执行的动作"))),
                 h("tbody", null, sit)),
-              groups,
               h("div", { className: "dshh-sub" }, "约定"),
               h("ul", { className: "dshh-list" }, (gd.rules || []).map((t, i) => h("li", { key: i }, t)))))));
       }