@mingmaple/dsh-handover 0.9.6 → 0.9.13

package/scripts/office.mjs

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+/**
+ * 命令行查在任登记表：`node scripts/office.mjs 全局 全局3 Mingent`
+ *
+ * 与工具 ho_office 同一份实现、同一份记录（_Control_Center/records/Office.json），
+ * 区别只是不起会话也能查。工作区根按 --root → DSH_OFFICE_ROOT → 从 cwd 向上找 _Control_Center 的顺序解析。
+ */
+import path from 'node:path';
+import { isDir } from '../src/lib/text.mjs';
+import { loadOffice, resolveOffice, rowsOf, formatRow, officePath, KIND_LABEL } from '../src/lib/office.mjs';
+
+function walkUp(start) {
+  let cur = path.resolve(start);
+  for (let i = 0; i < 8 && cur; i++) {
+    if (isDir(path.join(cur, '_Control_Center'))) return cur;
+    const up = path.dirname(cur);
+    if (up === cur) break;
+    cur = up;
+  }
+  return '';
+}
+
+const argv = process.argv.slice(2);
+let root = process.env.DSH_OFFICE_ROOT || process.env.DSH_HANDOVER_ROOT || '';
+let json = false;
+let all = false;
+const queries = [];
+for (let i = 0; i < argv.length; i++) {
+  const a = argv[i];
+  if (a === '--root') { root = argv[++i] || ''; continue; }
+  if (a === '--json') { json = true; continue; }
+  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');
+    process.exit(0);
+  }
+  queries.push(a);
+}
+if (!root) root = walkUp(process.cwd());
+if (!root) {
+  console.error('找不到工作区根（没有 _Control_Center）：用 --root 指定，例如 --root E:\\_Project_Mate\\_Workspace');
+  process.exit(2);
+}
+
+const store = loadOffice(root);
+const rows = rowsOf(store);
+if (!rows.length) {
+  console.error('在任登记表是空的：' + officePath(root));
+  console.log('提示：由全局会话用 ho_sessions / 换任流程登记一次在任会话，登记表随之生成。');
+  process.exit(2);
+}
+
+if (all || !queries.length) {
+  if (json) {
+    console.log(JSON.stringify({ updatedAt: store.updatedAt || '', rows }, null, 2));
+  } else {
+    let lastKind = '';
+    for (const r of rows) {
+      if (r.kind !== lastKind) {
+        console.log((lastKind ? '\n' : '') + '【' + (KIND_LABEL[r.kind] || r.kind) + '】');
+        lastKind = r.kind;
+      }
+      console.log(formatRow(r));
+    }
+  }
+  process.exit(0);
+}
+
+let miss = 0;
+const hits = [];
+for (const q of queries) {
+  const r = resolveOffice(store, q);
+  if (!r.ok) { console.log(q + '  — ' + r.reason); miss++; continue; }
+  if (r.vacant) { console.log(q + '  — 类别「' + r.key + '」当前空缺（无人在任）'); continue; }
+  const row = { key: r.key, kind: r.lineage.kind, project: r.lineage.project, task: r.lineage.task, current: r.lineage.current };
+  if (!json) console.log(formatRow(row, q));
+  hits.push({ askedAs: q, via: r.via, key: r.key, kind: r.lineage.kind, name: r.lineage.current.name, sessionId: r.lineage.current.sessionId });
+}
+if (json) console.log(JSON.stringify({ updatedAt: store.updatedAt || '', hits }, null, 2));
+process.exit(miss ? 1 : 0);

package/src/client.js

@@ -263,6 +263,9 @@ window.__ModuleLoader__.load({
       const [created, setCreated] = React.useState("");
       const [setupMsg, setSetupMsg] = React.useState("");
       const [setupBad, setSetupBad] = React.useState(false);
+      const [deployInfo, setDeployInfo] = React.useState(null);
+      const [globalMsg, setGlobalMsg] = React.useState("");
+      const [globalBad, setGlobalBad] = React.useState(false);
       const [working, setWorking] = React.useState(false);
       // 追加系统提示词
       const [extra, setExtra] = React.useState("");
@@ -332,13 +335,54 @@ 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))); })
           .then(() => setWorking(false));
       }, [created]);
 
