@dsh-sup/dsh-core-linux-x64 0.1.6-BETA.8 → 0.1.6-BETA.9

package/core.cjs

@@ -947,7 +947,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.6-BETA.8");
+      if (true) return String("0.1.6-BETA.9");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -6571,6 +6571,16 @@ var require_registry_ref = __commonJS({
       const tail = segments.filter((s) => s !== "" && s != null).map((s) => String(s).replace(/^\/+/, "").replace(/\/+$/, "")).filter(Boolean).join("/");
       return tail ? parsed.base + "/" + tail : parsed.base;
     }
+    function registryEnvPair(base) {
+      const parsed = parseRegistryBase(base);
+      if (!parsed.ok) return { ok: false, violation: parsed.violation, base: null, env: null };
+      return {
+        ok: true,
+        violation: null,
+        base: parsed.base,
+        env: { npm_config_registry: parsed.base, NPM_CONFIG_REGISTRY: parsed.base }
+      };
+    }
     async function readCapped(res, maxBytes) {
       const cl = Number(res.headers && res.headers.get("content-length")) || 0;
       if (cl > maxBytes) return null;
@@ -6666,6 +6676,7 @@ var require_registry_ref = __commonJS({
       normalizeBase,
       hostViolation,
       parseRegistryBase,
+      registryEnvPair,
       registryPackagePath,
       registryUrl,
       fetchRegistry
@@ -6678,6 +6689,7 @@ var require_policies = __commonJS({
   "src/platform/distribution/policies.js"(exports2, module2) {
     "use strict";
     var registryRef = require_registry_ref();
+    var NPM_TIMEOUT_MS = { install: 6e5, uninstall: 9e5 };
     var FALLBACK_REGISTRIES = [
       "https://registry.npmjs.org",
       "https://registry.npmmirror.com"
@@ -6720,6 +6732,7 @@ var require_policies = __commonJS({
     }
     module2.exports = {
       FALLBACK_REGISTRIES,
+      NPM_TIMEOUT_MS,
       registryOriginViolation,
       effectiveOrigins,
       rebuildRegistryConfig,
@@ -7387,21 +7400,31 @@ var require_version_check = __commonJS({
         return null;
       }
     }
-    async function fetchLatestVersion(state, pkg, channel, opts) {
+    async function fetchVersionInfo(state, pkg, channel, opts) {
       const ch = channel || "npm";
       const o = opts || {};
       if (ch === "github") {
         const slash = String(pkg).split("/");
-        if (slash.length >= 2) return fetchGithubLatest(slash[0], slash.slice(1).join("/"));
-        return null;
+        const version = slash.length >= 2 ? await fetchGithubLatest(slash[0], slash.slice(1).join("/")) : null;
+        return {
+          ok: !!version,
+          version: version || null,
+          origin: null,
+          attempts: [],
+          error: version ? null : "GitHub Releases \u672A\u67E5\u8BE2\u5230 " + pkg + " \u7684\u6700\u65B0\u7248"
+        };
       }
-      const r = await fetchNpmLatest(state, pkg, { authoritative: o.authoritative === true });
+      return fetchNpmLatest(state, pkg, { authoritative: o.authoritative === true });
+    }
+    async function fetchLatestVersion(state, pkg, channel, opts) {
+      const r = await fetchVersionInfo(state, pkg, channel, opts);
       return r.ok ? r.version : null;
     }
     module2.exports = {
       METADATA_TIMEOUT_MS,
       FETCH_BUDGET_MS,
       fetchNpmLatest,
+      fetchVersionInfo,
       fetchLatestVersion
     };
   }
@@ -7485,6 +7508,7 @@ var require_install = __commonJS({
     var service = require_service().current();
     var { VERSION_RE } = require_version2();
     var ref = require_registry_ref();
+    var policies = require_policies();
     var input = require_input();
     var PKG_NAME_RE = input.PKG_NAME_RE;
     var BAD_ARGV_CHAR_RE = input.ARGV_UNSAFE_RE;
@@ -7505,51 +7529,55 @@ var require_install = __commonJS({
     }
     function runNpmInstall(opts) {
       const o = opts || {};
+      const action = o.action === void 0 || o.action === null ? "install" : String(o.action);
+      const bad = (r) => ({ ok: false, error: null, output: [], exitCode: null, timedOut: false, aborted: false, ...r });
+      const fail = (error) => Promise.resolve(bad({ error }));
+      if (action !== "install" && action !== "uninstall") return fail("runNpmInstall: \u672A\u77E5 action\uFF08\u53EA\u63A5\u53D7 install/uninstall\uFF09: " + action.slice(0, 40));
       const pkg = o.pkg || "@deepseek-ai/dsh";
-      if (!o.version) return Promise.resolve({ ok: false, error: "runNpmInstall: \u7F3A\u5C11 version\uFF08\u5FC5\u987B\u663E\u5F0F\u643A\u5E26\uFF09", output: [] });
-      if (!PKG_NAME_RE.test(pkg)) return Promise.resolve({ ok: false, error: "runNpmInstall: \u975E\u6CD5\u5305\u540D\uFF08\u5B57\u7B26\u96C6\u767D\u540D\u5355\u4E0D\u901A\u8FC7\uFF09: " + String(pkg).slice(0, 80), output: [] });
-      if (!VERSION_RE.test(String(o.version))) return Promise.resolve({ ok: false, error: "runNpmInstall: \u975E\u6CD5\u7248\u672C\u53F7\uFF08\u987B\u4E3A\u4E25\u683C semver\uFF09: " + String(o.version).slice(0, 80), output: [] });
+      if (action === "install" && !o.version) return fail("runNpmInstall: \u7F3A\u5C11 version\uFF08\u5FC5\u987B\u663E\u5F0F\u643A\u5E26\uFF09");
+      if (!PKG_NAME_RE.test(pkg)) return fail("runNpmInstall: \u975E\u6CD5\u5305\u540D\uFF08\u5B57\u7B26\u96C6\u767D\u540D\u5355\u4E0D\u901A\u8FC7\uFF09: " + String(pkg).slice(0, 80));
+      if (action === "install" && !VERSION_RE.test(String(o.version))) return fail("runNpmInstall: \u975E\u6CD5\u7248\u672C\u53F7\uFF08\u987B\u4E3A\u4E25\u683C semver\uFF09: " + String(o.version).slice(0, 80));
       let argv;
-      const launcher = runtimeContract.npmLauncher();
+      const contractLauncher = runtimeContract.npmLauncher();
+      const launcher = o.launcher && o.launcher.program ? { program: String(o.launcher.program), args: Array.isArray(o.launcher.args) ? o.launcher.args.map(String) : [] } : contractLauncher;
       let bin = launcher.program;
       if (Array.isArray(o.commandTemplate) && o.commandTemplate.length) {
-        argv = o.commandTemplate.map((s) => String(s).replace(/{pkg}/g, pkg).replace(/{version}/g, o.version).replace(/{prefix}/g, o.prefix || ""));
+        argv = o.commandTemplate.map((s) => String(s).replace(/{pkg}/g, pkg).replace(/{version}/g, o.version || "").replace(/{prefix}/g, o.prefix || ""));
         const fromTemplate = argv[0] !== "npm";
         bin = fromTemplate ? argv[0] : launcher.program;
         argv = (fromTemplate ? [] : launcher.args).concat(argv.slice(1));
         if (!fromTemplate && launcher.source === "path" && bin === "npm" && !execPath.resolveExecutable("npm")) {
-          return Promise.resolve({ ok: false, error: 'runNpmInstall: \u672A\u627E\u5230\u53EF\u6267\u884C\u7684 npm\uFF08commandTemplate[0]="npm" \u89E3\u6790\u5931\u8D25\uFF09', output: [] });
+          return fail('runNpmInstall: \u672A\u627E\u5230\u53EF\u6267\u884C\u7684 npm\uFF08commandTemplate[0]="npm" \u89E3\u6790\u5931\u8D25\uFF09');
         }
         for (const a of argv) {
           if (BAD_ARGV_CHAR_RE.test(String(a)) && !WIN_DRIVE_ABS_RE.test(String(a))) {
-            return Promise.resolve({ ok: false, error: "runNpmInstall: commandTemplate \u66FF\u6362\u540E\u542B\u7981\u7528\u5B57\u7B26\uFF08\u7A7A\u767D/shell \u5143\u5B57\u7B26\uFF09: " + String(a).slice(0, 80), output: [] });
+            return fail("runNpmInstall: commandTemplate \u66FF\u6362\u540E\u542B\u7981\u7528\u5B57\u7B26\uFF08\u7A7A\u767D/shell \u5143\u5B57\u7B26\uFF09: " + String(a).slice(0, 80));
           }
         }
       } else {
-        argv = [...launcher.args, "install", "-g", "--no-audit", "--no-fund"];
+        argv = [...launcher.args, action, "-g"];
+        if (action === "install") argv.push("--no-audit", "--no-fund");
         argv.push("--ignore-scripts");
         if (o.prefix) {
           const pv = input.prefixViolation(o.prefix);
-          if (pv) return Promise.resolve({ ok: false, error: "runNpmInstall: " + pv, output: [] });
+          if (pv) return fail("runNpmInstall: " + pv);
           argv.push("--prefix", String(o.prefix));
         }
-        argv.push(pkg + "@" + o.version);
+        argv.push(action === "install" ? pkg + "@" + o.version : pkg);
       }
       const envVars = runtimeContract.withPath(process.env);
-      if (o.registry) {
-        const rv = ref.parseRegistryBase(o.registry);
-        if (!rv.ok) {
-          return Promise.resolve({ ok: false, error: "runNpmInstall: \u975E\u6CD5 registry \u57FA\u5740\uFF08" + rv.violation + "\uFF09: " + String(o.registry).slice(0, 80), output: [] });
-        }
-        envVars.npm_config_registry = rv.base;
-        envVars.NPM_CONFIG_REGISTRY = rv.base;
+      if (o.registry && action === "install") {
+        const rp = ref.registryEnvPair(o.registry);
+        if (!rp.ok) return fail("runNpmInstall: \u975E\u6CD5 registry \u57FA\u5740\uFF08" + rp.violation + "\uFF09: " + String(o.registry).slice(0, 80));
+        Object.assign(envVars, rp.env);
       }
+      const timeoutMs = Number(o.timeoutMs) > 0 ? Number(o.timeoutMs) : policies.NPM_TIMEOUT_MS[action];
       return new Promise((resolve) => {
         let child;
         try {
           child = spawnOS.piped(bin, argv, { env: envVars, detached: o.detached !== false });
         } catch (e) {
-          return resolve({ ok: false, error: e.message, output: [] });
+          return resolve(bad({ error: e.message }));
         }
         const out = [];
         let settled = false;
@@ -7576,13 +7604,13 @@ var require_install = __commonJS({
           pid: child.pid,
           abort: (reason) => {
             killTree();
-            finish({ ok: false, aborted: true, error: "\u5B89\u88C5\u88AB\u4E2D\u6B62: " + (reason || "guard-exit"), output: out });
+            finish(bad({ aborted: true, error: "npm " + action + " \u88AB\u4E2D\u6B62: " + (reason || "guard-exit"), output: out }));
           }
         };
         const timer = setTimeout(() => {
           killTree();
-          finish({ ok: false, error: "\u5B89\u88C5\u8D85\u65F6", output: out });
-        }, o.timeoutMs || 6e5);
+          finish(bad({ timedOut: true, error: "npm " + action + " \u8D85\u65F6\uFF08" + Math.round(timeoutMs / 1e3) + "s\uFF09\u5DF2\u7EC8\u6B62", output: out }));
+        }, timeoutMs);
         INFLIGHT_NPM.add(handle);
         const onLine = (buf) => {
           for (const l of String(buf).split(/\r?\n/)) {
@@ -7600,10 +7628,11 @@ var require_install = __commonJS({
         child.stdout.on("data", onLine);
         child.stderr.on("data", onLine);
         child.on("error", (e) => {
-          finish({ ok: false, error: e.message, output: out });
+          finish(bad({ error: e.message, output: out }));
         });
         child.on("exit", (code) => {
-          finish({ ok: code === 0, error: code === 0 ? null : "npm install \u9000\u51FA\u7801 " + code, output: out });
+          const c = code === null ? -1 : code;
+          finish({ ok: c === 0, error: c === 0 ? null : "npm " + action + " \u9000\u51FA\u7801 " + c, output: out, exitCode: c, timedOut: false, aborted: false });
         });
       });
     }
@@ -7724,10 +7753,15 @@ var require_distribution = __commonJS({
         return policies.isInCanaryList(this);
       }
       // ---- 版本检查 / 安装 / 健康（version-check.js + install.js）----
-      // fetchNpmLatest 回结构化结果（含实际给出该版本的 origin 与逐源原因）；fetchLatestVersion 只回版本字符串。
+      // fetchNpmLatest 回 npm 通道的结构化结果（含给出该版本的 origin 与逐源原因）。
+      // fetchVersionInfo 是**跨通道**的结构化口（npm|github，github 的 origin 恒 null）；
+      // fetchLatestVersion 只回版本字符串，只要版本号的调用方走它。
       fetchNpmLatest(pkg, opts) {
         return versionCheck.fetchNpmLatest(this, pkg, opts);
       }
+      fetchVersionInfo(pkg, channel, opts) {
+        return versionCheck.fetchVersionInfo(this, pkg, channel, opts);
+      }
       fetchLatestVersion(pkg, channel, opts) {
         return versionCheck.fetchLatestVersion(this, pkg, channel, opts);
       }
@@ -15429,6 +15463,7 @@ var require_pkg_cache = __commonJS({
     var fs2 = require("node:fs");
     var ex2 = require_exec();
     var { npxCacheDir, npxLauncher } = require_npx_forms();
+    var registryRef = require_registry_ref();
     var HASH_DIR_RE = /^[0-9a-f]{8,}$/i;
     function pkgCacheDirs(pkg) {
       if (!pkg) return [];
@@ -15495,10 +15530,8 @@ var require_pkg_cache = __commonJS({
       try {
         const regOrigin = provider.dist ? await provider.dist.registryOrigin(false).catch(() => null) : null;
         const env = Object.assign({}, process.env);
-        if (regOrigin) {
-          env.npm_config_registry = regOrigin;
-          env.NPM_CONFIG_REGISTRY = regOrigin;
-        }
+        const rp = registryRef.registryEnvPair(regOrigin);
+        if (rp.ok) Object.assign(env, rp.env);
         const launcher = npxLauncher();
         await ex2.runOutAsync(launcher.program, [...launcher.args, "--yes", app.pkg, "--help"], { env, timeoutMs: 12e4 });
         return { ok: !!cachedPkgBin(app.pkg) };
@@ -15526,6 +15559,7 @@ var require_probe5 = __commonJS({
     var { cachedPkgBin, ensurePkgCached } = require_pkg_cache();
     var stateRoot2 = require_state_root();
     var { Rotator } = require_log();
+    var registryRef = require_registry_ref();
     var INSTANCE_LOG_MAX_BYTES = 2 * 1024 * 1024;
     async function spawnInstance(provider, inst) {
       const app = provider.app;
@@ -15595,10 +15629,9 @@ var require_probe5 = __commonJS({
           envVars[k] = String(v).replace("{{key}}", inst.key).replace("{{port}}", String(port));
         }
       }
-      if (launch.registry) {
-        envVars.npm_config_registry = launch.registry;
-        envVars.NPM_CONFIG_REGISTRY = launch.registry;
-      }
+      const rpReg = registryRef.registryEnvPair(launch.registry);
+      if (rpReg.ok) Object.assign(envVars, rpReg.env);
+      else if (launch.registry && provider.logger) provider.logger.warn("[proxy-instance] \u5951\u7EA6 registry \u975E\u6CD5\uFF08" + rpReg.violation + "\uFF09\uFF0C\u6539\u7528 npx \u9ED8\u8BA4\u6E90");
       const logFilter = /error|streaming|idle|timeout|ECONN|abort|socket|finish|truncat/i;
       const baseDir = provider.stateDir || stateRoot2.supervisorDir();
       let logWriter = null;
@@ -22071,6 +22104,7 @@ var require_cli = __commonJS({
     "use strict";
     var spawn = require_spawn();
     var procOS = require_process();
+    var registryRef = require_registry_ref();
     var { assertSafeCliArgs, cliArgv } = require_policies2();
     var CLI_TIMEOUT_MS = 18e4;
     var DEFAULT_REGISTRY = "https://registry.npmjs.org";
@@ -22099,12 +22133,10 @@ var require_cli = __commonJS({
           }
         };
         Promise.resolve().then(() => registryOrigin2()).then((regRaw) => {
-          const reg = regRaw || null;
+          const rp = registryRef.registryEnvPair(regRaw);
           const envBase = Object.assign({}, process.env, target.env);
-          if (reg) {
-            envBase.npm_config_registry = reg;
-            envBase.NPM_CONFIG_REGISTRY = reg;
-          } else if (logger && logger.warn) logger.warn("plugin CLI: \u65E0\u53EF\u7528\u7684 registry \u955C\u50CF\uFF0C\u56DE\u9000 pnpm \u9ED8\u8BA4\uFF08npmjs.org\uFF09");
+          if (rp.ok) Object.assign(envBase, rp.env);
+          else if (logger && logger.warn) logger.warn("plugin CLI: \u65E0\u53EF\u7528\u7684 registry \u955C\u50CF\uFF08" + rp.violation + "\uFF09\uFF0C\u56DE\u9000 pnpm \u9ED8\u8BA4\uFF08npmjs.org\uFF09");
           const env = envBase;
           let child;
           try {
@@ -23635,7 +23667,7 @@ var require_npm = __commonJS({
     async function latestVersion(host2) {
       if (!host2.dist || !host2.config.packageName) throw new Error("\u5206\u53D1\u670D\u52A1\u672A\u521D\u59CB\u5316\uFF0C\u65E0\u6CD5\u67E5\u8BE2\u6700\u65B0\u7248\u672C");
       const channel = host2.config.releaseChannel || "npm";
-      return host2.dist.fetchLatestVersion(host2.config.packageName, channel);
+      return host2.dist.fetchVersionInfo(host2.config.packageName, channel);
     }
     async function selectRegistry(host2) {
       if (!host2.dist) return null;
@@ -23645,23 +23677,29 @@ var require_npm = __commonJS({
         return null;
       }
     }
-    function runInstall(host2, version, registry) {
-      if (!host2.dist) return Promise.resolve({ ok: false, error: "dist \u5206\u53D1\u670D\u52A1\u4E0D\u53EF\u7528\uFF0C\u65E0\u6CD5\u5B89\u88C5", output: [] });
-      const pkg = host2.config.packageName || "@deepseek-ai/dsh";
-      const tpl = host2.config.installCommandTemplate;
+    function runNpm(host2, opts) {
+      const a = opts && opts.action || "install";
+      const verb = a === "uninstall" ? "\u5378\u8F7D" : "\u5B89\u88C5";
+      if (!host2.dist) return Promise.resolve({ ok: false, error: "dist \u5206\u53D1\u670D\u52A1\u4E0D\u53EF\u7528\uFF0C\u65E0\u6CD5" + verb, output: [] });
+      const tpl = a === "install" ? host2.config.installCommandTemplate : null;
       return host2.dist.runNpmInstall({
-        pkg,
-        version,
-        registry,
+        action: a,
+        pkg: host2.config.packageName || "@deepseek-ai/dsh",
+        version: opts && opts.version,
+        // 前缀单源：装与卸必须落在同一个全局前缀，否则「卸载成功」而包还在原地。
+        prefix: host2.npmRoot || null,
+        registry: opts && opts.registry,
+        // 只在显式注入过 npm 形态时接管启动形态；生产留空，由执行器按运行期契约解析一次。
+        launcher: host2._npmBin ? npmLaunch(host2) : null,
         commandTemplate: Array.isArray(tpl) && tpl.length ? tpl : null,
-        timeoutMs: host2.config.upgradeTimeoutMs || 6e5,
+        timeoutMs: a === "uninstall" ? host2.config.uninstallTimeoutMs : host2.config.upgradeTimeoutMs,
         onLine: (l) => {
           host2._appendUpgradeLog(l);
           if (host2.installing) host2._appendInstallLog(l);
         }
       });
     }
-    module2.exports = { npmLaunch, resolveNpmRoot, checkEnvironment, latestVersion, selectRegistry, runInstall };
+    module2.exports = { npmLaunch, resolveNpmRoot, checkEnvironment, latestVersion, selectRegistry, runNpm };
   }
 });
 
@@ -23670,9 +23708,6 @@ var require_ops4 = __commonJS({
   "src/app/native/ops.js"(exports2, module2) {
     "use strict";
     var fs2 = require("node:fs");
-    var spawnOS = require_spawn();
-    var { killTree } = require_process();
-    var { npmLaunch } = require_npm();
     var policies = require_policies3();
     var PKG_DEFAULT = "@deepseek-ai/dsh";
     function status(host2) {
@@ -23704,13 +23739,15 @@ var require_ops4 = __commonJS({
           host2.lastCheck = { at: (/* @__PURE__ */ new Date()).toISOString(), installed: null, latest: null, updateAvailable: false, note: "not-installed" };
           return policies.versionInfo(host2, installed);
         }
-        const latest = await host2._latestVersion();
+        const info = await host2._latestVersion();
+        const latest = info.ok ? info.version : null;
         host2.lastCheck = {
           at: (/* @__PURE__ */ new Date()).toISOString(),
           installed,
           latest,
           updateAvailable: latest ? policies.isNewer(latest, installed) : false,
-          error: latest ? null : "\u955C\u50CF\u6E90\u4E0D\u53EF\u8FBE\u6216\u672A\u67E5\u8BE2\u5230\u7248\u672C"
+          // 拒因指名到源：「镜像源全挂」与「确实没有更新」显示成两句话是这块的全部意义。
+          error: latest ? null : info.error || "\u955C\u50CF\u6E90\u4E0D\u53EF\u8FBE\u6216\u672A\u67E5\u8BE2\u5230\u7248\u672C"
         };
         if (host2.events) host2.events.append("version_checked", { installed, latest, updateAvailable: host2.lastCheck.updateAvailable });
       } catch (e) {
@@ -23737,20 +23774,24 @@ var require_ops4 = __commonJS({
         if (!env.ok) return { ok: false, error: "\u73AF\u5883\u68C0\u67E5\u5931\u8D25: " + env.errors.join("; ") };
         task = beginTask(host2, "install", { to: version || null, createdBy: "user" });
         let target = version;
+        let registry = null;
         if (!target) {
-          target = await host2._latestVersion().catch(() => null);
-          if (!target) {
+          const info = await host2._latestVersion().catch(() => null);
+          if (!info || !info.ok || !info.version) {
             host2.installing = null;
-            if (task) host2.tasks.fail(task.id, "\u65E0\u6CD5\u4ECE\u955C\u50CF\u6E90\u83B7\u53D6\u6700\u65B0\u7248\u672C");
-            return { ok: false, error: "\u65E0\u6CD5\u4ECE\u955C\u50CF\u6E90\u83B7\u53D6\u6700\u65B0\u7248\u672C" };
+            const why = info && info.error || "\u65E0\u6CD5\u4ECE\u955C\u50CF\u6E90\u83B7\u53D6\u6700\u65B0\u7248\u672C";
+            if (task) host2.tasks.fail(task.id, why);
+            return { ok: false, error: why };
           }
+          target = info.version;
+          registry = info.origin;
         }
-        const registry = await host2._selectRegistry();
+        if (!registry) registry = await host2._selectRegistry();
         const pkg = host2.config.packageName || PKG_DEFAULT;
         if (task) host2.tasks.log(task.id, "\u5B89\u88C5 " + pkg + "@" + target + (registry ? " via " + registry : ""));
         if (host2.events) host2.events.append("native_install_started", { version: target, registry });
         if (host2.logger.info) host2.logger.info("native install: " + pkg + "@" + target + (registry ? " via " + registry : ""));
-        const res = await host2._runInstall(target, registry);
+        const res = await host2._runNpm({ action: "install", version: target, registry });
         if (!res.ok) {
           host2.installing = null;
           host2.lastInstall = { ok: false, version: null, error: res.error, at: (/* @__PURE__ */ new Date()).toISOString(), log: host2.installLog.slice(-8) };
@@ -23842,46 +23883,9 @@ var require_ops4 = __commonJS({
           host2.tasks.start(task.id);
           host2.tasks.log(task.id, "\u5378\u8F7D " + (host2.config.packageName || PKG_DEFAULT));
         }
-        const pkg = host2.config.packageName || PKG_DEFAULT;
-        const uninstallArgs = ["uninstall", "-g"];
-        if (host2.npmRoot) uninstallArgs.push("--prefix", host2.npmRoot);
-        uninstallArgs.push(pkg);
-        const UNINSTALL_TIMEOUT_MS = typeof host2.config.uninstallTimeoutMs === "number" && host2.config.uninstallTimeoutMs > 0 ? host2.config.uninstallTimeoutMs : 15 * 60 * 1e3;
-        let uninstallTimedOut = false;
-        const exitCode = await new Promise((resolve) => {
-          let child;
-          try {
-            const np = npmLaunch(host2);
-            child = spawnOS.piped(np.program, np.args.concat(uninstallArgs));
-          } catch (e) {
-            return resolve(-1);
-          }
-          child.stdout.resume();
-          child.stderr.resume();
-          let done = false;
-          const finish = (code) => {
-            if (done) return;
-            done = true;
-            clearTimeout(timer);
-            resolve(code);
-          };
-          const timer = setTimeout(() => {
-            uninstallTimedOut = true;
-            host2.logger.warn && host2.logger.warn("npm uninstall \u8D85\u65F6\uFF08" + Math.round(UNINSTALL_TIMEOUT_MS / 1e3) + "s\uFF09\uFF0C\u7EC8\u6B62\u8FDB\u7A0B\u6811");
-            try {
-              killTree(child.pid, "SIGKILL", () => finish(-1));
-            } catch (e) {
-              try {
-                child.kill("SIGKILL");
-              } catch (e2) {
-              }
-              finish(-1);
-            }
-          }, UNINSTALL_TIMEOUT_MS);
-          if (timer.unref) timer.unref();
-          child.on("error", () => finish(-1));
-          child.on("exit", (code) => finish(code == null ? -1 : code));
-        });
+        const res = await host2._runNpm({ action: "uninstall" });
+        const exitCode = res.ok === true ? 0 : Number.isFinite(res.exitCode) ? res.exitCode : -1;
+        const timedOut = res.timedOut === true || res.aborted === true;
         if (exitCode === 0 && m) {
           if (m.packageDir) rm(m.packageDir);
           if (m.binPath) rm(m.binPath);
@@ -23892,17 +23896,17 @@ var require_ops4 = __commonJS({
         } else {
           host2.logger.warn && host2.logger.warn("npm uninstall exit " + exitCode + "\uFF0C\u4FDD\u7559 manifest \u4EE5\u4FBF\u91CD\u8BD5\uFF08\u6570\u636E\u8DEF\u5F84\u672A\u5220\uFF09");
         }
-        const uninstallError = exitCode === 0 ? null : uninstallTimedOut ? "npm uninstall \u8D85\u65F6\uFF08" + Math.round(UNINSTALL_TIMEOUT_MS / 1e3) + "s\uFF09\u5DF2\u7EC8\u6B62\uFF0C\u5305\u53EF\u80FD\u4ECD\u5728\uFF0C\u53EF\u91CD\u8BD5" : "npm uninstall \u9000\u51FA\u7801 " + exitCode;
-        host2.lastUninstall = { ok: exitCode === 0, removed, error: uninstallError, timedOut: uninstallTimedOut, at: (/* @__PURE__ */ new Date()).toISOString() };
+        const uninstallError = exitCode === 0 ? null : timedOut ? (res.error || "npm uninstall \u8D85\u65F6\u5DF2\u7EC8\u6B62") + "\uFF0C\u5305\u53EF\u80FD\u4ECD\u5728\uFF0C\u53EF\u91CD\u8BD5" : "npm uninstall \u9000\u51FA\u7801 " + exitCode;
+        host2.lastUninstall = { ok: exitCode === 0, removed, error: uninstallError, timedOut, at: (/* @__PURE__ */ new Date()).toISOString() };
         if (host2.events) host2.events.append("native_uninstalled", { removed });
         if (host2.logger.info) host2.logger.info("native uninstalled, removed " + removed.length + " paths");
         if (task) {
           if (exitCode === 0) {
             host2.tasks.log(task.id, "\u5378\u8F7D\u5B8C\u6210\uFF0C\u6E05\u7406 " + removed.length + " \u4E2A\u8DEF\u5F84");
             host2.tasks.succeed(task.id);
-          } else host2.tasks.fail(task.id, "npm uninstall \u9000\u51FA\u7801 " + exitCode);
+          } else host2.tasks.fail(task.id, uninstallError || "npm uninstall \u9000\u51FA\u7801 " + exitCode);
         }
-        return { ok: exitCode === 0, removed, timedOut: uninstallTimedOut, error: uninstallError };
+        return { ok: exitCode === 0, removed, timedOut, error: uninstallError };
       } finally {
         host2.uninstalling = null;
       }
@@ -23951,12 +23955,12 @@ var require_upgrade2 = __commonJS({
       return task;
     }
     async function resolveTarget(host2, requestedVersion, task) {
-      if (requestedVersion) return requestedVersion;
+      if (requestedVersion) return { version: requestedVersion, origin: null };
       taskLog(host2, task, "\u67E5\u8BE2\u6700\u65B0\u7248\u672C\u2026");
       log(host2, "\u67E5\u8BE2\u6700\u65B0\u7248\u672C\u2026");
-      const target = await host2._latestVersion();
-      if (!target) throw new Error("\u65E0\u6CD5\u4ECE\u4EFB\u4F55 registry \u83B7\u53D6\u6700\u65B0\u7248\u672C");
-      return target;
+      const info = await host2._latestVersion();
+      if (!info || !info.ok || !info.version) throw new Error(info && info.error || "\u65E0\u6CD5\u4ECE\u4EFB\u4F55 registry \u83B7\u53D6\u6700\u65B0\u7248\u672C");
+      return { version: info.version, origin: info.origin };
     }
     async function stopForUpgrade(host2, task) {
       if (!(host2.hooks.isDshActive && host2.hooks.isDshActive())) return;
@@ -23969,10 +23973,10 @@ var require_upgrade2 = __commonJS({
       }
       if (host2.hooks.stopForUpgrade) await host2.hooks.stopForUpgrade();
     }
-    async function installTarget(host2, oldV, target, task) {
-      const registry = await host2._selectRegistry();
+    async function installTarget(host2, oldV, target, origin, task) {
+      const registry = origin || await host2._selectRegistry();
       markStep(host2, task, "\u5B89\u88C5 " + target);
-      const res = await host2._runInstall(target, registry);
+      const res = await host2._runNpm({ action: "install", version: target, registry });
       if (!res.ok) throw new Error(res.error || "install failed");
       const newV = host2.installedVersion();
       if (newV !== target) throw new Error("\u5B89\u88C5\u540E\u7248\u672C\u6821\u9A8C\u5931\u8D25\uFF1A\u671F\u671B " + target + "\uFF0C\u5B9E\u9645 " + newV);
@@ -24068,7 +24072,7 @@ var require_upgrade2 = __commonJS({
       }
       tlog("\u81EA\u52A8\u56DE\u6EDA\u5230 " + oldVersion + "\u2026");
       const registry = await host2._selectRegistry();
-      const res = await host2._runInstall(oldVersion, registry);
+      const res = await host2._runNpm({ action: "install", version: oldVersion, registry });
       let okVer = false;
       try {
         okVer = host2.installedVersion() === oldVersion;
@@ -24098,7 +24102,7 @@ var require_upgrade2 = __commonJS({
       if (host2.events) host2.events.append("upgrade_rollback_started", { to: host2.oldVersion });
       log(host2, "\u56DE\u6EDA\u5230 " + host2.oldVersion + "\u2026");
       const registry = await host2._selectRegistry();
-      const res = await host2._runInstall(host2.oldVersion, registry);
+      const res = await host2._runNpm({ action: "install", version: host2.oldVersion, registry });
       let okVer = false;
       try {
         okVer = host2.installedVersion() === host2.oldVersion;
@@ -24162,7 +24166,8 @@ var require_upgrade2 = __commonJS({
       try {
         const oldV = host2.installedVersion();
         host2.oldVersion = oldV;
-        const target = await resolveTarget(host2, requestedVersion, task);
+        const pick = await resolveTarget(host2, requestedVersion, task);
+        const target = pick.version;
         host2.targetVersion = target;
         taskLog(host2, task, "\u76EE\u6807\u7248\u672C " + target);
         if (!oldV) {
@@ -24176,7 +24181,7 @@ var require_upgrade2 = __commonJS({
         log(host2, "\u5347\u7EA7 " + oldV + " \u2192 " + target);
         taskLog(host2, task, "\u5347\u7EA7 " + oldV + " \u2192 " + target);
         await stopForUpgrade(host2, task);
-        await installTarget(host2, oldV, target, task);
+        await installTarget(host2, oldV, target, pick.origin, task);
         if (!(host2.hooks.desiredRunning && host2.hooks.desiredRunning())) return finishStopped(host2, oldV, target, task);
         return await verifyAndFinalize(host2, oldV, target, task);
       } catch (err) {
@@ -24230,7 +24235,7 @@ var require_installer = __commonJS({
         this.lastInstall = null;
         this.lastUninstall = null;
       }
-      /** 追加安装输出（有界，仅任务进行中由 _runInstall 写入）。 */
+      /** 追加安装输出（有界，仅任务进行中由 _runNpm 的行日志写入）。 */
       _appendInstallLog(line) {
         this.installLog.push(line);
         if (this.installLog.length > 60) this.installLog.splice(0, this.installLog.length - 60);
@@ -24273,12 +24278,15 @@ var require_installer = __commonJS({
       _claimDataPaths() {
         return manifest.claimDataPaths(this);
       }
-      _runInstall(version, registry) {
-        return npm.runInstall(this, version, registry);
+      /** npm 动作的唯一出口（装/升/回滚/卸载同源），入参见 npm.runNpm。 */
+      _runNpm(opts) {
+        return npm.runNpm(this, opts);
       }
+      /** 最新版本 + 给出它的那个镜像源（结构化，回 {ok,version,origin,error}）。 */
       _latestVersion() {
         return npm.latestVersion(this);
       }
+      /** 只选源（钉死版本的安装与回滚用）；查询过版本的安装路径走 _latestVersion 的 origin。 */
       _selectRegistry() {
         return npm.selectRegistry(this);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-sup/dsh-core-linux-x64",
-  "version": "0.1.6-BETA.8",
+  "version": "0.1.6-BETA.9",
   "description": "DSH lifecycle guard core (Node launcher) for linux-x64 — requires Node >=18.",
   "license": "UNLICENSED",
   "repository": {