@dsh-sup/dsh-core-linux-x64 0.1.5-BETA.6 → 0.1.5-BETA.7

package/core.cjs

@@ -289,7 +289,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.5-BETA.6");
+      if (true) return String("0.1.5-BETA.7");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -1099,7 +1099,48 @@ var require_exec_path = __commonJS({
       if (resolved) return resolved;
       return "npm.cmd";
     }
-    module2.exports = { resolveExecutable, candidateNames, standardDirs, firstExecutable, npmBin, npxBin };
+    var DSH_PKG = ["@deepseek-ai", "dsh"];
+    function dshJsIn(prefix) {
+      return path2.join(prefix, "node_modules", ...DSH_PKG, "lib", "bin.js");
+    }
+    function resolveDsh(opts) {
+      const o = opts || {};
+      const pl = o.platform || process.platform;
+      const env = o.env || process.env;
+      const isFile = (p) => {
+        try {
+          return fs2.statSync(p).isFile();
+        } catch {
+          return false;
+        }
+      };
+      const asJs = (bin, launcher) => ({ runtime: process.execPath, bin, isJs: true, launcher: launcher || null });
+      if (env.DSH_BIN) {
+        try {
+          const r = fs2.realpathSync(env.DSH_BIN);
+          if (isFile(r)) return asJs(r, env.DSH_BIN);
+        } catch {
+        }
+      }
+      const hit = resolveExecutable("dsh", { platform: pl, env });
+      if (hit) {
+        try {
+          const real = fs2.realpathSync(hit);
+          if (isFile(real) && /\.(js|cjs|mjs)$/i.test(real)) return asJs(real, hit);
+        } catch {
+        }
+        const js = dshJsIn(path2.dirname(hit));
+        if (isFile(js)) return asJs(js, hit);
+        if (isFile(hit) && !/\.(cmd|bat|exe)$/i.test(hit)) return asJs(hit, hit);
+        return { runtime: null, bin: hit, isJs: false, launcher: hit };
+      }
+      if (o.npmRoot) {
+        const js = dshJsIn(o.npmRoot);
+        if (isFile(js)) return asJs(js, null);
+      }
+      return null;
+    }
+    module2.exports = { resolveExecutable, candidateNames, standardDirs, firstExecutable, npmBin, npxBin, resolveDsh, dshJsIn };
   }
 });
 
