@xiaoqiong0v0/opencode-ssh-tool 0.6.9 → 0.6.11

package/dist/log.js

@@ -1,5 +1,238 @@
-// 共享日志模块：全局单例 logger，避免各文件重复创建
+// 共享日志模块：全局单例 logger + 降噪辅助（debug 门控 / 短窗去重 / 跨进程去重）
+// 级别与开关口径（@xiaoqiong0v0/opencode-plugin-logger 1.0.6）：
+// - 级别只是标签：底层以 `log(level, msg)` 原样落盘 `[level]`，**无内置门槛/过滤**——只要全局 enabled=true，
+//   任何级别（含 "DEBUG"）都会写入；因此"debug 是否落盘"完全由本模块门控决定，而非底层级别。
+// - 全局开关：`~/.config/opencode/plugin-logger.jsonc` 的 `enabled`（默认 false）。关闭时底层所有方法都是空函数，
+//   本模块另以 LOG_ENABLED 同步判定，让各辅助函数**先判后做**（关闭时直接 return：不拼串 / 不建去重 Map / 不读写文件 / 不裁剪）。
+// - debug 级：由环境变量 SSH_TOOL_DEBUG=1 门控（默认关）；开启且全局 enabled 时经 `log("DEBUG", …)` 原生级别落盘。
+// 会话/终端标识约定（便于 `grep ses_xxx` 捞出一个会话的全部状态行）：
+// - 处于会话/终端上下文的行必须带 `<主会话ID>/<终端名>`（如 ses_abc/default）；命令坐标用 `seq=<命令序号>`；
+//   server 侧由 `sid:name` 键转成同一写法（server.ts keyTag），本地/SSH 传输层沿用既有的 `(session x, term y)` 写法。
+// - 进程级事件（插件加载、agent 连上/断开服务、独立服务启停与替换、锁清理）本身没有单一会话归属，
+//   只带 wsUrl / pid / port；若该事件牵涉具体终端（如断开受影响的终端、重连发现的运行中终端），
+//   把受影响的 `<主会话ID>/<终端名>` 列表打进同一行。独立服务是另一进程，只能看到 key=`sid:name`，
+//   拿不到 opencode 会话之外的上下文（其日志可按 sid 过滤，但无法按插件进程过滤）。
 import createLogger from "@xiaoqiong0v0/opencode-plugin-logger";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { stripAnsi } from "./ansi.js";
+import { CACHE_DIR } from "./constants.js";
 const log = createLogger("opencode-ssh-tool");