+      // 一键部署：建文件体系、注册「全局」工作区、建「全局」会话，一次做完。
+      const deployAll = React.useCallback(() => {
+        setWorking(true); setDeployInfo(null); setSetupBad(false); setSetupMsg("");
+        post("deploy", { parent: parent }, 180000)
+          .then((r) => {
+            if (!r || !r.ok) {
+              setSetupBad(true);
+              setSetupMsg((r && r.error) || "部署失败");
+              return;
+            }
+            const parts = [];
+            parts.push("文件体系：" + r.root);
+            if (r.workspace) parts.push("工作区：「" + r.workspace.title + "」（" + r.workspace.path + "）");
+            else if (r.workspaceError) parts.push("工作区未注册：" + r.workspaceError);
+            if (r.sessionId) parts.push("全局会话：" + r.sessionId + "。在左侧「" + (r.workspace ? r.workspace.title : "全局") + "」工作区打开它即可开始。");
+            else if (r.sessionError) parts.push("会话未创建：" + r.sessionError);
+            setCreated(r.root || "");
+            setDeployInfo({ text: parts.join("；"), bad: false });
+            load();
+          })
+          .catch((e) => { setSetupBad(true); setSetupMsg("请求未完成：" + (e && e.message ? e.message : String(e))); })
+          .then(() => setWorking(false));
+      }, [parent, load]);
+
+      // 工作区已接入但没有全局会话时，补建一个。
+      const makeGlobalSession = React.useCallback(() => {
+        setWorking(true); setGlobalBad(false); setGlobalMsg("");
+        post("global-session", {}, 60000)
+          .then((r) => {
+            if (r && r.ok) {
+              setGlobalMsg("已创建全局会话 " + r.sessionId + "，在左侧工作区打开它即可开始。");
+              load();
+            } else {
+              setGlobalBad(true);
+              setGlobalMsg((r && r.error) || "创建失败");
+            }
+          })
+          .catch((e) => { setGlobalBad(true); setGlobalMsg("请求未完成：" + (e && e.message ? e.message : String(e))); })
+          .then(() => setWorking(false));
+      }, [load]);
+
       const saveExtra = React.useCallback(() => {
         setWorking(true); setExtraBad(false); setExtraMsg("");
         post("extra-prompt", { text: extra }, 20000)
@@ -444,31 +488,31 @@ window.__ModuleLoader__.load({
       // 压缩授权：只有用户在这里点一下，压缩才排得进去（AI 不能自己批）
       const [csSid, setCsSid] = React.useState("");
       const [csMsg, setCsMsg] = React.useState("");
-      const doGrant = React.useCallback(() => {
+      const doGrant = React.useCallback((kind) => {
         setWorking(true); setCsMsg("");
-        post("consent.grant", { session_id: csSid }, 15000)
+        post("consent.grant", { session_id: csSid, kind: kind === "succeed" ? "succeed" : "compact" }, 15000)
           .then((r) => {
-            if (r && r.ok) { setCsMsg("已授权会话 " + r.sessionId + "，5 分钟内可压缩一次，用后失效。"); 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))))
           .then(() => setWorking(false));
       }, [csSid, load]);
-      const doGrantSid = React.useCallback((sid) => {
+      const doGrantSid = React.useCallback((sid, kind) => {
         setWorking(true); setCsMsg("");
-        post("consent.grant", { session_id: sid }, 15000)
+        post("consent.grant", { session_id: sid, kind: kind === "succeed" ? "succeed" : "compact" }, 15000)
           .then((r) => {
-            if (r && r.ok) { setCsMsg("已授权会话 " + r.sessionId + "，5 分钟内可压缩一次，用后失效。"); 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))))
           .then(() => setWorking(false));
       }, [load]);
 
-      const doRevoke = React.useCallback((sid) => {
+      const doRevoke = React.useCallback((sid, kind) => {
         setWorking(true); setCsMsg("");
-        post("consent.revoke", { session_id: sid }, 15000)
-          .then(() => { setCsMsg("已撤销 " + sid + " 的压缩授权。"); load(); })
+        post("consent.revoke", { session_id: sid, kind: kind === "succeed" ? "succeed" : "compact" }, 15000)
+          .then(() => { setCsMsg("已撤销 " + sid + " 的" + (kind === "succeed" ? "换任" : "压缩") + "授权。"); load(); })
           .catch(() => { /* 撤销失败不影响别的 */ })
           .then(() => setWorking(false));
       }, [load]);
@@ -536,30 +580,44 @@ window.__ModuleLoader__.load({
       // 排序原则：进来大概率要做的事在前，只读数据居中，说明文字最后。
       const sections = [];
 
-      // 一、首次安装：仅在尚未接入工作区时出现，此时它是唯一可做的事。
+      // 一、首次安装与全局会话：未接入时给一键部署；已接入但还没有全局会话时给补建入口。
       const setup = data.setup;
       const notReady = !ws || ws.found === false;
-      if (setup && notReady && (setup.steps || []).length) {
+      const globalCount = Number(data.globalSessions || 0);
+      if (deployInfo) {
+        sections.push(card("部署结果", h("div", { className: deployInfo.bad ? "dshh-bad" : "dshh-ok" }, deployInfo.text)));
+      }
+      if (notReady) {
         const msg = setupMsg ? h("div", { className: setupBad ? "dshh-bad" : "dshh-ok" }, setupMsg) : null;
+        const steps = (setup && setup.steps) || [];
         sections.push(card("首次安装",
           h("div", null,
             h("div", { className: "dshh-muted" }, "插件已加载，工具与本页可用；闸门、交接体检与会话水位在接入工作区后显示。"),
-            h("ol", { className: "dshh-list" }, setup.steps.map((s, i) => h("li", { key: i }, s))),
+            h("ol", { className: "dshh-list" }, steps.map((s, i) => h("li", { key: i }, s))),
             h("input", {
               className: "dshh-input",
               type: "text",
               value: parent,
-              placeholder: "已存在目录的绝对路径，_Workspace 将建在其内",
+              placeholder: "粘贴一个绝对路径：全局根 _Workspace 会建在它里面",
               onChange: (e) => setParent(e.target.value),
             }),
             h("div", { className: "dshh-row" },
-              h("button", { className: "dshh-btn", type: "button", disabled: working || !parent, onClick: buildTree }, working ? "正在建立" : "建立全局文件体系"),
+              h("button", { className: "dshh-btn", type: "button", disabled: working || !parent, onClick: deployAll }, working ? "正在部署" : "一键部署"),
+              h("button", { className: "dshh-btn", type: "button", disabled: working || !parent, onClick: buildTree }, working ? "正在建立" : "仅建立文件体系"),
               created ? h("button", { className: "dshh-btn", type: "button", disabled: working, onClick: registerWs }, "注册为工作区") : null),
             created ? h("div", { className: "dshh-code" }, created) : null,
             msg)));
+      } else if (globalCount === 0) {
+        sections.push(card("全局会话",
+          h("div", null,
+            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,
@@ -571,8 +629,18 @@ window.__ModuleLoader__.load({
               key: i,
               disabled: working,
               title: r.title || r.sid,
-              onClick: () => doGrantSid(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",
@@ -581,15 +649,16 @@ window.__ModuleLoader__.load({
               placeholder: "或输入会话 id 或 8 位短号",
               onChange: (e) => setCsSid(e.target.value),
             }),
-            h("button", { className: "dshh-btn", type: "button", disabled: working || !csSid, onClick: doGrant }, working ? "正在授权" : "授权")),
+            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)),
+                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) }, "撤销"))))))
+                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)));
 
@@ -825,16 +894,16 @@ window.__ModuleLoader__.load({
         ["工作区", ws.found ? h("span", { className: "dshh-code" }, ws.root) : verdict("未接入（未找到 _Control_Center）", false)],
       ])));
 
-      // 十、唤醒权守卫
+      // 十、会话间通信守卫
       const g = data.guardLast;
-      sections.push(card("唤醒权守卫",
+      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" }, "本进程尚未收到唤醒请求，暂无判定。")));
+          : 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)))));