dsh-wechat-remote 1.7.9 → 1.7.10

package/README.md

@@ -1,6 +1,6 @@
 # Agent远程管理助手 · DSH 插件安装器
 
-当前版本为 `1.7.9`，内嵌同版本正式插件。
+当前版本为 `1.7.9`，内嵌同版本正式插件。
 
 首次安装和升级旧插件使用同一个命令：
 
@@ -16,9 +16,9 @@ DSH 的新版本、预览版本或未登记的主机架构不会仅因缺少验
 
 本版沿用此前已验证的跨平台安装方案，具体发行包与宿主组合以验收记录为准。普通 Node 启动、独立的 macOS launchd 和 Linux 用户级 systemd 服务有对应的自动恢复方式；无法确认启动方式时不自动停止主机。
 
-安装过程中请等待完成，勿重复执行命令。
-
-本版安装器内置完整插件，安装当前版本不依赖 GitHub 附件下载。安装后，WebUI 一键更新在 GitHub 网络下载失败时可以从已核验的 npm 安装包中取回同一插件。该能力不回写旧插件；旧插件遇到 GitHub 下载失败时，先使用上面的 npm 命令升级即可。
+安装过程中请等待完成，勿重复执行命令。
+
+本版安装器内置完整插件，安装当前版本不依赖 GitHub 附件下载。安装后，WebUI 一键更新在 GitHub 网络下载失败时可以从已核验的 npm 安装包中取回同一插件。该能力不回写旧插件；旧插件遇到 GitHub 下载失败时，先使用上面的 npm 命令升级即可。
 
 旧插件的一键更新如被版本或架构判断拦截，可用上述安装命令升级一次。从插件 1.7.6 起，未登记的 CPU 架构或 DSH 版本不再影响更新入口；执行前仍会检查实际安装与重启条件，无需因此降低 DSH 版本或删除节点。
 

package/assets/release.json

