dsh-wechat-remote 1.7.5 → 1.7.8

package/README.md

@@ -1,6 +1,6 @@
-# Agent远程管理助手 · DSH 插件安装器
-
-当前安装器版本为 1.7.4，安装的正式插件仍为 1.7.2。已正常使用插件 1.7.2 的用户，无需因此重新安装。
+# Agent远程管理助手 · DSH 插件安装器
+
+当前版本为 `1.7.8`，内嵌同版本正式插件。
 
 首次安装和升级旧插件使用同一个命令：
 
@@ -8,16 +8,20 @@
 npx -y dsh-wechat-remote@latest
 ```
 
-需已安装 DSH，使用 Node.js 22.13 或更高版本。安装工具由包依赖自动提供，无需另装 pnpm 或 Git。
+在与 DSH 相同的系统用户下运行即可。无需改成全局安装 DSH；使用 `npx @deepseek-ai/dsh web` 的用户也使用同一条安装命令。需要 Node.js 22.13 或更高版本，无需另装 pnpm 或 Git。Windows CMD / PowerShell 推荐使用 `npx.cmd -y dsh-wechat-remote@latest`，不必修改脚本执行策略。
 
-安装器安装正式插件，保留原配置、配对和会话，不会升级 DSH 本体。请先结束运行中的任务；安装完成后自动重启原 DSH 并尝试打开 WebUI。
-
-DSH 的新版本、预览版本或未登记的主机架构不会仅因缺少验证记录而被拒绝安装。安装器仍检查必要运行能力、安装包完整性和已知不兼容问题，并保留失败恢复所需的备份；无法确认恢复结果时会提示保留数据。这不代表所有宿主组合均已通过功能验证。
+安装器保留原配置、配对和会话，不会升级 DSH 本体。请先结束运行中的任务；安装完成后自动重启原 DSH 并尝试打开 WebUI。DSH 已关闭时会尝试启动；若启动失败，按提示查看启动日志，不要删除原有数据。
 
-支持已验证的 DSH `0.1.1-rc.2`、`0.1.2-rc.1`、`0.1.5-rc.1`，Windows / macOS Intel / Linux x64。普通 Node 启动、独立的 macOS launchd 和 Linux 用户级 systemd 服务可自动恢复；无法确认启动方式时不自动停止主机。
-
-另已在 ARM64 Linux 电视盒子上验证 DSH `0.1.5-rc.1` 的首次安装、重复执行及重装。1.7.4 改善较慢主机启动时被误判为安装超时的问题；安装过程中请等待完成，勿重复执行命令。
+DSH 的新版本、预览版本或未登记的主机架构不会仅因缺少验证记录而被拒绝安装。安装器仍检查必要运行能力、安装包完整性和已知不兼容问题，并保留失败恢复所需的备份；无法确认恢复结果时会提示保留数据。这不代表所有宿主组合均已通过功能验证。
 
-旧插件 1.7.1 在 DSH 0.1.5 上无法一键更新时，可用本安装命令过渡一次。从插件 1.7.2 起，后续已验证的兼容更新不再受旧的 DSH 版本列表限制；不需要因此降低 DSH 版本或删除节点。
+本版沿用此前已验证的跨平台安装方案，具体发行包与宿主组合以验收记录为准。普通 Node 启动、独立的 macOS launchd 和 Linux 用户级 systemd 服务有对应的自动恢复方式；无法确认启动方式时不自动停止主机。
 
-使用其他配置时附加 `--profile 配置名称`。安装损坏需要重装时附加 `--repair`；不会自动降级。
+另已在 ARM64 Linux 电视盒子上验证 DSH `0.1.5-rc.1` 的首次安装、重复执行及重装。1.7.4 改善较慢主机启动时被误判为安装超时的问题；安装过程中请等待完成，勿重复执行命令。
+
+旧插件的一键更新如被版本或架构判断拦截，可用上述安装命令升级一次。从插件 1.7.6 起，未登记的 CPU 架构或 DSH 版本不再影响更新入口；执行前仍会检查实际安装与重启条件，无需因此降低 DSH 版本或删除节点。
+
+默认使用 `web` 配置和原来的 DSH 数据目录。自定义数据目录时，在新终端设置相同的 `DSH_HOME`，或附加 `--home "数据目录"`；使用其他配置时附加 `--profile 配置名称`。WSL、容器和其他系统用户内的 DSH，需要在对应环境中执行安装，不能跨环境替换。
+
+DSH 正在运行时，优先连接它自己的安装接口；未运行时，优先使用当前终端默认的 DSH，再检查全局、当前项目和 NPX 缓存。只有存在多份缓存且没有默认选择时才询问。也可用 `--dsh-cli "DSH的lib/bin.js路径"` 明确指定。
+
+已运行的同版本插件卡在更新验证、尚未就绪时，重新执行命令会尝试修复。DSH 已退出或怀疑插件文件损坏时，附加 `--repair` 主动重装，不会自动降级。宿主本体或其他插件的故障仍可能需要另行处理；安装日志会保留，不必先删除会话或重新配对。

package/assets/release.json

@@ -1,17 +1,15 @@
 {
-  "version": "1.7.5",
+  "version": "1.7.8",
   "catalog": {
     "schemaVersion": 1,
-    "revision": "installer-1.7.5",
-    "issuedAt": 1789362769360,
-    "expiresAt": 1791781969360,
+    "revision": "installer-1.7.8",
+    "issuedAt": 1789590295076,
+    "expiresAt": 1792009495076,
     "releases": [
       {
-        "version": "1.7.5",
+        "version": "1.7.8",
         "channel": "stable",
         "dsh": [
-          "0.1.1-rc.2",
-          "0.1.2-rc.1",
           "0.1.5-rc.1"
         ],
         "platforms": [
@@ -23,9 +21,9 @@
           "x64"
         ],
         "asset": {
-          "url": "https://github.com/martinbear1/dsh-wechat-remote/releases/download/v1.7.5/harness-remote-dsh-wechat-remote-1.7.5.tgz",
-          "sha256": "d5545651e80242d1782fb04e86aece5d0460db80bdf1cec7688429e2abaf9e6e",
-          "bytes": 9539981
+          "url": "https://github.com/martinbear1/dsh-wechat-remote/releases/download/v1.7.8/harness-remote-dsh-wechat-remote-1.7.8.tgz",
+          "sha256": "bcadaf80e8a2dff008b421870bb42cad89d490178104df1f4d9103aa03cd62a6",
+          "bytes": 9554570
         }
       }
     ],

package/bin/dsh-discovery.mjs

@@ -0,0 +1,175 @@
+/** Read-only discovery. A candidate is NOT the installation target until the
+ * native, token-bound host handshake confirms its home/profile/CLI/PID.
+ * Never run an unvalidated shell shim, fetch a different DSH, or scan a disk. */
+import fs from 'node:fs'
+import path from 'node:path'
+import os from 'node:os'
+import { execFile } from 'node:child_process'
+import { promisify } from 'node:util'
+import { createInterface } from 'node:readline/promises'
+
+const execute = promisify(execFile)
+const PACKAGE = '@deepseek-ai/dsh'
+const clean = value => String(value).replace(/[\x00-\x1f\x7f-\x9f]/g, '')
+const environmentPath = env => env[Object.keys(env).find(key => key.toLowerCase() === 'path')] || ''
+
+export function validateDshCli(filename) {
+  const cli = fs.realpathSync(path.resolve(filename))
+  const root = path.resolve(cli, '../..')
+  const manifest = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'))
+  const bin = typeof manifest.bin === 'string' ? manifest.bin : manifest.bin?.dsh
+  if (manifest.name !== PACKAGE || path.basename(cli) !== 'bin.js' || !fs.statSync(cli).isFile()
+      || typeof bin !== 'string' || fs.realpathSync(path.resolve(root, bin)) !== cli) {
+    throw new Error('指定路径不是有效的 DSH 启动程序，未修改安装。')
+  }
+  return { cli, version: String(manifest.version || '') }
+}
+
+export function resolveHome(value, fallback = os.homedir()) {
+  const raw = String(value || '')
+  const configured = raw.trim() ? raw : ''
+  return path.resolve(configured === '~' ? fallback : /^~[/\\]/.test(configured)
+    ? path.join(fallback, configured.slice(2)) : configured || path.join(fallback, '.dsh'))
+}
+
+/** npm's own config resolves .npmrc, custom cache/prefix and Node managers.
+ * Query individual public values; never read or log registry credentials. */
+async function npmLocation(key, env, cwd) {
+  let npm = env.npm_execpath
+  if (!npm || !fs.existsSync(npm)) {
+    const roots = [path.dirname(process.execPath), ...environmentPath(env).split(path.delimiter)]
+    npm = roots.flatMap(dir => [path.join(dir, 'node_modules/npm/bin/npm-cli.js'),
+      path.join(dir, '../lib/node_modules/npm/bin/npm-cli.js')]).find(file => fs.existsSync(file))
+  }
+  if (!npm) return ''
+  try {
+    const { stdout } = await execute(process.execPath, [npm, 'config', 'get', key], {
+      cwd, env, windowsHide: true, timeout: 10000, maxBuffer: 16384,
+    })
+    const value = stdout.trim()
+    return value && !/[\r\n\0]/.test(value) && path.isAbsolute(value) ? value : ''
+  } catch { return '' }
+}
+
+export async function discoverDsh({ env = process.env, cwd = process.cwd(), cache, prefix } = {}) {
+  const found = new Map()
+  const add = (filename, source) => {
+    try {
+      const item = validateDshCli(filename)
+      if (!found.has(item.cli)) found.set(item.cli, { ...item, source })
+    } catch { /* A missing/broken cache entry is not a usable DSH. */ }
+  }
+  for (const dir of environmentPath(env).split(path.delimiter).filter(Boolean)) {
+    add(path.join(dir, 'dsh'), 'PATH') // POSIX symlink, never execute a Windows shim.
+    add(path.join(dir, 'node_modules/@deepseek-ai/dsh/lib/bin.js'), 'PATH')
+    add(path.join(dir, '../lib/node_modules/@deepseek-ai/dsh/lib/bin.js'), 'PATH')
+    add(path.join(dir, '../@deepseek-ai/dsh/lib/bin.js'), 'PATH') // npm .bin, including Windows.
+  }
+  for (let dir = path.resolve(cwd);;) {
+    add(path.join(dir, 'node_modules/@deepseek-ai/dsh/lib/bin.js'), 'project')
+    add(path.join(dir, 'apps/cli/lib/bin.js'), 'source')
+    const parent = path.dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+  const locations = await Promise.all([
+    cache !== undefined ? cache : env.npm_config_cache || npmLocation('cache', env, cwd),
+    prefix !== undefined ? prefix : npmLocation('prefix', env, cwd),
+  ])
+  if (locations[1]) {
+    add(path.join(locations[1], 'node_modules/@deepseek-ai/dsh/lib/bin.js'), 'npm-global')
+    add(path.join(locations[1], 'lib/node_modules/@deepseek-ai/dsh/lib/bin.js'), 'npm-global')
+  }
+  const cacheRoot = locations[0]
+  // Cached NPX versions cannot supersede a normal default executable. Avoid
+  // probing a large/unreadable cache when the terminal already has that default.
+  if (cacheRoot && found.size === 0) {
+    try {
+      const entries = fs.readdirSync(path.join(cacheRoot, '_npx'), { withFileTypes: true })
+      if (entries.length > 512) throw new Error('npx 缓存较多，请先启动要使用的 DSH，再运行安装命令。')
+      for (const entry of entries) if (/^[a-f0-9]+$/i.test(entry.name) && entry.isDirectory()) {
+        add(path.join(cacheRoot, '_npx', entry.name, 'node_modules/@deepseek-ai/dsh/lib/bin.js'), 'npx')
+      }
+    } catch (error) { if (error.code !== 'ENOENT' && error.code !== 'ENOTDIR') throw error }
+  }
+  return [...found.values()]
+}
+
+export async function chooseDsh(options = {}) {
+  if (options.cli) return validateDshCli(options.cli).cli
+  const candidates = await discoverDsh(options)
+  if (!candidates.length) throw new Error('未找到 DSH。请先按原来的方式启动 DSH WebUI，再运行本命令。')
+  // A stopped host has no handshake yet. Follow the terminal's ordinary DSH
+  // resolution before consulting old NPX cache entries; no version sorting or
+  // downloading. This fallback never overrides an already running host.
+  const normal = candidates.find(item => item.source === 'PATH')
+    || candidates.find(item => item.source === 'npm-global')
+    || candidates.find(item => item.source === 'project' || item.source === 'source')
+  if (normal) return normal.cli
+  if (candidates.length === 1) return candidates[0].cli
+  // Multiple cache-only versions are not evidence of the user's choice.
+  // A live host normally bypasses this fallback via its native handshake.
+  const prompt = options.prompt || (process.stdin.isTTY && process.stdout.isTTY ? async message => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout })
+    try { return await rl.question(message) } finally { rl.close() }
+  } : undefined)
+  if (!prompt) throw new Error('找到多份 DSH。请先启动要使用的 DSH，或用 --dsh-cli 指定其 lib/bin.js；未修改插件。')
+  const list = candidates.map((item, index) => `${index + 1}. DSH ${clean(item.version)} — ${clean(item.cli)}`).join('\n')
+  const answer = String(await prompt(`找到多份 DSH，请选择要使用的一份（直接回车取消）：\n${list}\n编号：`)).trim()
+  const index = Number(answer) - 1
+  if (!/^\d+$/.test(answer) || !Number.isInteger(index) || !candidates[index]) throw new Error('已取消安装，未修改插件。')
+  return candidates[index].cli
+}
+
+// POSIX npm/npx normally starts through a bin symlink, not lib/bin.js.
+// This is a conservative stop signal only; target authority is the handshake.
+export function looksLikeDshProcess(command) {
+  return /(?:[/\\](?:dsh|apps[/\\]cli)[/\\]lib[/\\]bin\.js|[/\\](?:\.bin|bin)[/\\]dsh)(?:["'\s]|$)/i.test(command || '')
+}
+
+/** Conservatively prevent a second host while a live profile reloads on a
+ * non-default port. We use process listings only as a stop signal, never as
+ * authority to install, stop a PID, or select another user's data directory. */
+export async function mayHaveRunningDsh() {
+  try {
+    if (process.platform === 'win32') {
+      const command = "Get-CimInstance Win32_Process -Filter \"Name='node.exe' OR Name='node'\" | Select-Object -ExpandProperty CommandLine | ConvertTo-Json -Compress"
+      const { stdout } = await execute('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', command], {
+        windowsHide: true, timeout: 10000, maxBuffer: 1024 * 1024,
+      })
+      const data = stdout.trim() ? JSON.parse(stdout) : []
+      return [data].flat().some(looksLikeDshProcess)
+    }
+    if (process.platform === 'linux') {
+      for (const pid of fs.readdirSync('/proc').filter(name => /^\d+$/.test(name))) {
+        try {
+          const args = fs.readFileSync(`/proc/${pid}/cmdline`, 'utf8').split('\0')
+          if (args.some(looksLikeDshProcess)) return true
+        } catch { /* Exited or inaccessible process. */ }
+      }
+      return false
+    }
+    const { stdout } = await execute('/bin/ps', ['-axo', 'command='], { timeout: 10000, maxBuffer: 2 * 1024 * 1024 })
+    return looksLikeDshProcess(stdout)
+  } catch { return true } // Unknown process ownership must never authorize an extra host.
+}
+
+export function assertInstallTarget(host, { home, profile, cli, pid }) {
+  if (host.home !== home || host.profile !== profile || !Number.isInteger(host.pid) || host.pid < 1
+      || host.pid !== pid || (cli && host.cli !== validateDshCli(cli).cli)
+      || host.cli !== validateDshCli(host.cli).cli) {
+    throw new Error('当前 DSH 身份与安装目标不一致，未修改安装。')
+  }
+}
+
+/** Preserve arguments but use the validated real entry point for restart.
+ * On macOS/Linux argv[0] can be npm's .bin/dsh symlink while host.cli is its
+ * canonical target. The worker requires a canonical CLI, as the WebUI updater
+ * already does. Never accept a different executable hidden in argv. */
+export function installHostArgv(host) {
+  if (!Array.isArray(host.argv) || !host.argv.length || !host.argv.every(arg => typeof arg === 'string')
+      || validateDshCli(host.argv[0]).cli !== host.cli) {
+    throw new Error('DSH 启动参数与安装目标不一致，未修改安装。')
+  }
+  return [host.cli, ...host.argv.slice(1)]
+}

package/bin/native-control.mjs

@@ -51,14 +51,16 @@ export async function waitForJson(filename, accept, timeout = 20000) {
     try { const value = JSON.parse(fs.readFileSync(filename, 'utf8')); if (accept(value)) return value } catch {}
     await new Promise(resolve => setTimeout(resolve, 100))
   }
-  throw new Error('DSH 没有完成安装握手；原插件未替换。请确认 DSH WebUI 正在运行且允许原生插件热加载。')
+  const error = new Error('DSH 没有完成安装握手；原插件未替换。请确认 DSH WebUI 正在运行且允许原生插件热加载。')
+  error.code = 'DSH_HANDSHAKE_TIMEOUT'
+  throw error
 }
 
 /** One bounded native handshake, including a possible offline host start.
  * A listening WebUI is not proof that the asynchronous profile reload finished.
  * Keep the same control entry/token while waiting; never restart a live host. */
 export async function waitForInstallControl(filename, {
-  accept, ensureRunning, onWaiting = () => {}, timeoutMs = 180000, initialWaitMs = 5000,
+  accept, ensureRunning, onWaiting = () => {}, timeoutMs = 180000, initialWaitMs = 5000,
 }) {
   const deadline = Date.now() + timeoutMs
   try { return await waitForJson(filename, accept, Math.min(initialWaitMs, timeoutMs)) }

package/bin/native-recovery.mjs

@@ -0,0 +1,44 @@
+/** Verify a restored, plugin-free DSH through the same native control adapter.
+ * Only the first-install rollback uses this; ordinary updates probe the plugin.
+ * Bundled outside the profile so neither a failed add nor rollback removes it. */
+import fs from 'node:fs'
+import path from 'node:path'
+import { randomBytes } from 'node:crypto'
+import { attachControl, waitForJson } from './native-control.mjs'
+
+export async function verifyNativeRestore(job, start, sessionIds, readableIds) {
+  const directory = path.join(job.home, 'harness-remote-updates', randomBytes(16).toString('hex'))
+  fs.mkdirSync(directory, { mode: 0o700 })
+  fs.writeFileSync(path.join(directory, 'package.json'), '{"type":"module"}\n', { mode: 0o600 })
+  const helper = path.join(directory, 'install-control.js'), token = randomBytes(24).toString('hex')
+  fs.copyFileSync(path.join(job.directory, 'install-control.js'), helper)
+  const remove = attachControl(job.profile, helper, { directory, token, pnpm: job.pnpm })
+  let ref
+  const request = async (method, payload = {}) => {
+    const response = await fetch(ref.origin + '/' + method, { method: 'POST', headers: {
+      authorization: `Bearer ${token}`, 'content-type': 'application/json',
+    }, body: JSON.stringify(payload), redirect: 'error', signal: AbortSignal.timeout(12000) })
+    const value = await response.json()
+    if (!response.ok) throw new Error('原 DSH 恢复检查未通过。')
+    return value
+  }
+  try {
+    const child = start()
+    ref = await waitForJson(path.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), 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') {
+      throw new Error('恢复后的 DSH 身份不匹配。')
+    }
+    const items = (await request('read', { method: 'session.list' })).items
+    if (!Array.isArray(items) || JSON.stringify(items.map(s => s.sessionId).sort()) !== JSON.stringify(sessionIds)) {
+      throw new Error('恢复后的会话列表不一致。')
+    }
+    for (const sessionId of readableIds) await request('read', { method: 'session.history', payload: { sessionId, maxMessages: 1 } })
+  } finally {
+    try { remove() }
+    finally { if (ref) { try { await request('close') } catch {} } }
+  }
+}

package/bin/release-selection.mjs

@@ -1,33 +1,36 @@
-import { validateCatalog, compareVersions, trustedReleaseAsset } from '../lib/update-policy.js'
-
-/** Explicit CLI installation is not an automatic-update recommendation.
- * Tested DSH/platform/architecture lists describe evidence, not admission.
- * Keep trusted artifacts, explicit withdrawals and the no-downgrade floor.
- */
-export function selectInstallTarget(pinned, remote, current, now = Date.now()) {
-  const local = validateCatalog(pinned.catalog)
-  const bundled = local.releases.find(r => r.version === pinned.version && r.channel === 'stable')
-  if (!bundled || !trustedReleaseAsset(bundled.asset, bundled.version)) {
-    throw new Error('安装包信息不完整，请重新获取官方安装器。')
-  }
-  let online
-  try {
-    const candidate = validateCatalog(remote)
-    if (candidate.issuedAt <= now + 300000 && candidate.expiresAt > now) online = candidate
-  } catch { /* The authenticated npm package remains usable without the catalog. */ }
-
-  // An installer never silently substitutes an older plugin than its own bundle.
-  // Keep the bundled bytes/hash for the same version even if remote metadata differs.
-  const candidates = [bundled, ...(online?.releases || []).filter(r => r.channel === 'stable'
-    && compareVersions(r.version, bundled.version) > 0 && trustedReleaseAsset(r.asset, r.version))]
-    .sort((a, b) => compareVersions(b.version, a.version))
-  const rules = [...local.blocked, ...(online?.blocked || [])]
-  const blocked = release => rules.find(b => b.pluginVersion === release.version
-    && (!b.dsh || b.dsh.includes(current.agentVersion))
-    && (!b.platforms || b.platforms.includes(current.platform)))
-  const release = candidates.find(r => !blocked(r))
-  if (!release) {
-    throw new Error(`当前插件存在已知不兼容问题：${blocked(bundled).reason}；未替换现有插件。`)
-  }
-  return release
-}
+import { validateCatalog, compareVersions, trustedReleaseAsset } from '../lib/update-policy.js'
+
+/** Explicit CLI installation is not an automatic-update recommendation.
+ * Tested DSH/platform/architecture lists describe evidence, not admission.
+ * Keep trusted artifacts, explicit withdrawals and the no-downgrade floor.
+ */
+export function selectInstallTarget(pinned, remote, current, now = Date.now()) {
+  const local = validateCatalog(pinned.catalog)
+  // Choosing an explicit prerelease installer authorizes its exact embedded
+  // preview, not arbitrary remote previews or a change to stable recommendations.
+  const channel = pinned.version.includes('-') ? 'preview' : 'stable'
+  const bundled = local.releases.find(r => r.version === pinned.version && r.channel === channel)
+  if (!bundled || !trustedReleaseAsset(bundled.asset, bundled.version)) {
+    throw new Error('安装包信息不完整，请重新获取官方安装器。')
+  }
+  let online
+  try {
+    const candidate = validateCatalog(remote)
+    if (candidate.issuedAt <= now + 300000 && candidate.expiresAt > now) online = candidate
+  } catch { /* The authenticated npm package remains usable without the catalog. */ }
+
+  // An installer never silently substitutes an older plugin than its own bundle.
+  // Keep the bundled bytes/hash for the same version even if remote metadata differs.
+  const candidates = [bundled, ...(online?.releases || []).filter(r => r.channel === 'stable'
+    && compareVersions(r.version, bundled.version) > 0 && trustedReleaseAsset(r.asset, r.version))]
+    .sort((a, b) => compareVersions(b.version, a.version))
+  const rules = [...local.blocked, ...(online?.blocked || [])]
+  const blocked = release => rules.find(b => b.pluginVersion === release.version
+    && (!b.dsh || b.dsh.includes(current.agentVersion))
+    && (!b.platforms || b.platforms.includes(current.platform)))
+  const release = candidates.find(r => !blocked(r))
+  if (!release) {
+    throw new Error(`当前插件存在已知不兼容问题：${blocked(bundled).reason}；未替换现有插件。`)
+  }
+  return release
+}