+/** 插件日志配置文件路径（与 opencode-plugin-logger 包内一致：~/.config/opencode/plugin-logger.jsonc） */
+const LOGGER_CONFIG_PATH = join(homedir(), ".config", "opencode", "plugin-logger.jsonc");
+/**
+ * 判断插件日志是否全局启用：底层 logger 在 `enabled=false` 时会把 info/warn/… 全替换为空函数，
+ * 但它**没有查询启用状态的 API**（返回对象只暴露方法），故这里按其同款口径自行解析配置：
+ * 读取 `~/.config/opencode/plugin-logger.jsonc` 的 `enabled`（默认 false，与包内 defaults 一致）。
+ * 配置路径与 JSONC 处理与包内 resolveCfg 保持一致（兼容注释）；任何读取/解析异常都降级为 false。
+ * @returns 是否启用（true=会产生日志输出）
+ */
+function resolveLogEnabled() {
+    try {
+        const raw = readFileSync(LOGGER_CONFIG_PATH, "utf8")
+            .replace(/\/\/.*$/gm, "")
+            .replace(/\/\*[\s\S]*?\*\//g, "");
+        return JSON.parse(raw).enabled === true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 全局日志开关（启动时解析一次）：logger 关闭时 info/warn/… 均为空函数，
+ * 本模块各辅助函数据此**先判后做**——关闭时直接 return，不再维护去重窗口 Map、不再做字符串拼装/裁剪/文件读写。
+ */
+const LOG_ENABLED = resolveLogEnabled();
+/**
+ * debug 日志开关：默认关闭。底层 1.0.6 的 `log("DEBUG", …)` 只是级别标签、**无默认门槛**（全局 enabled=true 即落盘），
+ * 故 debug 是否输出完全由本开关门控：周期性/心跳类细节（ssh2 协议 trace、探针 tick、轮询无变化等）
+ * 默认不落盘，置 SSH_TOOL_DEBUG=1 后才记录。
+ */
+const DEBUG_ENABLED = /^(1|true|yes)$/i.test(process.env.SSH_TOOL_DEBUG ?? "");
+/**
+ * 当前是否会真正产出 debug 级日志（"日志全局启用" 且 "SSH_TOOL_DEBUG 打开"）。
+ * 供调用方在**拼装日志字符串之前**短路（例如 ssh2 协议 trace 回调的注册），避免关闭时做无谓的字符串拼装。
+ * @returns 是否启用 debug 级日志
+ */
+export function isDebugEnabled() {
+    return LOG_ENABLED && DEBUG_ENABLED;
+}
+/**
+ * 记录 debug 级细节（周期性/心跳类噪声）：
+ * 默认不输出，置环境变量 SSH_TOOL_DEBUG=1 后才写日志，避免刷屏又不丢取证能力。
+ * 全局日志关闭时直接 return（不做任何拼装）。1.0.6 起用底层**原生级别** `log("DEBUG", …)` 落盘
+ * （`[DEBUG]` 标签由底层按级别输出），不再有 "info + `[DEBUG]` 前缀" 的写法；
+ * 调用方一律用 debug()/ssh2Trace()，不要自己写 log.info(...)（那样会绕过门控、无条件落盘）。
+ * @param msg 日志内容（按本模块约定，带会话上下文的行须含 `<主会话ID>/<终端名>`）
+ */
+export function debug(msg) {
+    if (!isDebugEnabled())
+        return;
+    log.log("DEBUG", msg);
+}
+/** 随收发数据量增长的 ssh2 协议行（一次大输出/大文件传输会产生成千上万条）——一律不记 */
+const SSH2_VOLUME_RE = /(CHANNEL_DATA|CHANNEL_EXTENDED_DATA|CHANNEL_WINDOW_ADJUST)/;
+/**
+ * ssh2 协议 trace 落盘（debug 级）：只记**有界**的连接/握手/认证类事件，
+ * `CHANNEL_DATA` / `CHANNEL_EXTENDED_DATA` / `CHANNEL_WINDOW_ADJUST` 这些**跟着输出/字节流增长**的协议行一律丢弃
+ * （避免"每收到/发出一个数据包就记一行"式刷屏）。
+ * @param tag 会话/终端标识（`<主会话ID>/<终端名>`）
+ * @param msg ssh2 协议 trace 原文
+ */
+export function ssh2Trace(tag, msg) {
+    if (!isDebugEnabled())
+        return;
+    if (SSH2_VOLUME_RE.test(msg))
+        return;
+    log.log("DEBUG", `[ssh2] ${tag} ${msg}`);
+}
+/**
+ * 取字符串最后 n 行（默认 3）：供"需要体现命令输出/缓冲内容"的日志做**有界摘要**，
+ * 避免多行内容（如多行命令回显）把一条日志撑成多行、随内容增长。
+ * 行数 ≤ n 时原样返回；全局日志关闭时直接返回原串（不做切分/裁剪）。
+ * @param s 原始字符串
+ * @param n 保留的最后行数（默认 3）
+ * @returns 至多 n 行的字符串
+ */
+export function tailLines(s, n = 3) {
+    if (!LOG_ENABLED)
+        return s;
+    const lines = s.split(/\r?\n/);
+    return lines.length <= n ? s : lines.slice(-n).join("\n");
+}
+/**
+ * 取命令输出供 `[run] 结束` 等日志附加的**有界尾部摘要**：
+ * 输出是含 ANSI 的原始流（`_extractOutput` 产物，非渲染文本），先剥净 ANSI；再按终端渲染口径归一化每行
+ * （行内 CR 覆盖只保留最后一次回车后的可见内容，避免进度条式行内刷新撑爆单行）、去行尾空白、剔除空行
+ * （与模型可见文本 toModelText 口径一致：协议框定/回显产生的空行不算"输出行"）。
+ * 仅当归一化后**行数 > n**（默认 3）时返回**末 n 行**，并把换行转义为 `\n` 字面量（保证整段摘要是单行、
+ * 不随输出增长）；行数 ≤ n 时返回空串（短输出正文里已见，不重复附）。只取末尾有界行数，绝不打整段输出/字节流。
+ * 全局日志关闭时直接返回空串（不做剥 ANSI / 切分 / 裁剪）。
+ * @param s 命令输出（可能含 ANSI 的原始流）
+ * @param n 保留的最后行数（默认 3）
+ * @returns 空串，或转义换行后的末 n 行
+ */
+export function tailSummary(s, n = 3) {
+    if (!LOG_ENABLED)
+        return "";
+    const lines = stripAnsi(s)
+        .split(/\r?\n/)
+        .map(normalizeOutputLine)
+        .filter((l) => l !== "");
+    if (lines.length <= n)
+        return "";
+    return lines.slice(-n).join("\\n");
+}
+/**
+ * 单行日志化归一：CR 覆盖只保留最后一次回车之后的可见内容（行尾孤立 CR 无覆盖内容时回退为去 CR），再去行尾空白。
+ * @param line 原始单行（已剥 ANSI，可能含行内 CR）
+ * @returns 归一化后的可见单行
+ */
+function normalizeOutputLine(line) {
+    const i = line.lastIndexOf("\r");
+    const visible = i >= 0 ? line.slice(i + 1) : line;
+    return (visible !== "" ? visible : line.replace(/\r/g, "")).trimEnd();
+}
+/** 进程内去重窗口（毫秒）：同 key 重复消息在此窗口内只记一次 */
+const DEDUP_WINDOW_MS = 3000;
+/** 各 key 的进程内去重状态：count=窗口内被抑制的次数，timer=窗口结束回补定时器 */
+const dedupState = new Map();
+/**
+ * 进程内短窗去重记录：同 key 首次立即输出；窗口内重复只计数不输出；
+ * 窗口结束时若有重复，补一条"<msg>（N 秒内重复 M 次）"，既不刷屏也不丢信息量。
+ * @param key 去重键（相同 key 的同义消息合并）
+ * @param msg 日志内容（首次与回补都用它）
+ * @param windowMs 去重窗口（默认 3000ms）
+ */
+export function infoDedup(key, msg, windowMs = DEDUP_WINDOW_MS) {
+    if (!LOG_ENABLED)
+        return;
+    const st = dedupState.get(key);
+    if (st) {
+        st.count += 1;
+        return;
+    }
+    log.info(msg);
+    const timer = setTimeout(() => {
+        const cur = dedupState.get(key);
+        if (!cur)
+            return;
+        dedupState.delete(key);
+        if (cur.count > 0)
+            log.info(`${msg}（${Math.round(windowMs / 1000)}s 内重复 ${cur.count} 次）`);
+    }, windowMs);
+    if (typeof timer.unref === "function")
+        timer.unref();
+    dedupState.set(key, { count: 0, timer });
+}
+/** 跨进程去重标记目录（放在插件缓存根下，多进程共享，供批量实例加载场景合并重复行） */
+const SHARED_DEDUP_DIR = join(homedir(), CACHE_DIR, ".log-dedup");
+/** 把去重键规整为安全文件名（非字母数字替换为下划线） */
+function dedupSafeName(key) {
+    return key.replace(/[^A-Za-z0-9_.-]/g, "_").slice(0, 100);
+}
+/** 已排定"窗口结束回补汇总"定时器的跨进程 key（避免同进程重复排定） */
+const sharedTimerKeys = new Set();
+/**
+ * 跨进程短窗去重：多个 opencode 插件实例（各自独立进程）写同一日志文件时，
+ * 用共享目录下的标记文件记录上次输出时刻与合并计数，窗口内的重复只记一次；
+ * 创建窗口的进程在窗口结束时读计数补一条"N 秒内重复 M 次"，避免每个实例刷一整套。
+ * 任何文件读写失败都静默降级为直接输出（不阻断日志，不影响插件行为）。
+ * @param key 去重键（跨进程一致）
+ * @param msg 日志内容
+ * @param windowMs 去重窗口（默认 5000ms）
+ */
+export function infoDedupShared(key, msg, windowMs = 5000) {
+    if (!LOG_ENABLED)
+        return;
+    try {
+        const file = join(SHARED_DEDUP_DIR, dedupSafeName(key));
+        const now = Date.now();
+        let prev = null;
+        try {
+            prev = JSON.parse(readFileSync(file, "utf8"));
+        }
+        catch {
+            prev = null;
+        }
+        if (prev && now - prev.ts < windowMs) {
+            // 窗口内：仅累加计数，抑制输出
+            prev.count += 1;
+            writeFileSync(file, JSON.stringify(prev), "utf8");
+            return;
+        }
+        mkdirSync(SHARED_DEDUP_DIR, { recursive: true });
+        writeFileSync(file, JSON.stringify({ ts: now, count: 0 }), "utf8");
+        // 上一窗口有合并的重复：先补一条汇总，再输出本次
+        if (prev && prev.count > 0) {
+            log.info(`${msg}（上次窗口内重复 ${prev.count} 次）`);
+        }
+        log.info(msg);
+        // 窗口结束回补本窗口合并计数（本进程仍存活时；置 0 避免与下次懒汇总重复）
+        if (!sharedTimerKeys.has(key)) {
+            sharedTimerKeys.add(key);
+            const timer = setTimeout(() => {
+                sharedTimerKeys.delete(key);
+                try {
+                    const cur = JSON.parse(readFileSync(file, "utf8"));
+                    if (cur && cur.count > 0) {
+                        log.info(`${msg}（${Math.round(windowMs / 1000)}s 内重复 ${cur.count} 次）`);
+                        cur.count = 0;
+                        writeFileSync(file, JSON.stringify(cur), "utf8");
+                    }
+                }
+                catch {
+                    /* 标记文件已不在，忽略 */
+                }
+            }, windowMs);
+            if (typeof timer.unref === "function")
+                timer.unref();
+        }
+    }
+    catch {
+        log.info(msg);
+    }
+}
 export default log;
 //# sourceMappingURL=log.js.map

package/dist/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,YAAY,MAAM,sCAAsC,CAAA;AAE/D,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAA;AAE7C,eAAe,GAAG,CAAA"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,uDAAuD;AACvD,iFAAiF;AACjF,yDAAyD;AACzD,wFAAwF;AACxF,sFAAsF;AACtF,sFAAsF;AACtF,6CAA6C;AAC7C,2EAA2E;AAC3E,6FAA6F;AAC7F,uDAAuD;AACvD,4DAA4D;AAC5D,iEAAiE;AACjE,oDAAoD;AACpD,OAAO,YAAY,MAAM,sCAAsC,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAA;AAE7C,uFAAuF;AACvF,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,qBAAqB,CAAC,CAAA;AAExF;;;;;;GAMG;AACH,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,kBAAkB,EAAE,MAAM,CAAC;aACjD,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;aACxB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAA;QACnC,OAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAA2B,CAAC,OAAO,KAAK,IAAI,CAAA;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,WAAW,GAAG,iBAAiB,EAAE,CAAA;AAEvC;;;;GAIG;AACH,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;AAE9E;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,WAAW,IAAI,aAAa,CAAA;AACrC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,KAAK,CAAC,GAAW;IAC/B,IAAI,CAAC,cAAc,EAAE;QAAE,OAAM;IAC7B,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;AACvB,CAAC;AAED,oDAAoD;AACpD,MAAM,cAAc,GAAG,4DAA4D,CAAA;AAEnF;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,GAAW;IAChD,IAAI,CAAC,cAAc,EAAE;QAAE,OAAM;IAC7B,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAM;IACpC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC,CAAA;AAC1C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CAAC,CAAS,EAAE,CAAC,GAAG,CAAC;IACxC,IAAI,CAAC,WAAW;QAAE,OAAO,CAAC,CAAA;IAC1B,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC9B,OAAO,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3D,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CAAC,CAAS,EAAE,CAAC,GAAG,CAAC;IAC1C,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAA;IAC3B,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;SACvB,KAAK,CAAC,OAAO,CAAC;SACd,GAAG,CAAC,mBAAmB,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAC1B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,EAAE,CAAA;IAChC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AACpC,CAAC;AAED;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,IAAY;IACvC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACjD,OAAO,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;AACvE,CAAC;AAED,sCAAsC;AACtC,MAAM,eAAe,GAAG,IAAI,CAAA;AAC5B,qDAAqD;AACrD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAmE,CAAA;AAE7F;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,GAAW,EAAE,QAAQ,GAAG,eAAe;IAC5E,IAAI,CAAC,WAAW;QAAE,OAAM;IACxB,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,EAAE,EAAE,CAAC;QACP,EAAE,CAAC,KAAK,IAAI,CAAC,CAAA;QACb,OAAM;IACR,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACb,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC5B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG;YAAE,OAAM;QAChB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,KAAK,KAAK,CAAC,CAAA;IAC3F,CAAC,EAAE,QAAQ,CAAC,CAAA;IACZ,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU;QAAE,KAAK,CAAC,KAAK,EAAE,CAAA;IACpD,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AAC1C,CAAC;AAED,+CAA+C;AAC/C,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAA;AAEjE,gCAAgC;AAChC,SAAS,aAAa,CAAC,GAAW;IAChC,OAAO,GAAG,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC3D,CAAC;AAED,0CAA0C;AAC1C,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAA;AAEzC;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,GAAW,EAAE,GAAW,EAAE,QAAQ,GAAG,IAAI;IACvE,IAAI,CAAC,WAAW;QAAE,OAAM;IACxB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,IAAI,IAAI,GAAyC,IAAI,CAAA;QACrD,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAkC,CAAA;QAChF,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,GAAG,IAAI,CAAA;QACb,CAAC;QACD,IAAI,IAAI,IAAI,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC;YACrC,iBAAiB;YACjB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA;YACf,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;YACjD,OAAM;QACR,CAAC;QACD,SAAS,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAChD,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;QAClE,0BAA0B;QAC1B,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,IAAI,CAAC,KAAK,KAAK,CAAC,CAAA;QAC7C,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACb,wCAAwC;QACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACxB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC3B,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAkC,CAAA;oBACnF,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;wBACzB,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,KAAK,KAAK,CAAC,CAAA;wBACtE,GAAG,CAAC,KAAK,GAAG,CAAC,CAAA;wBACb,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;oBAClD,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,gBAAgB;gBAClB,CAAC;YACH,CAAC,EAAE,QAAQ,CAAC,CAAA;YACZ,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU;gBAAE,KAAK,CAAC,KAAK,EAAE,CAAA;QACtD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACf,CAAC;AACH,CAAC;AAED,eAAe,GAAG,CAAA"}

package/dist/server-entry.js

@@ -27,7 +27,7 @@ async function main() {
     const handle = await startServer(port, getSessions, dir, lang, streamTickMs);
     // 写服务信息文件（供其他进程探测复用；proto 标识代码/协议版本，版本不符会触发重启）
     writeFileSync(join(dir, INFO_FILE), JSON.stringify({ port: handle.port, host: "127.0.0.1", pid: process.pid, startedAt: Date.now(), proto: SERVER_PROTO_VERSION }), "utf8");
-    log.info(`独立服务启动 ${handle.url} (pid ${process.pid})`);
+    log.info(`独立服务启动 ${handle.url} (pid ${process.pid}, proto ${SERVER_PROTO_VERSION})，内存流缓冲 streamBuf 初始为空（新进程不复用旧内存，旧进程追踪中的命令状态需 agent 重连后重新上报）`);
     // 空闲自动关闭：无任何 connected 会话持续 idleShutdownMs 后退出（0=不关闭）
     if (idleShutdownMs > 0) {
         let idleSince = Date.now();

package/dist/server-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../src/server-entry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../src/server-entry.ts"],"names":[],"mappings":"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"}

package/dist/server-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-manager.d.ts","sourceRoot":"","sources":["../src/server-manager.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAIrC,qCAAqC;AACrC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,IAAI,CAAA;IACZ,WAAW;IACX,GAAG,EAAE,MAAM,CAAA;IACX,WAAW;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,0BAA0B;IAC1B,MAAM,EAAE,OAAO,CAAA;CAChB;AA4ND;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,OAAO,EAAE,EAC5B,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,IAAW,GAChB,OAAO,CAAC,YAAY,CAAC,CAQvB"}
+{"version":3,"file":"server-manager.d.ts","sourceRoot":"","sources":["../src/server-manager.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAIrC,qCAAqC;AACrC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,IAAI,CAAA;IACZ,WAAW;IACX,GAAG,EAAE,MAAM,CAAA;IACX,WAAW;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,0BAA0B;IAC1B,MAAM,EAAE,OAAO,CAAA;CAChB;AA8ND;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,OAAO,EAAE,EAC5B,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,IAAW,GAChB,OAAO,CAAC,YAAY,CAAC,CAQvB"}

package/dist/server-manager.js

@@ -7,7 +7,7 @@ import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
 import { createServer } from "node:net";
 import { SERVER_PROTO_VERSION } from "./constants.js";
-import log from "./log.js";
+import log, { infoDedupShared } from "./log.js";
 const LOCK_DIR = "server.lock";
 const INFO_FILE = "server.json";
 /** 锁目录内的属主信息文件名（pid + 创建时间，用于判定陈旧锁） */
@@ -197,6 +197,7 @@ async function killStale(info) {
     }
     try {
         process.kill(info.pid, "SIGTERM");
+        log.info(`终止旧独立服务 pid=${info.pid}（端口 ${info.port}，等待端口释放）`);
     }
     catch {
         // 进程可能已退出或无权 kill，交由端口探测判断
@@ -207,6 +208,7 @@ async function killStale(info) {
             return;
         await new Promise((r) => setTimeout(r, 200));
     }
+    log.warn(`旧独立服务 pid=${info.pid} 未在 ${KILL_WAIT_MAX}ms 内释放端口 ${info.port}，继续尝试启动新服务`);
 }
 /** 失败结果：url 为空串，调用方据此判定服务不可用（命令执行不受影响） */
 function failedResult() {
@@ -246,14 +248,18 @@ export function ensureServer(port, getSessions, dir, lang = "en") {
  */
 async function ensureServerOnce(port, _getSessions, dir, lang = "en") {
     mkdirSync(dir, { recursive: true });
+    /** 本次被终止/判定为陈旧的旧服务 pid（用于日志对齐"旧 pid → 新 pid"的替换关系） */
+    let replacedPid = null;
     // 1. 探测既有服务（固定端口场景可复用；旧版本实例不复用，杀旧后新启）
     if (port > 0) {
         const info = readInfo(dir);
         if (isCurrentVersion(info) && info.port === port && (await probe(port))) {
+            infoDedupShared(`reuse-service:${port}`, `复用现有独立服务 pid=${info.pid} port=${port}（proto ${info.proto}）`, 10000);
             return { server: null, url: `http://127.0.0.1:${port}`, port, reused: true };
         }
         if (info && info.port === port && (await probe(port)) && !isCurrentVersion(info)) {
             log.info(`检测到旧版服务 pid=${info.pid}（proto ${info.proto ?? "?"}），重启独立服务`);
+            replacedPid = info.pid;
             await killStale(info);
         }
     }
@@ -267,9 +273,11 @@ async function ensureServerOnce(port, _getSessions, dir, lang = "en") {
             await new Promise((r) => setTimeout(r, 200));
             const info = readInfo(dir);
             if (info && isCurrentVersion(info) && (await probe(info.port))) {
+                infoDedupShared(`reuse-service:${info.port}`, `复用现有独立服务 pid=${info.pid} port=${info.port}（锁竞争等待后探测到）`, 10000);
                 return { server: null, url: `http://127.0.0.1:${info.port}`, port: info.port, reused: true };
             }
             if (info && !isCurrentVersion(info) && (await probe(info.port))) {
+                replacedPid = info.pid;
                 await killStale(info);
             }
             acquired = acquireLock(dir);
@@ -280,8 +288,10 @@ async function ensureServerOnce(port, _getSessions, dir, lang = "en") {
     try {
         // 3. 拿锁成功：先清残留旧进程（可能 pid 已退出或锁内刚杀掉），再启动新版
         const leftover = readInfo(dir);
-        if (leftover && !isCurrentVersion(leftover))
+        if (leftover && !isCurrentVersion(leftover)) {
+            replacedPid = leftover.pid;
             await killStale(leftover);
+        }
         // 固定端口：spawn 前预检可绑定，绑定被拒（如 Windows 保留区间 EACCES）立即失败，不回退不重试
         if (port > 0) {
             const code = await probeBindable(port);
@@ -300,6 +310,12 @@ async function ensureServerOnce(port, _getSessions, dir, lang = "en") {
             }
             const info = readInfo(dir);
             if (info && isCurrentVersion(info) && (await probe(info.port))) {
+                if (replacedPid !== null) {
+                    log.info(`独立服务已替换 ${replacedPid} -> ${info.pid}（port ${info.port}）`);
+                }
+                else {
+                    log.info(`独立服务已启动 pid=${info.pid} port=${info.port}（本进程启动，非复用）`);
+                }
                 return { server: null, url: `http://127.0.0.1:${info.port}`, port: info.port, reused: false };
             }
             await new Promise((r) => setTimeout(r, 200));

package/dist/server-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-manager.js","sourceRoot":"","sources":["../src/server-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-manager.js","sourceRoot":"","sources":["../src/server-manager.ts"],"names":[],"mappings":"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"}

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,MAAM,EAAwB,MAAM,WAAW,CAAA;AAO3E,OAAO,EAAoB,KAAK,IAAI,EAAE,MAAM,WAAW,CAAA;AAIvD,MAAM,WAAW,WAAW;IAC1B,UAAU,IAAI;QAAE,QAAQ,IAAI,OAAO,EAAE,CAAA;KAAE,CAAA;IACvC,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;IACpB,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAaD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAA;IACnC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACb;AAuCD,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,YAAY,EAAE,EAClC,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,IAAW,EACjB,aAAa,SAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAgdvB"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,MAAM,EAAwB,MAAM,WAAW,CAAA;AAO3E,OAAO,EAAoB,KAAK,IAAI,EAAE,MAAM,WAAW,CAAA;AAIvD,MAAM,WAAW,WAAW;IAC1B,UAAU,IAAI;QAAE,QAAQ,IAAI,OAAO,EAAE,CAAA;KAAE,CAAA;IACvC,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;IACpB,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAaD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAA;IACnC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACb;AAkDD,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,YAAY,EAAE,EAClC,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,IAAW,EACjB,aAAa,SAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAmfvB"}

package/dist/server.js

@@ -9,7 +9,7 @@ import { WebSocketServer, WebSocket } from "ws";
 import { listAllSessions, removeSessionState } from "./session-store.js";
 import { tr } from "./i18n.js";
 import { PTY_COLS, PTY_ROWS } from "./constants.js";
-import log from "./log.js";
+import log, { infoDedup } from "./log.js";
 const PAGE_KEYS = [
     "web_title",
     "web_loading",
@@ -33,6 +33,16 @@ const JS_I18N_KEYS = {
 };
 const STATUS_PUSH_MS = 2000;
 const sessionKey = (sid, name) => `${sid}:${name}`;
+/**
+ * 会话键（`sid:name`）转日志显示形式（`sid/name`）：与终端侧 `[busy]`/`[run]` 行同一写法，
+ * 保证所有带会话上下文的日志都能用同一个 `<主会话ID>/<终端名>` 口径 grep。
+ * @param sKey 会话键（sid:name）
+ * @returns 显示用标签（ses_xxx/default）；无分隔符时原样返回
+ */
+const keyTag = (sKey) => {
+    const i = sKey.indexOf(":");
+    return i < 0 ? sKey : `${sKey.slice(0, i)}/${sKey.slice(i + 1)}`;
+};
 export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs = 100) {
     let actualPort = port;
     const webDir = join(dirname(fileURLToPath(import.meta.url)), "web");
@@ -44,6 +54,21 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
     const cmdCount = new Map();
     /** 排队序列保持 busy 的 key（agent 报 more=true 加入，最后一条 done 移除） */
     const seqHold = new Set();
+    /** server 侧各终端最近一次的对外 busy 状态（仅用于日志：翻转时记一行） */
+    const busyState = new Map();
+    /**
+     * 记录 server 侧 busy 翻转（仅在值变化时输出一行，带 session/终端/原因）：
+     * 与终端侧 [busy] 行互补，便于对齐"server 认为忙/闲"的时间线。
+     * @param sKey 会话键（sid:name）
+     * @param next 目标 busy 值
+     * @param reason 翻转原因（cmdStart / cmdDone / exec / 无 agent 强制 done / 状态文件回退 等）
+     */
+    const logBusy = (sKey, next, reason) => {
+        if (busyState.get(sKey) === next)
+            return;
+        busyState.set(sKey, next);
+        log.info(`[busy] server ${keyTag(sKey)} busy=${next} reason=${reason}`);
+    };
     const server = createServer((req, res) => {
         const url = new URL(req.url ?? "/", "http://127.0.0.1");
         const path = url.pathname;
@@ -122,16 +147,15 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
         const seen = new Set();
         const liveKey = new Set(agentBySession.keys());
         const liveBusy = new Map();
-        const now = Date.now();
-        // 兜底：streamBuf 中 agent 连接已消失的 key 强制清 busy（agent 崩溃/退出防卡死）。
-        // 注意不能用"无 out 超时"判定——交互命令（sudo/read 等输入）等待期间无输出，
-        // 但 agent 仍在，命令未完成，busy 必须保持 true（完成由 agent 生命周期钩子兜底，仅断连时 watch 补发 done，无超时强杀）
+        // 兜底：streamBuf 中 agent 连接已消失的 key —— **不假报完成**。
+        // agent 掉线 ≠ 命令完成：此处不 finalizeCommand、不发 diff done、不改 done 标志，
+        // 保持"未完成（busy 不变）"并仅把"agent 离线、命令状态未知"显式落盘（短窗去重防每 2s 刷屏）；
+        // agent 重连会补播 cmdStart 恢复状态。注意不能用"无 out 超时"判定——交互命令（sudo/read 等输入）
+        // 等待期间无输出，但 agent 仍在、命令未完成，busy 必须保持 true。
+        // 命令真实结束只认 agent 上报的当前 seq 完成标记（cmdDone），会话拆除路径另算。
         for (const [key, b] of streamBuf) {
             if (b && !b.done && !agentBySession.has(key)) {
-                b.done = true;
-                b.ts = now;
-                b.endTs = now;
-                finalizeCommand(key);
+                infoDedup(`agent-offline:${key}`, `[fallback] ${keyTag(key)} 无 agent 连接：命令状态未知（保持未完成，不判完成/不发 diff done）command=${JSON.stringify((b.command ?? "").slice(0, 120))} ts=${b.ts}`);
             }
             if (!agentBySession.has(key))
                 seqHold.delete(key); // agent 已消失：清排队序列 busy 保持
@@ -145,6 +169,9 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
             const busy = liveBusy.get(lk);
             if (busy !== undefined)
                 s.busy = busy;
+            // 盲点显式化：拿不到 agent/实时流状态时，busy 回退取状态文件（可能是命令执行前写的旧值，未必可靠）
+            else
+                logBusy(lk, !!s.busy, "状态文件回退(无 agent 状态)");
             seen.add(sessionKey(s.sessionID, s.name));
         }
         const bySession = new Map();
@@ -265,6 +292,11 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
                     agents.get(ws).add(k);
                     agentBySession.set(k, ws);
                 }
+                {
+                    // 记录 agent 上报的会话列表（批量实例注册同一列表时按内容去重），便于对齐 server 侧视角
+                    const keys = [...(agents.get(ws) ?? [])];
+                    infoDedup(`agent-register:${keys.slice().sort().join(",")}`, `agent 注册 ${keys.length} 个会话: ${keys.length ? keys.map(keyTag).join(", ") : "无"}`);
+                }
                 return;
             }
             if (t === "cmdStart") {
@@ -275,6 +307,7 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
                     return;
                 const k = sessionKey(sid, name);
                 seqHold.delete(k); // 新命令开始：本条正在运行，busy 由 streamBuf 反映
+                logBusy(k, true, "cmdStart");
                 const existing = streamBuf.get(k);
                 streamBuf.set(k, {
                     data: existing && existing.done ? "" : existing?.data ?? "",
@@ -356,6 +389,7 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
                 else {
                     streamBuf.set(k, { data: "", done: true, ts: Date.now(), endTs: typeof msg.endTs === "number" ? msg.endTs : Date.now(), command: "" });
                 }
+                logBusy(k, msg.more === true, msg.more === true ? "cmdDone(more 保持 busy)" : "cmdDone");
                 finalizeCommand(k);
                 pushSessions();
                 return;
@@ -486,6 +520,7 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
                 const k = sessionKey(sid, name);
                 const existing = streamBuf.get(k);
                 streamBuf.set(k, { data: existing && existing.done ? "" : existing?.data ?? "", done: false, ts: Date.now(), command });
+                logBusy(k, true, "exec");
                 pushSessions();
                 send(agent, { type: "run-exec", reqId: `${sid}:${name}:${Date.now()}`, sessionID: sid, name, command });
                 return;
@@ -519,6 +554,7 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
                 catch { /* 目录不存在忽略 */ }
                 streamBuf.delete(sessionKey(sid, name));
                 rawBuf.delete(sessionKey(sid, name));
+                busyState.delete(sessionKey(sid, name));
                 log.info(`Web 页删除终端 ${sid}/${name}`);
                 pushSessions();
                 return;
@@ -527,9 +563,12 @@ export function startServer(port, _getSessions, dir, lang = "en", _streamTickMs
         ws.on("close", () => {
             const reg = agents.get(ws);
             if (reg) {
+                // 盲点显式化：agent 断开时记录受影响的终端列表（仅 agent 连接，web 订阅者不在此列）
+                const keys = [...reg];
                 for (const k of reg)
                     agentBySession.delete(k);
                 agents.delete(ws);
+                infoDedup(`agent-disconnect:${keys.slice().sort().join(",")}`, `agent 断开（受影响终端: ${keys.length ? keys.map(keyTag).join(", ") : "无"}）`);
             }
         });
     });