@@ -1,29 +1,47 @@
 {
-  "version": "1.7.9",
+  "version": "1.7.10",
   "catalog": {
     "schemaVersion": 1,
-    "revision": "installer-1.7.9",
-    "issuedAt": 1790053952064,
-    "expiresAt": 1792473152064,
+    "revision": "installer-1.7.10",
+    "issuedAt": 1790187001683,
+    "expiresAt": 1792606201683,
     "releases": [
       {
-        "version": "1.7.9",
+        "version": "1.7.10",
         "channel": "stable",
         "dsh": [
-          "0.1.5-rc.1"
+          "0.1.5-rc.1",
+          "0.1.7-rc.1"
         ],
         "platforms": [
-          "windows",
-          "macos"
+          "macos",
+          "linux"
         ],
         "architectures": [
           "x64"
         ],
         "asset": {
-          "url": "https://github.com/martinbear1/dsh-wechat-remote/releases/download/v1.7.9/harness-remote-dsh-wechat-remote-1.7.9.tgz",
-          "sha256": "c0b592f90d67e63af3b4f03592bf1365828c7d404f0b5d3a812ca4a1a8439cda",
-          "bytes": 10361441
-        }
+          "url": "https://github.com/martinbear1/dsh-wechat-remote/releases/download/v1.7.10/harness-remote-dsh-wechat-remote-1.7.10.tgz",
+          "sha256": "f146d61eb8f301012d5c52da82efb469a38e46d27a6f16d128b546b68650d48e",
+          "bytes": 10362228
+        },
+        "targets": [
+          {
+            "platform": "macos",
+            "arch": "x64",
+            "dsh": [
+              "0.1.5-rc.1",
+              "0.1.7-rc.1"
+            ]
+          },
+          {
+            "platform": "linux",
+            "arch": "x64",
+            "dsh": [
+              "0.1.5-rc.1"
+            ]
+          }
+        ]
       }
     ],
     "blocked": [],

package/bin/native-recovery.mjs

@@ -1,5 +1,5 @@
-/** Verify a restored, plugin-free DSH through the same native control adapter.
- * Only the first-install rollback uses this; ordinary updates probe the plugin.
+/** Verify a restored DSH through the same independent native control adapter.
+ * Also supports restoring an already-broken plugin, without claiming it is fixed.
  * Bundled outside the profile so neither a failed add nor rollback removes it. */
 import fs from 'node:fs'
 import path from 'node:path'
@@ -29,7 +29,7 @@ export async function verifyNativeRestore(job, start, sessionIds, readableIds) {
       && /^http:\/\/127\.0\.0\.1:[1-9]\d{0,4}$/.test(value.origin), 180000)
     const host = await request('describe')
     if (host.pid !== ref.pid || host.home !== job.home || host.profile !== job.profile
-      || host.cli !== job.cli || host.dshVersion !== job.dshVersion || host.pluginVersion !== '0.0.0') {
+      || host.cli !== job.cli || host.dshVersion !== job.dshVersion || host.pluginVersion !== job.previousVersion) {
       throw new Error('恢复后的 DSH 身份不匹配。')
     }
     const items = (await request('read', { method: 'session.list' })).items

package/bin/setup.mjs

@@ -66,7 +66,10 @@ async function installStopped({ cli, home, profile, profileName, directory, id,
   const dsh = validateDshCli(cli)
   let version = '0.0.0'
   try { version = JSON.parse(fs.readFileSync(path.join(profile, 'node_modules', packageName, 'package.json'), 'utf8')).version } catch {}
-  const selected = await selectRelease({ dshVersion: dsh.version, pluginVersion: version, platform: process.platform, arch: process.arch }, assetsRoot, repair)
+  // A stopped host cannot prove its installed copy is loadable. Re-executing
+  // the normal installation command also repairs that copy (never downgrades),
+  // using the same backed-up native add rather than a second repair workflow.
+  const selected = await selectRelease({ dshVersion: dsh.version, pluginVersion: version, platform: process.platform, arch: process.arch }, assetsRoot, repair || version !== '0.0.0')
   fs.mkdirSync(profile, { recursive: true, mode: 0o700 })
   if (fs.realpathSync(profile) !== profile) throw new Error('无法确认 DSH 配置目录的实际位置。')
   const lock = path.join(profile, '.harness-remote-update.lock')
@@ -178,7 +181,9 @@ export async function install({ profileName = 'web', cli, home: configuredHome,
       let ready = false
       try {
         const response = await fetch(`http://127.0.0.1:${host.localPort}/gate/status`, { signal: AbortSignal.timeout(5000), redirect: 'error' })
-        await response.arrayBuffer(); ready = response.ok
+        await response.arrayBuffer()
+        const business = response.ok ? await control(job, 'health') : undefined
+        ready = business?.ready === true
       } catch {}
       if (!ready) {
         console.log('检测到已安装插件尚未就绪，正在重新安装修复…')
@@ -192,7 +197,9 @@ export async function install({ profileName = 'web', cli, home: configuredHome,
     validateJob(job)
     fs.writeFileSync(path.join(directory, 'release.tgz'), selected.archive, { mode: 0o600, flag: 'wx' })
     fs.copyFileSync(path.join(root, 'lib/update-worker.js'), path.join(directory, 'update-worker.js'))
-    if (host.pluginVersion === '0.0.0') fs.copyFileSync(path.join(root, 'lib/native-recovery.js'), path.join(directory, 'native-recovery.js'))
+    // Recovery belongs to the independent installer, including when the old
+    // plugin already failed before this operation and cannot serve health RPC.
+    fs.copyFileSync(path.join(root, 'lib/native-recovery.js'), path.join(directory, 'native-recovery.js'))
     writePrivateJsonAtomic(path.join(directory, 'job.json'), job)
     await control(job, 'launch')
     const ready = await waitForJson(path.join(directory, 'worker-ready.json'), v => v.id === id)

package/lib/install-control.js

@@ -1,8 +1,8 @@
 /* Generated from the shared plugin installation sources. */
 
 // src/install-control.ts
-import fs2 from "node:fs";
-import path5 from "node:path";
+import fs3 from "node:fs";
+import path6 from "node:path";
 import http from "node:http";
 
 // src/dsh-runtime.ts
@@ -617,6 +617,84 @@ function withPresentationProjections(block) {
   return { ...source, values };
 }
 
+// src/dsh-host-contract.ts
+import fs from "node:fs";
+import path4 from "node:path";
+var contracts = /* @__PURE__ */ new WeakMap();
+function runningDshVersion(entry = process.argv[1]) {
+  if (!entry) return;
+  let directory;
+  try {
+    directory = path4.dirname(fs.realpathSync(entry));
+  } catch {
+    return;
+  }
+  for (let depth = 0; depth < 8; depth++) {
+    try {
+      const manifest = JSON.parse(fs.readFileSync(path4.join(directory, "package.json"), "utf8"));
+      if (manifest.name === "@deepseek-ai/dsh") return manifest.version;
+    } catch {
+    }
+    const parent = path4.dirname(directory);
+    if (parent === directory) break;
+    directory = parent;
+  }
+}
+function usesDuplexEvents(version) {
+  if (!version) return false;
+  const match = /^(\d+)\.(\d+)\.(\d+)(?:-[\w.-]+)?$/.exec(version);
+  if (!match) throw new Error("\u65E0\u6CD5\u8BC6\u522B\u5F53\u524D DSH \u4E8B\u4EF6\u534F\u8BAE\u7248\u672C");
+  const [, major, minor, patch] = match.map(Number);
+  return major > 0 || minor > 1 || minor === 1 && patch >= 7;
+}
+function openHostEvents(gateway, endpoint, payload, signal) {
+  let contract = contracts.get(gateway);
+  if (!contract) {
+    contract = { duplex: usesDuplexEvents(runningDshVersion()) };
+    contracts.set(gateway, contract);
+  }
+  signal.throwIfAborted();
+  const empty = { async *[Symbol.asyncIterator]() {
+  } };
+  return contract.duplex ? gateway.wireStream.open(endpoint, payload, empty, void 0, signal) : gateway.wireStream.open(endpoint, payload, signal);
+}
+function projectedSubagentCatalog(parent, projection, rows) {
+  const entries = projection?.values?.subagentCatalog;
+  if (!Array.isArray(entries) || !Array.isArray(rows)) throw new Error("DSH \u5B50\u4EE3\u7406\u76EE\u5F55\u6682\u4E0D\u53EF\u8BFB\u53D6");
+  const byId = new Map(rows.map((row) => [row.sessionId, row]));
+  const parents = new Set(rows.filter((row) => row.origin === "subagent").map((row) => row.parentSessionId));
+  const ids = /* @__PURE__ */ new Set();
+  return { parentAvailable: byId.get(parent)?.agentAvailable === true, entries: entries.map((entry) => {
+    if (typeof entry.id !== "string" || !entry.id || ids.has(entry.id)) throw new Error("DSH \u5B50\u4EE3\u7406\u76EE\u5F55\u4E0D\u5B8C\u6574");
+    ids.add(entry.id);
+    if (entry.mode !== "one-shot" && entry.mode !== "continuable") return { id: entry.id, kind: "diagnostic", reason: "unsupported" };
+    const row = byId.get(entry.id);
+    if (row && (row.origin !== "subagent" || row.parentSessionId !== parent)) throw new Error("DSH \u5B50\u4EE3\u7406\u5F52\u5C5E\u4E0D\u4E00\u81F4");
+    return {
+      id: entry.id,
+      kind: "child",
+      mode: entry.mode,
+      ...typeof entry.label === "string" ? { label: entry.label } : {},
+      activity: row?.running === true ? "running" : "inactive",
+      hasChildren: parents.has(entry.id)
+    };
+  }) };
+}
+async function invokeHostRemote(ctx, gateway, request) {
+  if (request.namespace !== "subagents" || request.method !== "list") return gateway.invoke(request);
+  const registry = ctx.get("typert")?.local;
+  if (registry?.get("subagents/list") || registry?.hasSeen?.("subagents/list") || !usesDuplexEvents(runningDshVersion())) return gateway.invoke(request);
+  const parent = request.args.parentSessionId;
+  if (typeof parent !== "string" || !parent || parent.length > 256) throw new Error("\u7236\u4F1A\u8BDD\u6807\u8BC6\u65E0\u6548");
+  request.signal?.throwIfAborted();
+  const [projection, listing] = await Promise.all([
+    gateway.invoke({ namespace: "session", method: "projections", args: { request: { sessionId: parent } }, signal: request.signal }),
+    gateway.invoke({ namespace: "session", method: "list", args: { _request: {} }, signal: request.signal })
+  ]);
+  request.signal?.throwIfAborted();
+  return projectedSubagentCatalog(parent, projection, listing?.items);
+}
+
 // src/dsh-protocol-compat.ts
 var SINGLE_REQUEST_METHODS = /* @__PURE__ */ new Set([
   "session.attachment",
@@ -817,8 +895,8 @@ function resolveTypertGateway(ctx) {
   const candidate = ctx.get("typertGateway");
   if (!candidate || typeof candidate.invoke !== "function" || typeof candidate.stream !== "function") return null;
   return {
-    wireStream: candidate.wireStream,
-    invoke: (request) => candidate.invoke(request),
+    wireStream: candidate.wireStream ? { open: (endpoint, payload, signal) => openHostEvents(candidate, endpoint, payload, signal) } : void 0,
+    invoke: (request) => invokeHostRemote(ctx, candidate, request),
     stream: (request) => candidate.stream(request),
     commandAttachmentField: () => {
       const registry = ctx.get("typert");
@@ -1074,8 +1152,8 @@ async function invokeLegacyRpc(gateway, request, options) {
 }
 
 // src/install-lifecycle.ts
-import fs from "node:fs";
-import path4 from "node:path";
+import fs2 from "node:fs";
+import path5 from "node:path";
 import { execFileSync as execFileSync2, spawn } from "node:child_process";
 var serviceName = (s) => /^[A-Za-z0-9_.@-]{1,180}$/.test(s);
 function run(command, args) {
@@ -1084,13 +1162,13 @@ function run(command, args) {
 function validateManager(value) {
   if (value.kind === "process") return;
   if (value.kind === "systemd" && process.platform === "linux" && serviceName(value.unit) && value.unit.endsWith(".service")) return;
-  if (value.kind === "launchd" && process.platform === "darwin" && serviceName(value.label) && /^gui\/\d+$/.test(value.domain) && value.domain === `gui/${process.getuid?.()}` && path4.isAbsolute(value.plist) && fs.statSync(value.plist).isFile()) return;
+  if (value.kind === "launchd" && process.platform === "darwin" && serviceName(value.label) && /^gui\/\d+$/.test(value.domain) && value.domain === `gui/${process.getuid?.()}` && path5.isAbsolute(value.plist) && fs2.statSync(value.plist).isFile()) return;
   throw new Error("\u65E0\u6CD5\u786E\u8BA4\u539F\u540E\u53F0\u670D\u52A1\uFF0C\u672A\u505C\u6B62 DSH\u3002");
 }
 function currentHostManager() {
   if (process.env.PM2_HOME || process.env.NODE_APP_INSTANCE || process.env.KUBERNETES_SERVICE_HOST || process.env.container) throw new Error("\u6B64\u540E\u53F0\u7BA1\u7406\u65B9\u5F0F\u5C1A\u4E0D\u652F\u6301\u81EA\u52A8\u91CD\u542F\u3002");
   if (process.platform === "linux") {
-    const group = fs.readFileSync("/proc/self/cgroup", "utf8");
+    const group = fs2.readFileSync("/proc/self/cgroup", "utf8");
     const units = group.split(/[\n/]/).filter((s) => serviceName(s) && s.endsWith(".service"));
     const unit = units.at(-1);
     if (unit && !/^user@\d+\.service$/.test(unit)) {
@@ -1119,17 +1197,17 @@ function currentHostManager() {
 }
 function startUpdateWorker(manager, directory, executable) {
   validateManager(manager);
-  const id = path4.basename(directory);
+  const id = path5.basename(directory);
   if (!/^[a-f0-9]{32}$/.test(id)) throw new Error("\u65E0\u6548\u7684\u66F4\u65B0\u4EFB\u52A1");
-  const args = [path4.join(directory, "update-worker.js"), path4.join(directory, "job.json")];
+  const args = [path5.join(directory, "update-worker.js"), path5.join(directory, "job.json")];
   if (manager.kind === "systemd") {
     run("systemd-run", ["--user", "--quiet", "--collect", `--unit=dsh-wechat-update-${id}`, "--property=Type=exec", `--working-directory=${directory}`, executable, ...args]);
   } else if (manager.kind === "launchd") {
-    run("/bin/launchctl", ["submit", "-l", `dsh.wechat.update.${id}`, "-o", path4.join(directory, "worker.log"), "-e", path4.join(directory, "worker.log"), "--", executable, ...args]);
+    run("/bin/launchctl", ["submit", "-l", `dsh.wechat.update.${id}`, "-o", path5.join(directory, "worker.log"), "-e", path5.join(directory, "worker.log"), "--", executable, ...args]);
   } else {
-    const log = fs.openSync(path4.join(directory, "worker.log"), "a", 384);
+    const log = fs2.openSync(path5.join(directory, "worker.log"), "a", 384);
     const child = spawn(executable, args, { cwd: directory, env: process.env, windowsHide: true, detached: true, stdio: ["ignore", log, log] });
-    fs.closeSync(log);
+    fs2.closeSync(log);
     child.unref();
     child.on("error", () => {
     });
@@ -1157,6 +1235,17 @@ function assertNativeUpdateCapabilities(context) {
 }
 
 // src/install-control.ts
+async function nativeInstallSessions(ctx, signal) {
+  const controller = ctx.get("sessionController");
+  if (typeof controller?.list !== "function") throw new Error("DSH \u539F\u751F\u4F1A\u8BDD\u68C0\u67E5\u4E0D\u53EF\u7528\uFF0C\u672A\u505C\u6B62\u8282\u70B9\u3002");
+  signal.throwIfAborted();
+  const value = await controller.list({}, signal);
+  signal.throwIfAborted();
+  if (!Array.isArray(value?.items) || value.items.some((s) => typeof s.sessionId !== "string" || !s.sessionId || typeof s.running !== "boolean") || new Set(value.items.map((s) => s.sessionId)).size !== value.items.length) {
+    throw new Error("DSH \u539F\u751F\u4F1A\u8BDD\u72B6\u6001\u4E0D\u5B8C\u6574\uFF0C\u672A\u505C\u6B62\u8282\u70B9\u3002");
+  }
+  return value;
+}
 async function quiesceNativeHost(ctx, read, disposing) {
   const items = (await read("session.list")).items;
   if (!Array.isArray(items) || items.some((s) => s.running !== false)) throw new Error("\u8BF7\u7B49\u5F85\u8FD0\u884C\u4E2D\u7684\u4F1A\u8BDD\u7ED3\u675F\u540E\u518D\u66F4\u65B0\u3002");
@@ -1170,11 +1259,11 @@ async function quiesceNativeHost(ctx, read, disposing) {
 async function createInstallControl(context, config) {
   const ctx = context.root;
   assertNativeUpdateCapabilities(ctx);
-  const home = adapterDshHome(), id = path5.basename(config.directory);
-  if (!/^[a-f0-9]{32}$/.test(id) || !/^[a-f0-9]{48}$/.test(config.token) || path5.dirname(config.directory) !== path5.join(home, "harness-remote-updates") || fs2.realpathSync(config.directory) !== config.directory) throw new Error("\u5B89\u88C5\u63A7\u5236\u8BF7\u6C42\u4E0D\u5C5E\u4E8E\u5F53\u524D DSH\u3002");
-  const scope = resolveAgentProfileScope("", process.argv, home), profile = path5.join(home, "profiles", scope);
-  const cli = fs2.realpathSync(process.argv[1]);
-  const manifest = JSON.parse(fs2.readFileSync(path5.resolve(cli, "../../package.json"), "utf8"));
+  const home = adapterDshHome(), id = path6.basename(config.directory);
+  if (!/^[a-f0-9]{32}$/.test(id) || !/^[a-f0-9]{48}$/.test(config.token) || path6.dirname(config.directory) !== path6.join(home, "harness-remote-updates") || fs3.realpathSync(config.directory) !== config.directory) throw new Error("\u5B89\u88C5\u63A7\u5236\u8BF7\u6C42\u4E0D\u5C5E\u4E8E\u5F53\u524D DSH\u3002");
+  const scope = resolveAgentProfileScope("", process.argv, home), profile = path6.join(home, "profiles", scope);
+  const cli = fs3.realpathSync(process.argv[1]);
+  const manifest = JSON.parse(fs3.readFileSync(path6.resolve(cli, "../../package.json"), "utf8"));
   if (manifest.name !== "@deepseek-ai/dsh" || process.execArgv.length) throw new Error("\u6B64 DSH \u542F\u52A8\u65B9\u5F0F\u5C1A\u4E0D\u652F\u6301\u81EA\u52A8\u66F4\u65B0\u3002");
   const manager = currentHostManager(), webPort = resolveDshWebRuntime(ctx, process.env).port;
   const ports = deriveGatePorts(scope, loadAgentDescriptor().agentInstanceId);
@@ -1183,6 +1272,9 @@ async function createInstallControl(context, config) {
   let launched = false, quiesced = false;
   const read = async (method, payload = {}) => {
     if (!["session.list", "session.history"].includes(method)) throw new Error("\u4E0D\u652F\u6301\u7684\u5B89\u88C5\u68C0\u67E5");
+    if (method === "session.list" && typeof ctx.get("sessionController")?.list === "function") {
+      return nativeInstallSessions(ctx, AbortSignal.timeout(1e4));
+    }
     const request = { type: "client-request", rpcId: "installer-read", method, payload };
     const response = gateway ? await invokeLegacyRpc(gateway, request, { signal: AbortSignal.timeout(1e4), describeHost: () => ({}) }) : await (await fetch(`http://127.0.0.1:${webPort}/api/${method}`, { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(request), signal: AbortSignal.timeout(1e4), redirect: "error" })).json();
     if (!response.result?.ok) throw new Error("\u65E0\u6CD5\u9A8C\u8BC1 DSH \u4F1A\u8BDD\u72B6\u6001\uFF0C\u672A\u505C\u6B62\u8282\u70B9\u3002");
@@ -1190,7 +1282,7 @@ async function createInstallControl(context, config) {
   };
   const version = () => {
     try {
-      return JSON.parse(fs2.readFileSync(path5.join(profile, "node_modules/@harness-remote/dsh-wechat-remote/package.json"), "utf8")).version;
+      return JSON.parse(fs3.readFileSync(path6.join(profile, "node_modules/@harness-remote/dsh-wechat-remote/package.json"), "utf8")).version;
     } catch {
       return "0.0.0";
     }
@@ -1230,9 +1322,14 @@ async function createInstallControl(context, config) {
         quiesced
       });
       if (req.url === "/read" && !quiesced) return json(200, await read(input.method, input.payload));
+      if (req.url === "/health" && !quiesced) {
+        if (!gateway) throw new Error("DSH \u4E1A\u52A1\u63A5\u53E3\u5C1A\u672A\u5C31\u7EEA");
+        await gateway.invoke({ namespace: "session", method: "list", args: { _request: {} }, signal: AbortSignal.timeout(1e4) });
+        return json(200, { ready: true });
+      }
       if (req.url === "/launch" && !launched && !quiesced) {
-        const filename = path5.join(config.directory, "job.json");
-        const job = JSON.parse(fs2.readFileSync(filename, "utf8"));
+        const filename = path6.join(config.directory, "job.json");
+        const job = JSON.parse(fs3.readFileSync(filename, "utf8"));
         if (job.id !== id || job.controlOrigin !== origin || job.statusToken !== config.token || job.parentPid !== process.pid || job.home !== home || job.profile !== profile || job.cli !== cli || job.pnpm !== config.pnpm) throw new Error("\u5B89\u88C5\u76EE\u6807\u53D1\u751F\u53D8\u5316");
         startUpdateWorker(manager, config.directory, process.execPath);
         launched = true;
@@ -1277,7 +1374,7 @@ async function createInstallControl(context, config) {
     server.closeAllConnections();
     server.close();
   }
-  writePrivateJsonAtomic(path5.join(config.directory, "control-ready.json"), { origin, pid: process.pid });
+  writePrivateJsonAtomic(path6.join(config.directory, "control-ready.json"), { origin, pid: process.pid });
   return { origin, close };
 }
 var apply = async (ctx, config) => {
@@ -1288,5 +1385,6 @@ export {
   apply,
   createInstallControl,
   inject,
+  nativeInstallSessions,
   quiesceNativeHost
 };

package/lib/native-recovery.js

@@ -7452,7 +7452,7 @@ async function verifyNativeRestore(job, start, sessionIds, readableIds) {
     const child = start();
     ref = await waitForJson(path2.join(directory, "control-ready.json"), (value) => Number.isInteger(value.pid) && value.pid > 0 && (!child || value.pid === child.pid) && /^http:\/\/127\.0\.0\.1:[1-9]\d{0,4}$/.test(value.origin), 18e4);
     const host = await request("describe");
-    if (host.pid !== ref.pid || host.home !== job.home || host.profile !== job.profile || host.cli !== job.cli || host.dshVersion !== job.dshVersion || host.pluginVersion !== "0.0.0") {
+    if (host.pid !== ref.pid || host.home !== job.home || host.profile !== job.profile || host.cli !== job.cli || host.dshVersion !== job.dshVersion || host.pluginVersion !== job.previousVersion) {
       throw new Error("\u6062\u590D\u540E\u7684 DSH \u8EAB\u4EFD\u4E0D\u5339\u914D\u3002");
     }
     const items = (await request("read", { method: "session.list" })).items;

package/lib/update-worker.js

@@ -564,6 +564,7 @@ async function executeUpdate(job, progress, quiesce) {
   const emit = (phase, n, message) => progress({ phase, progress: n, message, terminal: false });
   let stopped = false, disposed = false, modified = false, newChild;
   let before = {}, sessionIds = [], readableIds = [];
+  let preexistingFailure = false;
   try {
     emit("preparing", 25, "\u51C6\u5907\u5B89\u88C5\u5DE5\u5177\uFF0C\u5F53\u524D\u8282\u70B9\u4ECD\u53EF\u4F7F\u7528");
     const runtime = await pinInstallRuntime({ executable: job.executable, cli: job.pnpm, version: INSTALL_PNPM_VERSION }, job.directory);
@@ -572,6 +573,13 @@ async function executeUpdate(job, progress, quiesce) {
     emit("checking", 50, "\u786E\u8BA4\u4F1A\u8BDD\u7A7A\u95F2\u5E76\u4FDD\u5B58\u72B6\u6001");
     const old = job.controlOrigin ? await control(job, "describe") : await describe(job);
     if (old.pluginVersion !== job.previousVersion) throw new Error("\u5F53\u524D\u63D2\u4EF6\u5728\u68C0\u67E5\u540E\u53D1\u751F\u53D8\u5316");
+    if (job.controlOrigin && job.previousVersion !== "0.0.0") {
+      try {
+        preexistingFailure = (await control(job, "health")).ready !== true;
+      } catch {
+        preexistingFailure = true;
+      }
+    }
     const list = (await beforeRpc(job, "session.list")).items;
     if (!Array.isArray(list) || list.some((s) => s.running !== false)) throw new Error("\u8BF7\u7B49\u5F85\u5168\u90E8\u4F1A\u8BDD\u7ED3\u675F\u540E\u518D\u66F4\u65B0");
     sessionIds = list.map((s) => s.sessionId).sort();
@@ -643,7 +651,7 @@ async function executeUpdate(job, progress, quiesce) {
           fs4.renameSync(job.profile, path4.join(job.directory, "profile-failed"));
           fs4.renameSync(previous, job.profile);
         }
-        if (job.previousVersion === "0.0.0") {
+        if (job.previousVersion === "0.0.0" || preexistingFailure) {
           const recovery = await import(pathToFileURL(path4.join(job.directory, "native-recovery.js")).href);
           await recovery.verifyNativeRestore(job, () => start(job), sessionIds, readableIds);
         } else {
@@ -664,7 +672,7 @@ async function executeUpdate(job, progress, quiesce) {
         return { phase: "attention", progress: 100, message: "\u81EA\u52A8\u6062\u590D\u672A\u5B8C\u6210\u3002\u5907\u4EFD\u5DF2\u4FDD\u7559\uFF0C\u8BF7\u6309\u4E3B\u673A\u66F4\u65B0\u8BB0\u5F55\u6062\u590D\uFF1B\u4E0D\u8981\u5220\u9664\u8282\u70B9\u6216\u6570\u636E\u3002", terminal: true, ok: false, rollback: false };
       }
     }
-    return { phase: "failed", progress: 100, message: (error instanceof Error ? error.message : "\u66F4\u65B0\u5931\u8D25") + (rollback ? "\uFF1B\u5DF2\u6062\u590D\u539F\u63D2\u4EF6\u3002" : "\uFF1B\u5F53\u524D\u63D2\u4EF6\u672A\u66FF\u6362\u3002"), terminal: true, ok: false, rollback };
+    return { phase: "failed", progress: 100, message: (error instanceof Error ? error.message : "\u66F4\u65B0\u5931\u8D25") + (rollback ? preexistingFailure ? "\uFF1B\u5DF2\u6062\u590D\u5B89\u88C5\u524D\u72B6\u6001\uFF0C\u539F\u6709\u63D2\u4EF6\u6545\u969C\u5C1A\u672A\u4FEE\u590D\uFF0C\u6570\u636E\u5DF2\u4FDD\u7559\u3002" : "\uFF1B\u5DF2\u6062\u590D\u539F\u63D2\u4EF6\u3002" : "\uFF1B\u5F53\u524D\u63D2\u4EF6\u672A\u66FF\u6362\u3002"), terminal: true, ok: false, rollback };
   }
 }
 async function workerMain(filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-wechat-remote",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "private": false,
   "description": "Agent远程管理助手：DSH 微信连接插件的一键安装与升级",
   "type": "module",