@@ -4773,6 +4814,8 @@ var require_runtime_contract = __commonJS({
         nodePath: j.nodePath || node.path || null,
         nodeBinDir: j.nodeBinDir || node.binDir || null,
         npmPath: j.npmPath || npm.path || null,
+        // 外壳可只提供包内 JS（npmPath=node，npmArgs=[npm-cli.js]）——消费者必须带上 args。
+        npmArgs: Array.isArray(j.npmArgs) ? j.npmArgs : Array.isArray(npm.args) ? npm.args : [],
         minNode: j.minNode || null,
         writtenBy: j.writtenBy || null,
         raw: j
@@ -10549,6 +10592,8 @@ var require_plugins = __commonJS({
           name: "\u539F\u751F\u5B9E\u4F8B",
           kind: "native",
           bin: this.dshBin,
+          // 绑定后的原生入口可能是包内 JS（`.../lib/bin.js`）——必须用 node 承载（Windows 更甚：.js 不可直接执行）。
+          runtime: /\.(js|cjs|mjs)$/i.test(this.dshBin) ? process.execPath : null,
           profileDir: this.profileDir,
           profileName: this.profileName,
           env: { HOME: os2.homedir(), PATH: this._pathExtra() }
@@ -10565,6 +10610,8 @@ var require_plugins = __commonJS({
           name: inst.name || inst.id,
           kind: "sandbox",
           bin: path2.join(installDir, "lib", "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js"),
+          runtime: process.execPath,
+          // 包内 JS 入口：显式 node 承载（跨平台一致）
           installDir,
           profileDir: path2.join(dataDir, ".dsh", "profiles", this.profileName),
           profileName: this.profileName,
@@ -10874,7 +10921,9 @@ var require_plugins = __commonJS({
             try {
               const cliArgs = ["plugin", "--profile", target.profileName];
               if (target.storeDir) cliArgs.push("--store-dir", target.storeDir);
-              child = spawn(target.bin, [...cliArgs, ...args], { env, stdio: ["ignore", "pipe", "pipe"], windowsHide: true, detached: true });
+              const argv0 = target.runtime || target.bin;
+              const argvPrefix = target.runtime ? [target.bin] : [];
+              child = spawn(argv0, [...argvPrefix, ...cliArgs, ...args], { env, stdio: ["ignore", "pipe", "pipe"], windowsHide: true, detached: true });
             } catch (e) {
               return settle({ ok: false, error: e.message });
             }
@@ -12432,11 +12481,30 @@ var require_manager2 = __commonJS({
         if (this.installLog.length > 60) this.installLog.splice(0, this.installLog.length - 60);
       }
       /* ═══════ 安装状态探测 ═══════ */
+      /** 原生 DSH 真实安装（**唯一检测入口**，2026-09-16 架构修正）：
+       *  此前只读静态 `config.command[1]`（出厂默认裸名 'dsh'）→ `fs.existsSync('dsh')` 恒 false →
+       *  「已安装」永远判不出来，与「安装」分支形成两套相反逻辑（系统已装 DSH，守卫却报未安装）。
+       *  · 已绑定/用户显式指定且**真实存在**的绝对路径 → 尊重之；
+       *  · 否则跨平台解析：PATH/PATHEXT → 标准落点 → 包内 `lib/bin.js`（exec-path.resolveDsh）。 */
+      detected() {
+        const cmd2 = Array.isArray(this.config.command) ? this.config.command : [];
+        const configured = cmd2[1];
+        const isBare = !configured || configured === "dsh" || configured === "dsh.cmd" || !/[\\/]/.test(configured) && !String(configured).startsWith("~");
+        if (!isBare) {
+          return { bin: configured, runtime: cmd2[0] || null, isJs: /\.(js|cjs|mjs)$/i.test(configured) };
+        }
+        try {
+          return execPath.resolveDsh({ npmRoot: this.npmRoot });
+        } catch {
+          return null;
+        }
+      }
       binPath() {
+        const d = this.detected();
+        if (d && d.bin) return d.bin;
         const bin = this.config.command && this.config.command[1];
         if (!bin) return null;
-        const p = bin === "~" ? os2.homedir() : bin.startsWith("~/") ? path2.join(os2.homedir(), bin.slice(2)) : bin;
-        return p;
+        return bin === "~" ? os2.homedir() : bin.startsWith("~/") ? path2.join(os2.homedir(), bin.slice(2)) : bin;
       }
       /** 已安装版本：优先显式配置（installedPkgJsonPath），否则从 bin 所在目录向上找 package.json。未安装返回 null（唯一探测实现）。 */
       installedVersion() {
@@ -17517,9 +17585,21 @@ var require_env_catalog = __commonJS({
       const min = String(runtimeMeta().minNode || MIN_NODE_DEFAULT);
       return { version: "v" + ver, min, meets: verAtLeast(ver, min) };
     }
+    function probeNpm() {
+      try {
+        const c = require_runtime_contract().read();
+        if (c && c.npmPath) {
+          const args = Array.isArray(c.npmArgs) ? c.npmArgs : [];
+          const v = ex2.runOut(c.npmPath, [...args, "--version"], { timeoutMs: 3e3 });
+          if (v && v.trim()) return v.trim();
+        }
+      } catch {
+      }
+      return cachedWhichVersion("npm");
+    }
     var SYSTEM_ENTRIES = {
       node: { label: "Node.js", required: true, probe: probeNode },
-      npm: { label: "npm", required: true, probe: () => cachedWhichVersion("npm") },
+      npm: { label: "npm", required: true, probe: probeNpm },
       git: { label: "git", required: false, probe: () => cachedWhichVersion("git") }
     };
     var EnvCatalog = class {
@@ -19659,6 +19739,7 @@ var require_supervisor = __commonJS({
         } catch (e) {
           this.logger.warn && this.logger.warn("ports pools configure: " + (e && e.message));
         }
+        this._bindNativeDshCommand();
         this.instances = new InstanceManager({
           dir: path2.dirname(this.config.stateFile),
           logger: this.logger,
@@ -19743,7 +19824,7 @@ var require_supervisor = __commonJS({
           logger: this.logger
         });
         this.pluginManager = new PluginManager({
-          dshBin: "dsh",
+          dshBin: this.config.command && this.config.command[1] ? this.config.command[1] : "dsh",
           profileName: this.config.pluginsProfileName || "web",
           profileDir: path2.join(os2.homedir(), ".dsh", "profiles", this.config.pluginsProfileName || "web"),
           overlayFile: path2.join(path2.dirname(this.config.stateFile), "plugin-states.patch.yml"),
@@ -19791,6 +19872,40 @@ var require_supervisor = __commonJS({
         });
         this._registerFixedPorts();
       }
+      /** 原生 DSH 检测 → 绑定（2026-09-16 架构修正）。
+       *
+       *  原生 DSH 此前只被静态 `config.command[1]`（出厂默认裸名 'dsh'）定义 —— `node dsh` 不做 PATH 解析、
+       *  Windows 裸名无扩展名 → 「已安装」永远判 false，与「安装」分支形成两套相反逻辑，
+       *  且会去装第二个 DSH 顶替原生的那个。
+       *
+       *  这里在**任何消费者之前**把无法解析的 command[1] 解析为真实绝对入口：
+       *    包内 JS → `['<node>', '<abs lib/bin.js>', ...rest]`；仅垫片 → `['<abs shim>', ...rest]`。
+       *  用户显式给出且真实存在的路径**原样尊重**（不覆盖）。检测与接管由此同源：
+       *    已装 → 绑定并接管；未装 → 由 NativeManager 安装后重新绑定。 */
+      _bindNativeDshCommand() {
+        try {
+          const cmd2 = Array.isArray(this.config.command) ? this.config.command.slice() : [];
+          const cur = cmd2[1];
+          const isBare = !cur || cur === "dsh" || cur === "dsh.cmd" || !/[\\/]/.test(cur) && !String(cur).startsWith("~");
+          if (!isBare) return;
+          const d = require_exec_path().resolveDsh();
+          if (!d || !d.bin) return;
+          this.config.command = d.isJs ? [d.runtime || process.execPath, d.bin, ...cmd2.slice(2)] : [d.bin, ...cmd2.slice(2)];
+          try {
+            this.events && this.events.append("dsh_command_bound", { from: cur || null, to: this.config.command[1] });
+          } catch {
+          }
+          try {
+            this.logger.info && this.logger.info("\u539F\u751F DSH \u5DF2\u7ED1\u5B9A: " + this.config.command.join(" "));
+          } catch {
+          }
+        } catch (e) {
+          try {
+            this.logger.warn && this.logger.warn("\u539F\u751F DSH \u7ED1\u5B9A\u5931\u8D25: " + (e && e.message));
+          } catch {
+          }
+        }
+      }
       /** 固定端口统一登记：主DSH / 守卫API / 中转服务。冲突即抛错（守卫启动失败，避免带病运行）。
        *  主程序端口动态注册：用户使用场景各异（可能先装 DSH 并自定义端口）——
        *  若配置端口无监听且检测到 DSH 进程，从进程实际参数解析端口并动态覆盖（绝不硬编码 3080）。 */

package/package.json

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