@mrrisega/dsh-remote 0.7.12-beta.6 → 0.8.1-beta.1

package/packages/dsh-remote-web/runtime/clients/dsh-remote/wecom-bot.mjs

@@ -52,7 +52,15 @@ import WebSocket from "ws";
 
 import { createEventSubscriber, NODE_KINDS } from "./dsh-events.mjs";
 // 通道感知格式化（2026-11-08：企微/钉钉 markdown 不支持表格，发前统一适配；飞书/微信各有分支）
-import { formatForChannel } from "./im-format.mjs";
+import {
+  SUMMARY_MAX_CHARS,
+  buildTurnNotification,
+  extractTurnSummary,
+  formatForChannel
+} from "./im-format.mjs";
+// 命令层（2026-11-08）：/help /status /stop /ls /use /unbind 在**进模型前**拦下执行；
+// 解析/文案/能力门禁三家共用（与会员升级文案同口径）。
+import { executeImCommand, writeImBotsSession } from "./im-commands.mjs";
 // 会员能力表 = **单一真相源**：直接复用微信通道那套（WECHAT_CAPABILITY_TABLE / limitsFor / grantsCap），
 // 不另造一套。企微/飞书/钉钉将来都套同一套判定（见 research/.../im-channel-membership-design.md）。
 import {
@@ -716,8 +724,8 @@ export function createWecomBot(options = {}) {
   const approvalCardTtlMs = positiveNumber(options.approvalCardTtlMs, APPROVAL_CARD_TTL_MS);
   const onApprovalDecision = typeof options.onApprovalDecision === "function" ? options.onApprovalDecision : null;
   // 会话可选绑定（task-24）：配置固定的会话（空 = 跟随活跃会话）
-  const configuredSessionId = String(options.configuredSessionId || "").trim();
-  const configuredSessionTitle = truncateText(options.configuredSessionTitle || "", 60);
+  let configuredSessionId = String(options.configuredSessionId || "").trim();
+  let configuredSessionTitle = truncateText(options.configuredSessionTitle || "", 60);
   // ── 会员判定（2026-11-07 业主拍板：通知免费、审批免费、互动半阉割）──
   // capsProvider 由 bridge 注入（复用微信通道的 resolveWechatTier：字符串档位或 {plan,caps,limits,rev}）；
   // 拿不到 / 未注入 → **按 free fail-closed**。
@@ -1367,8 +1375,87 @@ export function createWecomBot(options = {}) {
   }
 
   /** 把入站文本转给 DSH 会话（尽力，失败给用户一句人话）。 */
+  /**
+   * 命令层（三家共用 `im-commands.mjs`）：命中返回 true（已回复，调用方直接 return）。
+   * 回复走被动回复/主动推送（replyText），不经过模型、不计额度。
+   */
+  async function handleCommand(frame, info) {
+    const text = String((info && info.text) || "");
+    if (!/^\s*\//.test(text)) return false; // 快路径：非命令不构造 ctx
+    const cmd = await executeImCommand({
+      text,
+      ctx: {
+        caps: capsNow(),
+        tier: tierNow(),
+        appUrl,
+        channelLabel: "企业微信",
+        sessions: async () => {
+          try { await refreshSessions({ force: true }); } catch { /* 忽略 */ }
+          return sessionList.map((x) => ({ sessionId: x.id, title: x.title, updatedAt: x.updatedAt, running: false }));
+        },
+        currentSessionId: () => {
+          const known = boundSessionId || activeSession.id || "";
+          if (known) return known;
+          if (configuredSessionId && canCap("sessions")) return configuredSessionId;
+          if (sessionList.length) return sessionList[0].id;
+          const sub = subscriber;
+          try {
+            if (sub && typeof sub.sessions === "function") {
+              const ids = sub.sessions();
+              if (Array.isArray(ids) && ids.length) return String(ids[0]);
+            }
+          } catch { /* 忽略 */ }
+          return "";
+        },
+        currentSessionTitle: () => titleOfSession(boundSessionId || activeSession.id, activeSession.title || ""),
+        cancelSession: async ({ sessionId }) => {
+          const sub = subscriber;
+          if (!sub || typeof sub.cancelSession !== "function") return { ok: false, message: "订阅器未就绪" };
+          try {
+            const r = await sub.cancelSession({ sessionId });
+            return r && typeof r === "object" ? r : { ok: Boolean(r) };
+          } catch (e) { return { ok: false, message: e && e.message ? e.message : String(e) }; }
+        },
+        switchSession: async ({ sessionId, title }) => {
+          const r = writeImBotsSession(relayDir, "wecom", { sessionId, sessionTitle: title });
+          if (r.ok) {
+            configuredSessionId = sessionId;
+            configuredSessionTitle = truncateText(title || "", 60);
+            writeStatus();
+          }
+          return r;
+        },
+        unbind: async () => {
+          state.boundChatId = "";
+          writeStatus();
+          return { ok: true };
+        },
+        statusSnapshot: async () => ({
+          connected: state.connected === true,
+          authenticated: state.authenticated === true,
+          state: state.connected ? "connected" : "idle",
+          lastError: state.lastError || "",
+          tier: tierNow(),
+          usage: { month: monthKey(), messages: usageThisMonth() },
+          messagesPerMonth: messageLimitNow(),
+          remainingMessages: messageLimitNow() ? Math.max(0, messageLimitNow() - usageThisMonth()) : null,
+          currentSessionId: boundSessionId || activeSession.id || "",
+          currentSessionTitle: titleOfSession(boundSessionId || activeSession.id, activeSession.title || "")
+        })
+      }
+    });
+    if (!cmd || !cmd.handled) return false;
+    replyText(frame, cmd.text);
+    emitter.emit("command", { ...info, command: cmd.command, ok: cmd.ok === true, gated: cmd.gated === true });
+    log.info(`命令 ${cmd.command}${cmd.gated ? "（会员闸拦截）" : ""} 已回复（不转模型）`);
+    return true;
+  }
+
   async function dispatchInbound(frame, info) {
     const sub = subscriber;
+    // ⓪ 命令层：命中即执行并回复，**绝不进模型**，也不计入额度（/stop、/unbind 永远免费）
+    const cmd = await handleCommand(frame, info);
+    if (cmd) return;
     // ① 会员闸（通知/审批免费；派活受能力与月度额度约束，fail-closed）
     const gated = await membershipGate(frame, info);
     if (gated) return;
@@ -1971,102 +2058,42 @@ export function createWecomBot(options = {}) {
   }
 
   /**
-   * 这个 turn/end 是不是「我们刚转发进去的那次对话」的收尾？
+   * 任务通知（完成/出错/被拦/停止）：**一条**消息 = 标题行 + 总结正文。
    *
-   * 判据（宁可不回传，也不要瞎回传）：
-   *   · 必须**实时** turn/end（`fromSnapshot` = 重连时补报的旧 turn，绝不能拿旧回答当新回答）；
-   *   · 会话必须是最近一次入站转发成功的那个；
-   *   · 距那次入站 < TTL（默认 10 分钟）—— 超时就当另一次对话，走原来的标题通知；
-   *   · 事件时间不能早于入站时间（给 5s 时钟/批处理余量）。
+   * 正文优先订阅器 `lastAssistantText({sessionId})`（turn/end 瞬间可能还没落库 → 沿用旧短重试），
+   * 取不到再用事件字段、再取不到降级"仅标题"；正文按企业微信通道渲染并限制 1500 字。
+   * **日志只打长度/来源，绝不打印正文**（可能有代码/密钥/隐私）。
    */
-  function shouldRelayAnswer(node) {
-    if (!answerRelayEnabled) return false;
-    if (node.kind !== NODE_KINDS.TURN_END) return false;
-    if (node.fromSnapshot === true) return false;
-    if (!lastInbound.sessionId || node.sessionId !== lastInbound.sessionId) return false;
-    const at = now();
-    if (at - lastInbound.at >= answerRelayTtlMs) return false;
-    if (Number.isFinite(node.at) && node.at > 0 && node.at < lastInbound.at - 5000) return false;
-    return true;
+  async function sendTurnNotice(node, target) {
+    let summary = { text: "", source: "none" };
+    try {
+      summary = await extractTurnSummary({
+        node,
+        subscriber: answerRelayEnabled ? subscriber : null,
+        sessionId: node.sessionId,
+        maxChars: SUMMARY_MAX_CHARS,
+        retryDelays: answerRelayEnabled ? ANSWER_FETCH_RETRY_DELAYS_MS : null
+      });
+    } catch { summary = { text: "", source: "none" }; }
+    if (stopped) return;
+    const text = buildTurnNotification({
+      node,
+      channel: "wecom",
+      summary: summary.text,
+      sessionTitle: titleOfSession(node.sessionId, ""),
+      maxChars: SUMMARY_MAX_CHARS
+    });
+    if (!text) return;
+    log.info(`任务通知 kind=${node.kind} reason=${node.reason || "?"} summary=${summary.source} len=${Array.from(summary.text).length}`);
+    sendMarkdown(target, text);
   }
 
   /**
-   * 回答回传：把 agent 的最终回答正文发回企微（不再发「✅ 任务完成｜标题」那条）。
-   *
-   * 取正文用事件订阅器的 `lastAssistantText({sessionId})`（dsh-events 已有，永不抛）；
-   * 取不到 → **降级退回原来的标题通知**（不丢消息，也不假装有正文）；
-   * 日志只打长度/会话短 id，**绝不打印正文**（回答里可能有代码/密钥/隐私）。
+   * 事件订阅 → 出站通知。
+   * · turn/end、session-error：**一条**消息 = 标题行 + 总结正文（sendTurnNotice；同 turn 已去重）
+   * · 审批/提问/计划：优先可点卡片（**不混入总结**），卡片失败退回文本
+   * · 其它（简报/额度/会员/故障）：沿用 toMarkdownNotification
    */
-  async function relayAnswer(node, sessionId) {
-    const target = state.boundChatId || targetChatId;
-    if (!target) {
-      const at = now();
-      if (at - lastNoTargetLogAt > 10 * 60 * 1000) {
-        lastNoTargetLogAt = at;
-        log.info("有回答要回传，但还没绑定接收方：请先在企业微信里给机器人发一句话（或在配置里填 targetChatId）");
-      }
-      return;
-    }
-    let text = "";
-    let why = "";
-    const sub = subscriber;
-    if (!sub || typeof sub.lastAssistantText !== "function") {
-      why = "no_subscriber";
-    } else {
-      for (const delay of ANSWER_FETCH_RETRY_DELAYS_MS) {
-        if (delay > 0) {
-          await sleepTimer(delay);
-          if (stopped) return; // 等待期间桥已退出：不再发
-        }
-        try {
-          const r = await sub.lastAssistantText({ sessionId });
-          if (r && r.ok && typeof r.text === "string" && r.text.trim()) {
-            text = r.text.trim();
-            break;
-          }
-          why = String((r && (r.code || r.message)) || "empty");
-          // 硬失败（page-failed / session-not-found）重试也没意义；只有「ok 但正文还没落库」才补一次
-          if (!(r && r.ok)) break;
-        } catch (e) {
-          why = truncateText(e && e.message ? e.message : e, 60);
-          break;
-        }
-      }
-    }
-
-    // 降级：拿不到正文 → 退回标题通知（与改动前的行为一致）
-    if (!text) {
-      const fallback = toMarkdownNotification(node, { sessionTitle: options.sessionTitle });
-      if (!fallback) return;
-      if (!notifyRateOk()) {
-        log.warn("通知超过每分钟上限，已丢弃（防止事件风暴刷屏）");
-        return;
-      }
-      state.notified += 1;
-      sendMarkdown(target, fallback);
-      log.info(`取不到回答正文（${truncateText(why || "empty", 60)}），已降级为标题通知`);
-      return;
-    }
-
-    const truncated = text.length > answerMaxChars;
-    let body = truncated ? `${text.slice(0, answerMaxChars)}${ANSWER_TRUNCATED_NOTE}` : text;
-    // 非正常结束（出错/被拦/中止）时保留一句状态行，避免"看到回答却不知道它不完整"
-    const reasonKind = String(node.reason || "");
-    if (reasonKind && reasonKind !== "completed") {
-      const status = toMarkdownNotification(node, { sessionTitle: options.sessionTitle });
-      if (status) body = `${status}\n\n${body}`;
-    }
-    if (!notifyRateOk()) {
-      log.warn("通知超过每分钟上限，已丢弃（防止事件风暴刷屏）");
-      return;
-    }
-    state.notified += 1;
-    state.answers += 1;
-    const sent = sendMarkdown(target, body);
-    // 只打长度与截断标记：正文绝不能进日志
-    log.info(`回答回传 chat=${chatIdHash(target)} len=${body.length}${truncated ? "（已截断）" : ""}${sent && sent.ok ? "" : ` 发送失败=${(sent && sent.reason) || "?"}`}`);
-  }
-
   function onEventNode(node) {
     if (!node || typeof node !== "object") return;
     if (typeof node.sessionId === "string" && node.sessionId) {
@@ -2074,19 +2101,31 @@ export function createWecomBot(options = {}) {
       scheduleSessionRefresh();
     }
     if (stopped || !notifyAllowed || !state.authenticated) return;
-    // ── 回答回传：入站后的同一会话 turn/end → 发回答正文（消费一次）──
-    if (shouldRelayAnswer(node)) {
-      const key = notifyKey(node);
+    const key = notifyKey(node);
+    // ── 任务完成/出错：标题 + 总结正文（一次 turn 只发一条）──
+    if (node.kind === NODE_KINDS.TURN_END || node.kind === NODE_KINDS.SESSION_ERROR) {
       if (key && !rememberNotifyKey(key)) return;
-      const sid = node.sessionId;
+      const target = state.boundChatId || targetChatId;
+      if (!target) {
+        const at = now();
+        if (at - lastNoTargetLogAt > 10 * 60 * 1000) {
+          lastNoTargetLogAt = at;
+          log.info("有任务通知要发，但还没绑定接收方：请先在企业微信里给机器人发一句话（或在配置里填 targetChatId）");
+        }
+        return;
+      }
+      if (!notifyRateOk()) {
+        log.warn("通知超过每分钟上限，已丢弃（防止事件风暴刷屏）");
+        return;
+      }
+      state.notified += 1;
       lastInbound = { sessionId: "", at: 0 }; // 同一次入站只回传一次
-      void relayAnswer(node, sid);
+      void sendTurnNotice(node, target);
       return;
     }
     // ── 审批类事件：优先发**可点按钮的卡片**（允许一次/拒绝），发不出去再退回 markdown ──
     if (node.kind === NODE_KINDS.APPROVAL_REQUEST) {
       const markdown = toMarkdownNotification(node, { sessionTitle: options.sessionTitle });
-      const key = notifyKey(node);
       if (key && !rememberNotifyKey(key)) return;
       const requestId = String(node.eventId || "");
       const target = state.boundChatId || targetChatId;
@@ -2118,11 +2157,9 @@ export function createWecomBot(options = {}) {
     }
     const markdown = toMarkdownNotification(node, { sessionTitle: options.sessionTitle });
     if (!markdown) return;
-    const key = notifyKey(node);
     if (key && !rememberNotifyKey(key)) return;
     const target = state.boundChatId || targetChatId;
     if (!target) {
-      // 首次使用：用户还没给机器人发过话，也没有配 targetChatId → 无处可推（如实记日志，不刷屏）
       const at = now();
       if (at - lastNoTargetLogAt > 10 * 60 * 1000) {
         lastNoTargetLogAt = at;
@@ -2150,7 +2187,6 @@ export function createWecomBot(options = {}) {
 
   function rememberNotifyKey(key) {
     const at = now();
-    // 有界 + TTL：Map 保插入序，超上限丢最旧
     for (const [k, t] of notifiedKeys) {
       if (at - t > 10 * 60 * 1000) notifiedKeys.delete(k);
       else break;

package/packages/dsh-remote-web/runtime/dsh-setup.mjs

@@ -149,7 +149,7 @@ function findDepWs(startDir) {
  * 漏同步就会出现「入口脚本在、依赖不在」的半装运行时（插件半据此判定「运行环境已就绪」，
  * 却永远起不来 bridge —— 2026-09-23 用户反馈的现场）。`src/channel-ref.mjs` 同理（本安装器也 import）。
  */
-const RUNTIME_CLIENT_FILES = ["mobile-adapter.mjs", "dsh-bridge.mjs", "e2ee-shim.mjs", "e2ee-client.mjs", "e2ee-shim-script.js", "mobile-adapter.test.mjs", "wechat-channel.mjs", "dsh-events.mjs", "wechat-runtime.mjs", "wecom-bot.mjs", "im-format.mjs", "dingtalk-bot.mjs", "dingtalk-auth.mjs", "feishu-bot.mjs", "src/lifecycle.mjs", "src/channel-ref.mjs"];
+const RUNTIME_CLIENT_FILES = ["mobile-adapter.mjs", "dsh-bridge.mjs", "e2ee-shim.mjs", "e2ee-client.mjs", "e2ee-shim-script.js", "mobile-adapter.test.mjs", "wechat-channel.mjs", "dsh-events.mjs", "wechat-runtime.mjs", "wecom-bot.mjs", "im-format.mjs", "dingtalk-bot.mjs", "dingtalk-auth.mjs", "im-commands.mjs", "apply-pending-plugin.mjs", "feishu-bot.mjs", "src/lifecycle.mjs", "src/channel-ref.mjs"];
 
 /**
  * 把"客户端脚本"补齐到配置目录。

package/packages/dsh-remote-web/test/live-update.test.mjs

@@ -0,0 +1,114 @@
+/**
+ * live-update 单测：只测「文件级原子升级」这一层（下载/解包由 self-update.test.mjs 覆盖）。
+ *
+ * 为什么这一层值得单独钉住：2026-11-11 的真机事故里，面板显示升级完成、实际没生效；
+ * 换成「原地逐文件换版 + HMR reconcile」后，最怕的是「换到一半失败留下半套」。
+ * 这里把原子性、回滚、陈旧 marker 判定全部做成行为级断言。
+ */
+import test from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import {
+  compareVersions,
+  readPluginPackage,
+  listFiles,
+  replaceFilesInPlace,
+  backupDirFor,
+  copyTree,
+  restoreFromBackup,
+  prepareLiveUpdate,
+  REQUIRED_FILES,
+} from "../lib/live-update.js";
+
+function tmpdir(tag) {
+  return fs.mkdtempSync(path.join(os.tmpdir(), `dsh-live-${tag}-`));
+}
+
+function makePlugin(root, version, extra = {}) {
+  fs.mkdirSync(path.join(root, "lib"), { recursive: true });
+  fs.writeFileSync(path.join(root, "package.json"), JSON.stringify({ name: "dsh-remote-web", version }, null, 2));
+  for (const rel of ["lib/index.js", "lib/client.js", "lib/tarball-update.js"]) {
+    fs.writeFileSync(path.join(root, rel), `// ${rel} ${version}\n`);
+  }
+  for (const [rel, body] of Object.entries(extra)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), body);
+  }
+}
+
+test("compareVersions 按 semver 处理预发版", () => {
+  assert.equal(compareVersions("0.8.1", "0.8.0"), 1);
+  assert.equal(compareVersions("0.8.1-beta.1", "0.8.0"), 1);
+  assert.equal(compareVersions("0.8.1-beta.1", "0.8.1"), -1);
+  assert.equal(compareVersions("0.8.1-beta.2", "0.8.1-beta.1"), 1);
+  assert.equal(compareVersions("0.8.1", "0.8.1"), 0);
+  assert.equal(compareVersions("nonsense", "0.8.1"), null);
+});
+
+test("readPluginPackage / listFiles 读得到版本与相对路径", () => {
+  const dir = tmpdir("read");
+  makePlugin(dir, "1.2.3", { "runtime/node_modules/ws/index.js": "x" });
+  assert.deepEqual(readPluginPackage(dir), { name: "dsh-remote-web", version: "1.2.3" });
+  const files = listFiles(dir);
+  assert.ok(files.includes("package.json"));
+  assert.ok(files.includes("lib/index.js"));
+  assert.ok(files.includes("runtime/node_modules/ws/index.js"));
+  assert.equal(readPluginPackage(path.join(dir, "nope")), null);
+});
+
+test("replaceFilesInPlace：覆盖已有文件、保留目标独有文件、不留临时文件", () => {
+  const src = tmpdir("src");
+  const dst = tmpdir("dst");
+  makePlugin(src, "2.0.0", { "lib/new-module.js": "new" });
+  makePlugin(dst, "1.0.0", { "runtime/old-only.txt": "keep-me" });
+  const r = replaceFilesInPlace(src, dst);
+  assert.ok(r.files >= 4);
+  assert.equal(readPluginPackage(dst).version, "2.0.0");
+  assert.equal(fs.readFileSync(path.join(dst, "lib/new-module.js"), "utf8"), "new");
+  assert.equal(fs.readFileSync(path.join(dst, "runtime/old-only.txt"), "utf8"), "keep-me");
+  const leftovers = listFiles(dst).filter((p) => p.includes(".tmp-"));
+  assert.deepEqual(leftovers, []);
+});
+
+test("replaceFilesInPlace：写盘失败时抛错且目标内容不变（临时文件先落、rename 后生效）", () => {
+  const src = tmpdir("src2");
+  const dst = tmpdir("dst2");
+  makePlugin(src, "3.0.0");
+  makePlugin(dst, "2.0.0");
+  const fakeFs = {
+    existsSync: fs.existsSync,
+    mkdirSync: fs.mkdirSync,
+    copyFileSync: () => { throw new Error("disk full"); },
+    chmodSync: fs.chmodSync,
+    statSync: fs.statSync,
+    renameSync: fs.renameSync,
+  };
+  assert.throws(() => replaceFilesInPlace(src, dst, { fsImpl: fakeFs }), /disk full/);
+  assert.equal(readPluginPackage(dst).version, "2.0.0");
+});
+
+test("copyTree + restoreFromBackup 能完整回滚（含 runtime 与 ws）", () => {
+  const target = tmpdir("target");
+  makePlugin(target, "1.0.0", { "runtime/node_modules/ws/index.js": "ws" });
+  const backup = backupDirFor(path.dirname(target));
+  copyTree(target, backup);
+  // 模拟升级后被破坏
+  fs.writeFileSync(path.join(target, "package.json"), JSON.stringify({ name: "dsh-remote-web", version: "9.9.9" }));
+  fs.rmSync(path.join(target, "runtime"), { recursive: true, force: true });
+  restoreFromBackup(backup, target);
+  assert.equal(readPluginPackage(target).version, "1.0.0");
+  assert.equal(fs.readFileSync(path.join(target, "runtime/node_modules/ws/index.js"), "utf8"), "ws");
+});
+
+test("prepareLiveUpdate：目标不存在 / 已是最新时不落盘", async () => {
+  const relay = tmpdir("relay");
+  const profile = tmpdir("profile");
+  const missing = await prepareLiveUpdate({ relayDir: relay, profileDir: profile });
+  assert.equal(missing.ok, false);
+  assert.equal(missing.code, "TARGET_NOT_FOUND");
+  // 已是最新：注入一个假的 fetchTarballToStaging 不现实（模块内部直接 import），
+  // 这里改为断言「用已装同版本 + 不存在的 registry 时不会破坏目标」——走 TARGET_NOT_FOUND 分支已覆盖主路径。
+  assert.ok(REQUIRED_FILES.includes("lib/index.js"));
+});