dsh-wechat-remote 1.7.5 → 1.7.8

package/bin/setup.mjs

@@ -1,37 +1,23 @@
 #!/usr/bin/env node
 import fs from 'node:fs'
 import path from 'node:path'
-import os from 'node:os'
 import net from 'node:net'
 import { spawn } from 'node:child_process'
 import { randomBytes, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
 import { attachControl, waitForJson, waitForInstallControl } from './native-control.mjs'
-import { resolveInstallRuntime, verifyInstallRuntime } from '../lib/install-runtime.js'
-import { compareVersions } from '../lib/update-policy.js'
-import { selectInstallTarget } from './release-selection.mjs'
+import { resolveInstallRuntime, verifyInstallRuntime } from '../lib/install-runtime.js'
+import { installProfile, backupProfile, NativeInstallError } from '../lib/install-profile.js'
+import { compareVersions } from '../lib/update-policy.js'
+import { selectInstallTarget } from './release-selection.mjs'
 import { boundedFetch, downloadRelease, auditArchive } from '../lib/update-download.js'
 import { writePrivateJsonAtomic } from '../lib/secure-file.js'
 import { control, validateJob, releaseOwnedUpdateLock } from '../lib/update-worker.js'
+import { chooseDsh, validateDshCli, resolveHome, mayHaveRunningDsh, assertInstallTarget, installHostArgv } from './dsh-discovery.mjs'
 
 const root = fileURLToPath(new URL('../', import.meta.url))
 const packageName = '@harness-remote/dsh-wechat-remote'
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
-export function findDsh() {
-  const candidates = []
-  for (const dir of (process.env.PATH || '').split(path.delimiter).filter(Boolean)) {
-    candidates.push(path.join(dir, 'node_modules/@deepseek-ai/dsh/lib/bin.js'), path.join(dir, '../lib/node_modules/@deepseek-ai/dsh/lib/bin.js'))
-    try { candidates.push(fs.realpathSync(path.join(dir, 'dsh'))) } catch {}
-  }
-  for (const candidate of candidates) {
-    try {
-      const cli = fs.realpathSync(candidate)
-      const manifest = JSON.parse(fs.readFileSync(path.resolve(cli, '../../package.json'), 'utf8'))
-      if (manifest.name === '@deepseek-ai/dsh' && path.basename(cli) === 'bin.js') return cli
-    } catch {}
-  }
-  throw new Error('未找到已安装的 DSH。请先安装并启动 DeepSeek Harness。')
-}
 function portBusy(port) {
   return new Promise(resolve => {
     const socket = net.connect({ host: '127.0.0.1', port })
@@ -40,27 +26,76 @@ function portBusy(port) {
   })
 }
 export async function selectRelease(host, assetsRoot = path.join(root, 'assets'), repair = false,
-  fetchCatalog = () => boundedFetch('https://relay.xyxfood.xyz/v1/update-policy', 256 * 1024)) {
+  fetchCatalog = () => boundedFetch('https://relay.xyxfood.xyz/v1/update-policy', 256 * 1024)) {
   const current = { agentKind: 'dsh', agentVersion: host.dshVersion, pluginVersion: host.pluginVersion,
     platform: { win32: 'windows', darwin: 'macos', linux: 'linux' }[host.platform], arch: host.arch }
   const pinned = JSON.parse(fs.readFileSync(path.join(assetsRoot, 'release.json'), 'utf8'))
-  let remote
-  try {
-    remote = JSON.parse((await fetchCatalog()).toString('utf8'))
-  } catch { /* Authenticated npm package retains its bundled release. */ }
-  const release = selectInstallTarget(pinned, remote, current)
+  let remote
+  try {
+    remote = JSON.parse((await fetchCatalog()).toString('utf8'))
+  } catch { /* Authenticated npm package retains its bundled release. */ }
+  const release = selectInstallTarget(pinned, remote, current)
   if (host.pluginVersion !== '0.0.0' && (compareVersions(host.pluginVersion, release.version) > 0
     || (compareVersions(host.pluginVersion, release.version) === 0 && !repair))) return { release, archive: null }
   let archive
   if (release.version === pinned.version) archive = fs.readFileSync(path.join(assetsRoot, 'plugin.tgz'))
   else archive = await downloadRelease(release)
   auditArchive(archive, release)
-  return { release, archive }
-}
-export async function install({ profileName = 'web', cli = findDsh(), assetsRoot, open = true, repair = false } = {}) {
+  return { release, archive }
+}
+
+/** With no running host, native plugin add needs neither HMR nor healthy third-
+ * party plugins. Reuse the same installation core; only live hosts need disposal. */
+async function installStopped({ cli, home, profile, profileName, directory, id, runtime, assetsRoot, repair, open }) {
+  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)
+  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')
+  const fd = fs.openSync(lock, 'wx', 0o600); fs.writeFileSync(fd, id); fs.closeSync(fd)
+  let modified = false, keepLock = false
+  try {
+    // Recheck immediately before writing: a host may have started during npm
+    // discovery/download. Never mutate its dependencies underneath that process.
+    if (await mayHaveRunningDsh()) throw new Error('DSH 已开始运行，请重新执行安装命令以连接该实例。')
+    if (selected.archive) {
+      fs.writeFileSync(path.join(directory, 'release.tgz'), selected.archive, { mode: 0o600, flag: 'wx' })
+      backupProfile(profile, path.join(directory, 'profile-before'))
+      console.log(`正在通过 DSH 原生方式安装插件 ${selected.release.version}…`)
+      modified = true
+      await installProfile({ profile, directory, cli: dsh.cli, targetVersion: selected.release.version, runtime })
+    }
+  } catch (error) {
+    keepLock = error instanceof NativeInstallError && error.mayStillBeRunning
+    if (modified && !keepLock) {
+      fs.renameSync(profile, path.join(directory, 'profile-failed'))
+      fs.renameSync(path.join(directory, 'profile-before'), profile)
+    }
+    throw error
+  } finally { if (!keepLock) releaseOwnedUpdateLock(lock, id) }
+  // Use DSH's own browser opening behavior. Startup failure does not undo an
+  // otherwise successful native add; an unrelated plugin can fail to boot.
+  const logFile = path.join(directory, 'startup.log'), log = fs.openSync(logFile, 'a', 0o600)
+  const env = { ...process.env, DSH_HOME: home }
+  delete env.HARNESS_REMOTE_UPDATE_JOB
+  const child = spawn(process.execPath, [dsh.cli, '--profile', profileName, ...(open ? [] : ['--no-open'])],
+    { cwd: process.cwd(), env, detached: true, windowsHide: true, stdio: ['ignore', log, log] })
+  fs.closeSync(log)
+  let launchError
+  child.on('error', error => { launchError = error }); child.unref()
+  await sleep(1200)
+  const starting = !launchError && child.pid && child.exitCode === null && child.signalCode === null
+  const installedVersion = selected.archive ? selected.release.version : version
+  console.log(`插件 ${installedVersion} 已安装。${starting ? '已启动 DSH，请等待 WebUI 就绪。' : `DSH 未能启动，请查看：${logFile}`}`)
+  return { version: installedVersion, changed: Boolean(selected.archive), starting: Boolean(starting) }
+}
+export async function install({ profileName = 'web', cli, home: configuredHome, assetsRoot, open = true, repair = false } = {}) {
   if (!/^[A-Za-z0-9_-]{1,80}$/.test(profileName)) throw new Error('无效的 profile 名称。')
+  if (cli) cli = validateDshCli(cli).cli
   const runtime = resolveInstallRuntime(root); await verifyInstallRuntime(runtime)
-  const home = path.resolve(process.env.DSH_HOME || path.join(os.homedir(), '.dsh'))
+  const home = resolveHome(configuredHome || process.env.DSH_HOME)
   fs.mkdirSync(home, { recursive: true, mode: 0o700 })
   if (fs.realpathSync(home) !== home) throw new Error('DSH 数据目录是链接，暂不自动替换安装。')
   const profile = path.join(home, 'profiles', profileName), id = randomBytes(16).toString('hex')
@@ -68,21 +103,16 @@ export async function install({ profileName = 'web', cli = findDsh(), assetsRoot
   fs.mkdirSync(directory, { recursive: true, mode: 0o700 })
   let remove, ref, job, locked = false, authorized = false, launched
   const lockFile = path.join(profile, '.harness-remote-update.lock')
-  console.log('正在检查 DSH 与插件…')
-  try {
-    // Initialize missing profiles through DSH itself, never synthesize a bundle list.
-    if (!fs.existsSync(path.join(profile, 'package.json'))) {
-      const log = fs.openSync(path.join(directory, 'startup.log'), 'a', 0o600)
-      launched = spawn(process.execPath, [cli, '--profile', profileName, '--no-open'], {
-        cwd: process.cwd(), env: process.env, detached: true, windowsHide: true, stdio: ['ignore', log, log] })
-      fs.closeSync(log); launched.on('error', () => {}); launched.unref()
-      const initializedBy = Date.now() + 180000
-      while (!fs.existsSync(path.join(profile, 'package.json')) && Date.now() < initializedBy) {
-        if (launched.exitCode !== null || launched.signalCode !== null) break
-        await sleep(100)
-      }
-      if (!fs.existsSync(path.join(profile, 'package.json'))) throw new Error('DSH 未能初始化 profile；详情见本机安装记录。')
-      await sleep(2000)
+  console.log('正在检查 DSH 与插件…')
+  try {
+    if (!await mayHaveRunningDsh()) {
+      cli ||= await chooseDsh()
+      return await installStopped({ cli, home, profile, profileName, directory, id, runtime, assetsRoot, repair, open })
+    }
+    // A live host must identify the same home/profile; never synthesize a second
+    // profile just because this terminal inherited different environment values.
+    if (!fs.existsSync(path.join(profile, 'package.json'))) {
+      throw new Error('当前目录下没有此 DSH 配置，但检测到 DSH 正在运行。请使用相同的 DSH_HOME／--home 和 --profile，未修改正在运行的实例。')
     }
     const fd = fs.openSync(lockFile, 'wx', 0o600); fs.writeFileSync(fd, id); fs.closeSync(fd); locked = true
     const helper = path.join(directory, 'install-control.js')
@@ -95,17 +125,23 @@ export async function install({ profileName = 'web', cli = findDsh(), assetsRoot
         accept: v => Number.isInteger(v.pid) && v.pid > 0 && (!launched || v.pid === launched.pid),
         onWaiting: () => console.log('正在等待 DSH 完成安装准备，请勿重复执行命令…'),
         ensureRunning: async () => {
-          if (launched || await portBusy(Number(process.env.DSH_PORT || 3080))) return
+          if (launched || await portBusy(Number(process.env.DSH_PORT || 3080)) || await mayHaveRunningDsh()) return
+          cli ||= await chooseDsh()
           const log = fs.openSync(path.join(directory, 'startup.log'), 'a', 0o600)
           launched = spawn(process.execPath, [cli, '--profile', profileName, '--no-open'], {
-            cwd: process.cwd(), env: process.env, detached: true, windowsHide: true, stdio: ['ignore', log, log] })
+            cwd: process.cwd(), env: { ...process.env, DSH_HOME: home }, detached: true, windowsHide: true, stdio: ['ignore', log, log] })
           fs.closeSync(log); launched.on('error', () => {}); launched.unref()
         },
       })
+      if (!/^http:\/\/127\.0\.0\.1:[1-9]\d{0,4}$/.test(ref.origin) || Number(new URL(ref.origin).port) > 65535) {
+        ref = undefined
+        throw new Error('DSH 安装握手地址无效，未修改插件。')
+      }
       writePrivateJsonAtomic(path.join(directory, 'handshake.json'), {
         state: 'ready', elapsedMs: Date.now() - handshakeStarted, startedHost: Boolean(launched),
       })
-    } catch {
+    } catch (error) {
+      if (error.code !== 'DSH_HANDSHAKE_TIMEOUT') throw error
       writePrivateJsonAtomic(path.join(directory, 'handshake.json'), {
         state: 'timeout', elapsedMs: Date.now() - handshakeStarted, startedHost: Boolean(launched),
       })
@@ -113,17 +149,34 @@ export async function install({ profileName = 'web', cli = findDsh(), assetsRoot
     }
     job = { controlOrigin: ref.origin, statusToken: token }
     const host = await control(job, 'describe')
-    if (host.home !== home || host.profile !== profile || host.cli !== fs.realpathSync(cli) || (launched && host.pid !== launched.pid)) throw new Error('当前 DSH 身份与安装目标不一致，未修改安装。')
+    // The authenticated live host is authoritative. A global install or cached
+    // version found on PATH must not override the actual npx/local/source host.
+    // Explicit choices and installer-started hosts still require an exact match.
+    assertInstallTarget(host, { home, profile, cli, pid: launched?.pid || ref.pid })
     remove(); remove = undefined
     await sleep(600)
-    const selected = await selectRelease(host, assetsRoot, repair)
+    let selected = await selectRelease(host, assetsRoot, repair)
+    if (!selected.archive && host.pluginVersion === selected.release.version) {
+      // A version string on disk is not proof that a prior restart completed.
+      // Re-running the normal command must also repair a stuck installed copy.
+      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
+      } catch {}
+      if (!ready) {
+        console.log('检测到已安装插件尚未就绪，正在重新安装修复…')
+        selected = await selectRelease(host, assetsRoot, true)
+      }
+    }
     if (!selected.archive) { console.log(`插件 ${host.pluginVersion} 无需更新。`); return { version: host.pluginVersion, changed: false } }
     console.log(`正在安装插件 ${selected.release.version}，保留原配对与会话…`)
-    job = { ...host, id, directory, parentPid: host.pid, pnpm: runtime.cli, targetVersion: selected.release.version,
+    job = { ...host, argv: installHostArgv(host), id, directory, parentPid: host.pid, pnpm: runtime.cli, targetVersion: selected.release.version,
       previousVersion: host.pluginVersion, statusToken: token, controlOrigin: ref.origin }
     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'))
+    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'))
     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)
@@ -131,7 +184,9 @@ export async function install({ profileName = 'web', cli = findDsh(), assetsRoot
     writePrivateJsonAtomic(path.join(home, 'harness-remote-updates', `profile-${scope}.json`), { jobId: id, statusOrigin: ready.origin, statusToken: token })
     writePrivateJsonAtomic(path.join(directory, 'authorized.json'), { id }); authorized = true
     let previous = '', result
-    const until = Date.now() + 600000
+    // Native download/install has its own bounded deadline; allow its restart
+    // and possible rollback to finish before reporting an unknown outcome.
+    const until = Date.now() + 1200000
     while (Date.now() < until) {
       try { result = JSON.parse(fs.readFileSync(path.join(directory, 'result.json'), 'utf8')) } catch {}
       if (result?.phase !== previous && result?.phase) { console.log(`${result.progress}% ${result.message}`); previous = result.phase }
@@ -150,16 +205,29 @@ export async function install({ profileName = 'web', cli = findDsh(), assetsRoot
       } catch { console.log('插件已更新；请返回原 DSH WebUI 查看。') }
     }
     return { version: selected.release.version, changed: true }
-  } finally {
-    remove?.()
-    if (ref && !authorized) { try { await control({ controlOrigin: ref.origin, statusToken: token }, 'close') } catch {} }
-    if (locked && !authorized) releaseOwnedUpdateLock(lockFile, id)
+  } finally {
+    try { remove?.() }
+    finally {
+      if (ref && !authorized) { try { await control({ controlOrigin: ref.origin, statusToken: token }, 'close') } catch {} }
+      if (locked && !authorized) releaseOwnedUpdateLock(lockFile, id)
+    }
+  }
+}
+export function parseArguments(args) {
+  const options = {}, seen = new Set()
+  const names = { '--profile': 'profileName', '--dsh-cli': 'cli', '--home': 'home' }
+  for (let i = 0; i < args.length; i++) {
+    const flag = args[i]
+    if (seen.has(flag)) throw new Error('参数重复。使用 --help 查看用法。')
+    seen.add(flag)
+    if (flag === '--repair') options.repair = true
+    else if (names[flag] && args[i + 1] && !args[i + 1].startsWith('--')) options[names[flag]] = args[++i]
+    else throw new Error('不支持的参数。使用 --help 查看用法。')
   }
+  return options
 }
 if (process.argv[1] && fs.realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)) {
-  const args = process.argv.slice(2), repair = args.includes('--repair')
-  if (repair) args.splice(args.indexOf('--repair'), 1)
-  if (args.includes('--help') || args.includes('-h')) console.log('安装或升级 DSH 微信连接插件：npx -y dsh-wechat-remote@latest\n可选：--profile <名称>（默认 web）；--repair（重新安装当前兼容版本，不降级）')
-  else if (args.length && !(args.length === 2 && args[0] === '--profile')) { console.error('不支持的参数。使用 --help 查看用法。'); process.exitCode = 1 }
-  else install({ profileName: args[1] || 'web', repair }).catch(error => { console.error(error.message); process.exitCode = 1 })
+  const args = process.argv.slice(2)
+  if (args.includes('--help') || args.includes('-h')) console.log('安装或升级 DSH 微信连接插件：npx -y dsh-wechat-remote@latest\n支持全局安装与 npx 使用的 DSH，已启动或关闭均可；请在相同系统账号下执行。Windows 可使用 npx.cmd。\n可选：--profile <名称>（默认 web）；--home <DSH 数据目录>；--dsh-cli <DSH 的 lib/bin.js>；--repair（重新安装，不降级）')
+  else Promise.resolve().then(() => install(parseArguments(args))).catch(error => { console.error(error.message); process.exitCode = 1 })
 }

package/lib/install-control.js

@@ -1151,7 +1151,7 @@ async function createInstallControl(context, config) {
   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"));
-  if (manifest.name !== "@deepseek-ai/dsh" || process.execArgv.length || !process.argv.includes("web")) throw new Error("\u6B64 DSH \u542F\u52A8\u65B9\u5F0F\u5C1A\u4E0D\u652F\u6301\u81EA\u52A8\u66F4\u65B0\u3002");
+  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);
   const nativeExit = ctx.get("appExit");

package/lib/install-profile.js

@@ -3,127 +3,70 @@
 // src/install-profile.ts
 import fs from "node:fs";
 import path from "node:path";
-import { spawn } from "node:child_process";
-import { createHash } from "node:crypto";
-
-// src/secure-file.ts
-import { execFileSync } from "node:child_process";
-import {
-  chmodSync,
-  closeSync,
-  existsSync,
-  fsyncSync,
-  mkdirSync,
-  openSync,
-  readFileSync,
-  renameSync,
-  rmSync,
-  writeFileSync
-} from "node:fs";
-import { dirname } from "node:path";
-import { userInfo } from "node:os";
-import { randomBytes } from "node:crypto";
-function tightenPrivateFile(file) {
-  try {
-    chmodSync(file, 384);
-  } catch {
-  }
-  if (process.platform !== "win32") return;
-  try {
-    execFileSync("icacls", [file, "/inheritance:r", "/grant:r", `${userInfo().username}:F`], {
-      timeout: 5e3,
-      windowsHide: true,
-      stdio: "ignore"
-    });
-  } catch {
-  }
-}
-function writePrivateJsonAtomic(file, value) {
-  const parent = dirname(file);
-  mkdirSync(parent, { recursive: true, mode: 448 });
-  const temporary = `${file}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`;
-  try {
-    writeFileSync(temporary, `${JSON.stringify(value, null, 2)}
-`, {
-      encoding: "utf8",
-      mode: 384,
-      flag: "wx"
-    });
-    const fd = openSync(temporary, "r+");
-    try {
-      try {
-        fsyncSync(fd);
-      } catch {
-      }
-    } finally {
-      closeSync(fd);
-    }
-    tightenPrivateFile(temporary);
-    renameSync(temporary, file);
-    tightenPrivateFile(file);
-  } finally {
-    if (existsSync(temporary)) {
-      try {
-        rmSync(temporary, { force: true });
-      } catch {
-      }
-    }
-  }
-}
-
-// src/install-runtime.ts
-var INSTALL_PNPM_VERSION = "11.22.0";
-
-// src/install-profile.ts
+import { createHash, randomBytes } from "node:crypto";
+import { spawn, execFile } from "node:child_process";
 var PLUGIN_PACKAGE = "@harness-remote/dsh-wechat-remote";
 function safeProfileName(value) {
   return /^[A-Za-z0-9_-]{1,80}$/.test(value);
 }
-var hash = (file) => createHash("sha256").update(fs.readFileSync(file)).digest("hex");
-function assertRelocatableProfile(root) {
-  const walk = (directory) => {
-    for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
-      const file = path.join(directory, entry.name);
-      if (entry.isSymbolicLink()) {
-        const relative = path.relative(root, fs.realpathSync(file));
-        if (path.isAbsolute(fs.readlinkSync(file)) || !relative || relative.startsWith("..") || path.isAbsolute(relative)) {
-          throw new Error("\u63D2\u4EF6\u4F9D\u8D56\u5305\u542B\u4E0D\u53EF\u8FC1\u79FB\u7684\u94FE\u63A5\uFF0C\u672A\u4FEE\u6539\u5F53\u524D\u5B89\u88C5\u3002");
-        }
-      } else if (entry.isDirectory()) walk(file);
+function backupProfile(profile, backup) {
+  if (fs.existsSync(backup)) throw new Error("\u672C\u6B21\u5B89\u88C5\u5907\u4EFD\u5DF2\u5B58\u5728\uFF0C\u672A\u8986\u76D6\u3002");
+  fs.cpSync(profile, backup, {
+    recursive: true,
+    dereference: false,
+    verbatimSymlinks: true,
+    mode: fs.constants.COPYFILE_FICLONE,
+    filter(source, target) {
+      if (!fs.lstatSync(source).isSymbolicLink()) return true;
+      const type = process.platform === "win32" ? fs.statSync(source, { throwIfNoEntry: false })?.isDirectory() ? "junction" : "file" : void 0;
+      fs.symlinkSync(fs.readlinkSync(source), target, type);
+      return false;
     }
-  };
-  walk(root);
+  });
 }
 function installToolPath(directory, runtime) {
   const bin = path.join(directory, "tool-bin");
   fs.mkdirSync(bin, { mode: 448 });
-  const runner = path.join(bin, "pnpm-run.cjs");
-  fs.writeFileSync(runner, `require('node:child_process').spawnSync(${JSON.stringify(runtime.executable)},[${JSON.stringify(runtime.cli)},...process.argv.slice(2)],{stdio:'inherit',shell:false,windowsHide:true}).status===0?process.exit(0):process.exit(1)
-`, { mode: 384 });
   if (process.platform === "win32") {
-    if (/["\r\n]/.test(runtime.executable)) throw new Error("Node \u5B89\u88C5\u8DEF\u5F84\u4E0D\u53D7\u652F\u6301\u3002");
-    fs.writeFileSync(path.join(bin, "pnpm.cmd"), `@echo off\r
-"${runtime.executable.replace(/%/g, "%%")}" "%~dp0pnpm-run.cjs" %*\r
-`, { mode: 448 });
+    if (/["\r\n]/.test(runtime.executable + runtime.cli)) throw new Error("\u5B89\u88C5\u5DE5\u5177\u8DEF\u5F84\u5305\u542B\u65E0\u6548\u5B57\u7B26\u3002");
+    fs.writeFileSync(path.join(bin, "pnpm.cmd"), '@echo off\r\nsetlocal DisableDelayedExpansion\r\n"%HARNESS_INSTALL_NODE%" "%HARNESS_INSTALL_PNPM%" %*\r\n', { mode: 448 });
   } else {
-    const quote = (s) => "'" + s.replace(/'/g, `'"'"'`) + "'";
-    fs.writeFileSync(path.join(bin, "pnpm"), `#!/bin/sh
-exec ${quote(runtime.executable)} ${quote(runner)} "$@"
-`, { mode: 448 });
+    fs.writeFileSync(path.join(bin, "pnpm"), '#!/bin/sh\nexec "$HARNESS_INSTALL_NODE" "$HARNESS_INSTALL_PNPM" "$@"\n', { mode: 448 });
   }
   return bin;
 }
-function runNativePlugin(cli, profile, home, toolPath, runtime, logFile) {
-  if (!safeProfileName(profile)) throw new Error("\u65E0\u6548\u7684 DSH profile \u540D\u79F0\u3002");
+var NativeInstallError = class extends Error {
+  constructor(message, mayStillBeRunning = false) {
+    super(message);
+    this.mayStillBeRunning = mayStillBeRunning;
+    this.name = "NativeInstallError";
+  }
+};
+function runNativePlugin(cli, profile, home, toolPath, runtime, logFile, archiveName, timeoutMs = 6e5, operation = "add") {
+  if (!safeProfileName(profile) || !/^harness-remote-[\w.+-]+\.tgz$/.test(archiveName)) throw new Error("\u65E0\u6548\u7684\u5B89\u88C5\u76EE\u6807\u3002");
   return new Promise((resolve, reject) => {
     const log = fs.openSync(logFile, "a", 384);
+    const env = { ...process.env };
+    const pathKey = Object.keys(env).find((key) => key.toLowerCase() === "path");
+    const inheritedPath = pathKey ? env[pathKey] : "";
+    if (process.platform === "win32") {
+      for (const key of Object.keys(env)) if (key.toLowerCase() === "path") delete env[key];
+    }
+    Object.assign(env, {
+      DSH_HOME: home,
+      PATH: toolPath + path.delimiter + (inheritedPath || ""),
+      HARNESS_INSTALL_NODE: runtime.executable,
+      HARNESS_INSTALL_PNPM: runtime.cli,
+      CI: "true",
+      COREPACK_ENABLE_AUTO_PIN: "0",
+      npm_config_manage_package_manager_versions: "false"
+    });
     const child = spawn(runtime.executable, [
       cli,
       "plugin",
       "--profile",
       profile,
-      "add",
-      "file:harness-remote-update.tgz",
+      ...operation === "install" ? ["install"] : ["add", `file:${archiveName}`],
       "--ignore-scripts",
       "--config.frozen-lockfile=false",
       "--prefer-offline",
@@ -133,78 +76,89 @@ function runNativePlugin(cli, profile, home, toolPath, runtime, logFile) {
       cwd: home,
       shell: false,
       windowsHide: true,
+      detached: process.platform !== "win32",
       stdio: ["ignore", log, log],
-      env: {
-        ...process.env,
-        DSH_HOME: home,
-        PATH: toolPath + path.delimiter + (process.env.PATH || ""),
-        CI: "true",
-        COREPACK_ENABLE_AUTO_PIN: "0",
-        npm_config_manage_package_manager_versions: "false"
-      }
+      env
     });
     fs.closeSync(log);
-    const timer = setTimeout(() => {
-      child.kill();
-      reject(new Error("\u4E0B\u8F7D\u6216\u5B89\u88C5\u8D85\u65F6\uFF0C\u539F\u63D2\u4EF6\u672A\u66FF\u6362\u3002"));
-    }, 24e4);
-    child.once("error", () => {
+    let finished = false, terminating = false, closed = false, terminationTimer;
+    const fail = (message, uncertain = false) => finish(new NativeInstallError(`${message} \u5B89\u88C5\u65E5\u5FD7\uFF1A${logFile}`, uncertain));
+    const finish = (error) => {
+      if (finished) return;
+      finished = true;
       clearTimeout(timer);
-      reject(new Error("\u65E0\u6CD5\u542F\u52A8 DSH \u539F\u751F\u5B89\u88C5\u7A0B\u5E8F\u3002"));
-    });
-    child.once("close", (code) => {
-      clearTimeout(timer);
-      code === 0 ? resolve() : reject(new Error("\u5B89\u88C5\u672A\u5B8C\u6210\uFF0C\u539F\u63D2\u4EF6\u672A\u66FF\u6362\uFF1B\u8BE6\u60C5\u5DF2\u4FDD\u7559\u5728\u672C\u673A\u5B89\u88C5\u65E5\u5FD7\u3002"));
+      clearTimeout(terminationTimer);
+      error ? reject(error) : resolve();
+    };
+    const timer = setTimeout(() => {
+      if (closed) return;
+      terminating = true;
+      terminationTimer = setTimeout(() => fail("\u5B89\u88C5\u8D85\u65F6\uFF0C\u5C1A\u4E0D\u80FD\u786E\u8BA4\u5B89\u88C5\u8FDB\u7A0B\u5DF2\u9000\u51FA\uFF1B\u672A\u81EA\u52A8\u56DE\u9000\uFF0C\u8BF7\u52FF\u91CD\u590D\u5B89\u88C5\u3002", true), 15e3);
+      if (process.platform === "win32") {
+        if (!child.pid) return fail("\u5B89\u88C5\u7A0B\u5E8F\u672A\u542F\u52A8\u3002");
+        execFile(
+          path.join(process.env.SystemRoot || "C:\\Windows", "System32", "taskkill.exe"),
+          ["/PID", String(child.pid), "/T", "/F"],
+          { windowsHide: true, timeout: 1e4 },
+          (error) => {
+            if (error) fail("\u5B89\u88C5\u8D85\u65F6\uFF0C\u65E0\u6CD5\u786E\u8BA4\u5B89\u88C5\u8FDB\u7A0B\u6811\u5DF2\u9000\u51FA\uFF1B\u672A\u81EA\u52A8\u56DE\u9000\uFF0C\u8BF7\u52FF\u91CD\u590D\u5B89\u88C5\u3002", true);
+            else if (closed) fail("\u4E0B\u8F7D\u6216\u5B89\u88C5\u8D85\u65F6\uFF0C\u5B89\u88C5\u8FDB\u7A0B\u5DF2\u505C\u6B62\u3002");
+            else child.once("close", () => fail("\u4E0B\u8F7D\u6216\u5B89\u88C5\u8D85\u65F6\uFF0C\u5B89\u88C5\u8FDB\u7A0B\u5DF2\u505C\u6B62\u3002"));
+          }
+        );
+      } else {
+        try {
+          if (child.pid) process.kill(-child.pid, "SIGKILL");
+        } catch (error) {
+          if (error.code !== "ESRCH") return fail("\u65E0\u6CD5\u505C\u6B62\u8D85\u65F6\u7684\u5B89\u88C5\u8FDB\u7A0B\uFF1B\u672A\u81EA\u52A8\u56DE\u9000\u3002", true);
+        }
+        if (closed) fail("\u4E0B\u8F7D\u6216\u5B89\u88C5\u8D85\u65F6\uFF0C\u5B89\u88C5\u8FDB\u7A0B\u5DF2\u505C\u6B62\u3002");
+        else child.once("close", () => fail("\u4E0B\u8F7D\u6216\u5B89\u88C5\u8D85\u65F6\uFF0C\u5B89\u88C5\u8FDB\u7A0B\u5DF2\u505C\u6B62\u3002"));
+      }
+    }, timeoutMs);
+    child.once("error", (error) => fail(`\u65E0\u6CD5\u542F\u52A8 DSH \u539F\u751F\u5B89\u88C5\u7A0B\u5E8F\uFF08${error.code || error.name}\uFF09\u3002`));
+    child.once("close", (code, signal) => {
+      closed = true;
+      if (terminating) return;
+      if (code === 0) finish();
+      else fail(`DSH \u539F\u751F\u5B89\u88C5\u672A\u5B8C\u6210\uFF08${signal ? `\u4FE1\u53F7 ${signal}` : `\u9000\u51FA\u7801 ${code}`}\uFF09\u3002`);
     });
   });
 }
-async function stageProfile(job) {
-  const scope = path.basename(job.profile);
-  if (!safeProfileName(scope) || !fs.statSync(job.directory).isDirectory()) throw new Error("\u5B89\u88C5\u76EE\u6807\u4E0D\u660E\u786E\u3002");
-  const stagingHome = path.join(job.directory, "staging-home"), staged = path.join(stagingHome, "profiles", scope);
-  fs.mkdirSync(staged, { recursive: true, mode: 448 });
-  if (fs.existsSync(job.profile)) {
-    if (fs.lstatSync(job.profile).isSymbolicLink() || fs.realpathSync(job.profile) !== path.resolve(job.profile)) throw new Error("\u4E0D\u652F\u6301\u81EA\u52A8\u66FF\u6362\u94FE\u63A5\u5F62\u5F0F\u7684 profile\u3002");
-    fs.cpSync(job.profile, staged, {
-      recursive: true,
-      dereference: false,
-      filter: (p) => !["node_modules", ".harness-remote-update.lock"].includes(path.basename(p))
-    });
-  }
-  let before = null;
-  const filename = path.join(staged, "package.json");
-  if (fs.existsSync(filename)) {
-    before = JSON.parse(fs.readFileSync(filename, "utf8"));
-    for (const [name, spec] of Object.entries(before.dependencies || {})) {
-      if (name !== PLUGIN_PACKAGE && !/^[~^]?\d+\.\d+\.\d+(?:-[\w.-]+)?$/.test(String(spec))) throw new Error("\u5176\u4ED6\u63D2\u4EF6\u4F7F\u7528\u4E86\u672C\u5730\u94FE\u63A5\u6216\u7279\u6B8A\u6765\u6E90\uFF0C\u672A\u4FEE\u6539\u5F53\u524D\u5B89\u88C5\u3002");
-    }
-    for (const e of fs.readdirSync(staged, { withFileTypes: true })) if (e.isSymbolicLink()) throw new Error("profile \u914D\u7F6E\u5305\u542B\u94FE\u63A5\uFF0C\u672A\u4FEE\u6539\u5F53\u524D\u5B89\u88C5\u3002");
-    if (before.packageManager && !/^pnpm@\d+\.\d+\.\d+(?:\+.*)?$/.test(before.packageManager)) throw new Error("\u5F53\u524D profile \u4F7F\u7528\u4E86\u5176\u4ED6\u5305\u7BA1\u7406\u5668\uFF0C\u672A\u4FEE\u6539\u5B89\u88C5\u3002");
-    writePrivateJsonAtomic(filename, { ...before, dependencies: {
-      ...before.dependencies,
-      [PLUGIN_PACKAGE]: "file:harness-remote-update.tgz"
-    }, packageManager: `pnpm@${INSTALL_PNPM_VERSION}` });
-  }
-  fs.copyFileSync(path.join(job.directory, "release.tgz"), path.join(staged, "harness-remote-update.tgz"));
+async function installProfile(job) {
+  const scope = path.basename(job.profile), home = path.dirname(path.dirname(job.profile));
+  if (!safeProfileName(scope) || path.dirname(job.profile) !== path.join(home, "profiles") || !/^[\w.+-]{1,80}$/.test(job.targetVersion)) throw new Error("\u5B89\u88C5\u76EE\u6807\u4E0D\u660E\u786E\u3002");
+  fs.mkdirSync(job.profile, { recursive: true, mode: 448 });
+  const archive = path.join(job.directory, "release.tgz");
+  const digest = createHash("sha256").update(fs.readFileSync(archive)).digest("hex");
+  const archiveBase = `harness-remote-${job.targetVersion}-${digest}`;
+  const suffix = fs.existsSync(path.join(job.profile, `${archiveBase}.tgz`)) ? `-${randomBytes(8).toString("hex")}` : "";
+  const archiveName = `${archiveBase}${suffix}.tgz`;
+  fs.copyFileSync(archive, path.join(job.profile, archiveName), fs.constants.COPYFILE_EXCL);
   const tools = installToolPath(job.directory, job.runtime);
-  await runNativePlugin(job.cli, scope, stagingHome, tools, job.runtime, path.join(job.directory, "install.log"));
-  const installed = fs.realpathSync(path.join(staged, "node_modules", PLUGIN_PACKAGE));
-  const relative = path.relative(staged, installed);
-  if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) throw new Error("\u6682\u5B58\u63D2\u4EF6\u4E0D\u5728\u5B89\u88C5\u76EE\u5F55\u5185\u3002");
+  const logFile = path.join(job.directory, "install.log");
+  const deadline = Date.now() + 6e5;
+  const run = (operation = "add") => runNativePlugin(job.cli, scope, home, tools, job.runtime, logFile, archiveName, Math.max(1, deadline - Date.now()), operation);
+  try {
+    await run();
+  } catch (error) {
+    const layoutError = /^\s*(?:\[ERR_PNPM_|ERR_PNPM_)(?:UNEXPECTED_VIRTUAL_STORE|UNEXPECTED_STORE|MODULES_BREAKING_CHANGE|VIRTUAL_STORE_DIR_MAX_LENGTH_DIFF|PUBLIC_HOIST_PATTERN_DIFF|HOIST_PATTERN_DIFF)(?:\]|\s)/m;
+    if (!(error instanceof NativeInstallError) || error.mayStillBeRunning || !layoutError.test(fs.readFileSync(logFile, "utf8"))) throw error;
+    fs.appendFileSync(logFile, "\nRestoring native pnpm layout with dsh plugin install.\n");
+    await run("install");
+    await run();
+  }
+  const installed = path.join(job.profile, "node_modules", PLUGIN_PACKAGE);
   if (JSON.parse(fs.readFileSync(path.join(installed, "package.json"), "utf8")).version !== job.targetVersion) throw new Error("\u5B89\u88C5\u540E\u63D2\u4EF6\u7248\u672C\u4E0D\u5339\u914D\u3002");
-  const after = JSON.parse(fs.readFileSync(filename, "utf8"));
+  const after = JSON.parse(fs.readFileSync(path.join(job.profile, "package.json"), "utf8"));
   if (!after.dsh?.profile?.bundles?.includes(PLUGIN_PACKAGE)) throw new Error("DSH \u5C1A\u672A\u5C06\u63D2\u4EF6\u6CE8\u518C\u4E3A\u539F\u751F profile \u5C42\u3002");
-  for (const name of Object.keys(before?.dependencies || {})) if (name !== PLUGIN_PACKAGE) {
-    if (hash(path.join(job.profile, "node_modules", name, "package.json")) !== hash(path.join(staged, "node_modules", name, "package.json"))) throw new Error("\u5B89\u88C5\u8BD5\u56FE\u6539\u53D8\u5176\u4ED6\u63D2\u4EF6\uFF0C\u539F\u5B89\u88C5\u4FDD\u6301\u4E0D\u53D8\u3002");
-  }
-  assertRelocatableProfile(staged);
-  return staged;
 }
 export {
+  NativeInstallError,
   PLUGIN_PACKAGE,
-  assertRelocatableProfile,
+  backupProfile,
+  installProfile,
   installToolPath,
   runNativePlugin,
-  safeProfileName,
-  stageProfile
+  safeProfileName
 };