@dsh-sup/dsh-core-darwin-arm64 0.1.5-BETA.2 → 0.1.5-BETA.4

package/core.cjs

@@ -225,7 +225,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.2");
+      if (true) return String("0.1.5-BETA.4");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -236,6 +236,64 @@ var require_version = __commonJS({
   }
 });
 
+// src/platform/matrix.js
+var require_matrix = __commonJS({
+  "src/platform/matrix.js"(exports2, module2) {
+    "use strict";
+    var SUPPORTED = [
+      { platform: "linux", arch: "x64", osTag: "linux", npmTag: "linux-x64" },
+      { platform: "darwin", arch: "arm64", osTag: "darwin", npmTag: "darwin-arm64" },
+      { platform: "darwin", arch: "x64", osTag: "darwin", npmTag: "darwin-x64" },
+      { platform: "win32", arch: "x64", osTag: "win", npmTag: "win-x64" }
+    ];
+    var OS_TAG = { linux: "linux", darwin: "darwin", win32: "win" };
+    var FRP_OS = { linux: "linux", darwin: "darwin", win32: "windows" };
+    var FRP_ARCH = { x64: "amd64", arm64: "arm64" };
+    function osTag(platform) {
+      return OS_TAG[platform || process.platform] || null;
+    }
+    function current(platform, arch) {
+      const p = platform || process.platform;
+      const a = arch || process.arch;
+      return { platform: p, arch: a, osTag: OS_TAG[p] || null, npmTag: npmTag(p, a) };
+    }
+    function npmTag(platform, arch) {
+      const p = platform || process.platform;
+      const a = arch || process.arch;
+      const os2 = OS_TAG[p];
+      if (!os2 || a !== "x64" && a !== "arm64") {
+        throw new Error("\u4E0D\u652F\u6301\u7684\u5E73\u53F0\u7EC4\u5408: " + p + "/" + a + "\uFF08\u4EC5 linux/darwin/win32 \xD7 x64/arm64\uFF09");
+      }
+      return os2 + "-" + a;
+    }
+    function isSupported(platform, arch) {
+      const p = platform || process.platform;
+      const a = arch || process.arch;
+      return SUPPORTED.some((x) => x.platform === p && x.arch === a);
+    }
+    function frpTag(platform, arch) {
+      const p = platform || process.platform;
+      const a = arch || process.arch;
+      const os2 = FRP_OS[p];
+      const am = FRP_ARCH[a];
+      if (!os2 || !am) return null;
+      return { os: os2, arch: am, tag: os2 + "_" + am, exe: p === "win32" };
+    }
+    function supportsProcessGroup(platform) {
+      return (platform || process.platform) !== "win32";
+    }
+    module2.exports = {
+      SUPPORTED,
+      osTag,
+      current,
+      npmTag,
+      isSupported,
+      frpTag,
+      supportsProcessGroup
+    };
+  }
+});
+
 // src/platform/os/pidlookup.js
 var require_pidlookup = __commonJS({
   "src/platform/os/pidlookup.js"(exports2, module2) {
@@ -245,6 +303,56 @@ var require_pidlookup = __commonJS({
     var isLinux = process.platform === "linux";
     var isMac = process.platform === "darwin";
     var isWindows = process.platform === "win32";
+    function parseProcNetTcpInodes(txt, port) {
+      const inodes = /* @__PURE__ */ new Set();
+      for (const lineRaw of String(txt || "").split("\n")) {
+        const cols = lineRaw.trim().split(/\s+/);
+        if (cols.length < 10) continue;
+        const local = cols[1];
+        const st = cols[3];
+        const inode = cols[9];
+        if (!local || !inode) continue;
+        const p = local.split(":")[1];
+        if (st === "0A" && p && parseInt(p, 16) === port) inodes.add("socket:[" + inode + "]");
+      }
+      return inodes;
+    }
+    function parseLsofPid(out) {
+      for (const line of String(out || "").split("\n")) {
+        const m = line.trim().split(/\s+/);
+        if (m.length >= 2 && /^\d+$/.test(m[1])) return Number(m[1]);
+      }
+      return null;
+    }
+    function parseNetstatPid(out, port) {
+      const want = String(port);
+      for (const line of String(out || "").split("\n")) {
+        const parts = line.trim().split(/\s+/);
+        if (parts.length >= 5 && (parts[0] === "TCP" || parts[0] === "TCPv6") && parts[3] === "LISTENING") {
+          const lp = parts[1];
+          const p = lp.slice(lp.lastIndexOf(":") + 1);
+          if (p === want) {
+            const pid = Number(parts[4]);
+            if (Number.isInteger(pid) && pid > 0) return pid;
+          }
+        }
+      }
+      return null;
+    }
+    function parseSsPid(out) {
+      const m = out && /pid=(\d+)/.exec(String(out));
+      return m ? Number(m[1]) : null;
+    }
+    function parseWmicCommandLine(out) {
+      if (!out) return null;
+      const m = /CommandLine=([\s\S]*)/.exec(String(out));
+      const v = m ? m[1].trim() : "";
+      return v || null;
+    }
+    function parsePowerShellCommandLine(out) {
+      const v = out ? String(out).trim() : "";
+      return v || null;
+    }
     function linuxListeningInodes(port) {
       const inodes = /* @__PURE__ */ new Set();
       for (const f of ["/proc/net/tcp", "/proc/net/tcp6"]) {
@@ -254,16 +362,7 @@ var require_pidlookup = __commonJS({
         } catch {
           continue;
         }
-        for (const lineRaw of txt.split("\n")) {
-          const cols = lineRaw.trim().split(/\s+/);
-          if (cols.length < 10) continue;
-          const local = cols[1];
-          const st = cols[3];
-          const inode = cols[9];
-          if (!local || !inode) continue;
-          const p = local.split(":")[1];
-          if (st === "0A" && p && parseInt(p, 16) === port) inodes.add("socket:[" + inode + "]");
-        }
+        for (const x of parseProcNetTcpInodes(txt, port)) inodes.add(x);
       }
       return inodes;
     }
@@ -297,10 +396,7 @@ var require_pidlookup = __commonJS({
       try {
         const out = ex2.runOut("lsof", ["-nP", "-iTCP:" + port, "-sTCP:LISTEN"], { timeoutMs: 3e3 });
         if (!out) return null;
-        for (const line of out.split("\n")) {
-          const m = line.trim().split(/\s+/);
-          if (m.length >= 2 && /^\d+$/.test(m[1])) return Number(m[1]);
-        }
+        return parseLsofPid(out);
       } catch {
       }
       return null;
@@ -309,18 +405,7 @@ var require_pidlookup = __commonJS({
       try {
         const out = ex2.runOut("netstat", ["-ano"], { timeoutMs: 3e3 });
         if (!out) return null;
-        const want = String(port);
-        for (const line of out.split("\n")) {
-          const parts = line.trim().split(/\s+/);
-          if (parts.length >= 5 && (parts[0] === "TCP" || parts[0] === "TCPv6") && parts[3] === "LISTENING") {
-            const lp = parts[1];
-            const p = lp.slice(lp.lastIndexOf(":") + 1);
-            if (p === want) {
-              const pid = Number(parts[4]);
-              if (Number.isInteger(pid) && pid > 0) return pid;
-            }
-          }
-        }
+        return parseNetstatPid(out, port);
       } catch {
       }
       return null;
@@ -330,8 +415,8 @@ var require_pidlookup = __commonJS({
       for (const ssBin of candidates) {
         try {
           const out = ex2.runOut(ssBin, ["-tlnHp", "sport = :" + port], { timeoutMs: 3e3 });
-          const m = out && /pid=(\d+)/.exec(out);
-          if (m) return Number(m[1]);
+          const pid = parseSsPid(out);
+          if (pid !== null) return pid;
         } catch {
         }
       }
@@ -375,15 +460,12 @@ var require_pidlookup = __commonJS({
       }
       if (isWindows) {
         const out = ex2.runOut("wmic", ["process", "where", "ProcessId=" + pid, "get", "CommandLine", "/value"], { timeoutMs: 5e3 });
-        if (out) {
-          const m = /CommandLine=([\s\S]*)/.exec(out);
-          const viaWmic = m ? m[1].trim() : "";
-          if (viaWmic) return viaWmic;
-        }
+        const viaWmic = parseWmicCommandLine(out);
+        if (viaWmic) return viaWmic;
         {
           const ps = "(Get-CimInstance Win32_Process -Filter 'ProcessId=" + pid + "').CommandLine";
           const o = ex2.runOut("powershell", ["-NoProfile", "-NonInteractive", "-Command", ps], { timeoutMs: 5e3 });
-          return o ? o.trim() || null : null;
+          return parsePowerShellCommandLine(o);
         }
       }
       return null;
@@ -436,7 +518,24 @@ var require_pidlookup = __commonJS({
       }
       return out;
     }
-    module2.exports = { findListeningPid, isAlive, readCmdline, isDshCmdline, pgrepList };
+    function normCmdline(s) {
+      return String(s || "").replace(/\\/g, "/");
+    }
+    module2.exports = {
+      findListeningPid,
+      isAlive,
+      readCmdline,
+      normCmdline,
+      isDshCmdline,
+      pgrepList,
+      // 平台输出纯解析器（2026-09-13 抽出：使其可在任意宿主上穷举；生产代码直接调用，非平行实现）
+      parseProcNetTcpInodes,
+      parseLsofPid,
+      parseNetstatPid,
+      parseSsPid,
+      parseWmicCommandLine,
+      parsePowerShellCommandLine
+    };
   }
 });
 
@@ -565,7 +664,7 @@ var require_daemon_lifecycle = __commonJS({
         try {
           const pid = pidlook.findListeningPid(this.ctlPort);
           if (!pid) return null;
-          const cmd2 = pidlook.readCmdline(pid) || "";
+          const cmd2 = pidlook.normCmdline(pidlook.readCmdline(pid) || "");
           return this._cmdMarks.some((mk) => mk && cmd2.indexOf(mk) >= 0) ? pid : null;
         } catch {
           return null;
@@ -865,13 +964,14 @@ var require_exec_path = __commonJS({
       }
       return null;
     }
-    function standardDirs(platform, home) {
+    function standardDirs(platform, home, env) {
       const pl = platform || process.platform;
       const h = home || os2.homedir();
+      const e = env || process.env;
       const dirs = [];
       if (pl === "win32") {
-        if (process.env.APPDATA) dirs.push(path2.join(process.env.APPDATA, "npm"));
-        if (process.env.LOCALAPPDATA) dirs.push(path2.join(process.env.LOCALAPPDATA, "Programs", "dsh-supervisor"));
+        if (e.APPDATA) dirs.push(path2.join(e.APPDATA, "npm"));
+        if (e.LOCALAPPDATA) dirs.push(path2.join(e.LOCALAPPDATA, "Programs", "dsh-supervisor"));
         dirs.push(path2.join(h, ".local", "bin"));
       } else {
         dirs.push(path2.join(h, ".local", "bin"));
@@ -883,8 +983,9 @@ var require_exec_path = __commonJS({
       }
       return dirs;
     }
-    function inPath(base, platform) {
-      const raw = process.env.PATH || process.env.Path || "";
+    function inPath(base, platform, env) {
+      const e = env || process.env;
+      const raw = e.PATH || e.Path || "";
       for (const d of raw.split(path2.delimiter)) {
         if (!d) continue;
         const hit = firstExecutable(d, base, platform);
@@ -894,35 +995,42 @@ var require_exec_path = __commonJS({
     }
     function resolveExecutable(base, opts) {
       const o = opts || {};
-      if (o.envVar && process.env[o.envVar]) {
-        const v = process.env[o.envVar];
+      const pl = o.platform;
+      const env = o.env;
+      const E = env || process.env;
+      if (o.envVar && E[o.envVar]) {
+        const v = E[o.envVar];
         try {
           if (fs2.statSync(v).isFile()) return v;
         } catch {
         }
       }
-      const inPathHit = inPath(base);
+      const inPathHit = inPath(base, pl, env);
       if (inPathHit) return inPathHit;
-      for (const d of [...o.extraDirs || [], ...standardDirs()]) {
-        const hit = firstExecutable(d, base);
+      for (const d of [...o.extraDirs || [], ...standardDirs(pl, void 0, env)]) {
+        const hit = firstExecutable(d, base, pl);
         if (hit) return hit;
       }
       return null;
     }
     function npxBin(opts) {
-      const pl = opts && opts.platform || process.platform;
+      const o = opts || {};
+      const pl = o.platform || process.platform;
+      const env = o.env || process.env;
       if (pl !== "win32") return "npx";
-      const resolved = resolveExecutable("npx", { extraDirs: [
-        process.env.APPDATA ? path2.join(process.env.APPDATA, "npm") : null
+      const resolved = resolveExecutable("npx", { platform: pl, env, extraDirs: [
+        env.APPDATA ? path2.join(env.APPDATA, "npm") : null
       ].filter(Boolean) });
       if (resolved) return resolved;
       return "npx.cmd";
     }
     function npmBin(opts) {
-      const pl = opts && opts.platform || process.platform;
+      const o = opts || {};
+      const pl = o.platform || process.platform;
+      const env = o.env || process.env;
       if (pl !== "win32") return "npm";
-      const resolved = resolveExecutable("npm", { extraDirs: [
-        process.env.APPDATA ? path2.join(process.env.APPDATA, "npm") : null
+      const resolved = resolveExecutable("npm", { platform: pl, env, extraDirs: [
+        env.APPDATA ? path2.join(env.APPDATA, "npm") : null
       ].filter(Boolean) });
       if (resolved) return resolved;
       return "npm.cmd";
@@ -1171,53 +1279,54 @@ var require_notify = __commonJS({
   "src/platform/os/notify.js"(exports2, module2) {
     "use strict";
     var { spawn } = require("node:child_process");
-    var isLinux = process.platform === "linux";
-    var isMac = process.platform === "darwin";
-    var isWindows = process.platform === "win32";
+    function appleScriptString(s) {
+      return JSON.stringify(String(s));
+    }
+    function powerShellString(s) {
+      return '"' + String(s).replace(/"/g, '""') + '"';
+    }
+    function notifyCommand(platform, title, body) {
+      const pl = platform || process.platform;
+      const t = String(title == null ? "" : title);
+      const b = String(body == null ? "" : body);
+      if (pl === "linux") {
+        return { cmd: "notify-send", args: ["-a", "dsh-supervisor", t, b] };
+      }
+      if (pl === "darwin") {
+        const script = "display notification " + appleScriptString(b) + " with title " + appleScriptString(t);
+        return { cmd: "osascript", args: ["-e", script] };
+      }
+      if (pl === "win32") {
+        const ps = [
+          '[reflection.assembly]::loadwithpartialname("System.Windows.Forms") | Out-Null',
+          '[reflection.assembly]::loadwithpartialname("System.Drawing") | Out-Null',
+          "$n = New-Object System.Windows.Forms.NotifyIcon",
+          "$n.Icon = [System.Drawing.SystemIcons]::Information",
+          "$n.Visible = $true",
+          "$n.ShowBalloonTip(4000, " + powerShellString(t) + ", " + powerShellString(b) + ", [System.Windows.Forms.ToolTipIcon]::None)",
+          "Start-Sleep -Milliseconds 4200",
+          "$n.Dispose(); $n.Visible = $false"
+        ].join("; ");
+        return { cmd: "powershell", args: ["-NoProfile", "-NonInteractive", "-Command", ps] };
+      }
+      return null;
+    }
     function notify(title, body, onError) {
       try {
-        if (isLinux) {
-          const c = spawn("notify-send", ["-a", "dsh-supervisor", String(title), String(body)], { stdio: "ignore", detached: true });
-          c.on("error", () => {
-            if (onError) onError();
-          });
-          c.unref();
-          return true;
-        }
-        if (isMac) {
-          const script = "display notification " + JSON.stringify(String(body)) + " with title " + JSON.stringify(String(title));
-          const c = spawn("osascript", ["-e", script], { stdio: "ignore" });
-          c.on("error", () => {
-            if (onError) onError();
-          });
-          c.unref();
-          return true;
-        }
-        if (isWindows) {
-          const ps = [
-            '[reflection.assembly]::loadwithpartialname("System.Windows.Forms") | Out-Null',
-            '[reflection.assembly]::loadwithpartialname("System.Drawing") | Out-Null',
-            "$n = New-Object System.Windows.Forms.NotifyIcon",
-            "$n.Icon = [System.Drawing.SystemIcons]::Information",
-            "$n.Visible = $true",
-            "$n.ShowBalloonTip(4000, " + JSON.stringify(String(title)) + ", " + JSON.stringify(String(body)) + ", [System.Windows.Forms.ToolTipIcon]::None)",
-            "Start-Sleep -Milliseconds 4200",
-            "$n.Dispose(); $n.Visible = $false"
-          ].join("; ");
-          const c = spawn("powershell", ["-NoProfile", "-NonInteractive", "-Command", ps], { stdio: "ignore" });
-          c.on("error", () => {
-            if (onError) onError();
-          });
-          c.unref();
-          return true;
-        }
-        return false;
+        const plan = notifyCommand(process.platform, title, body);
+        if (!plan) return false;
+        const c = spawn(plan.cmd, plan.args, { stdio: "ignore", detached: process.platform === "linux" });
+        c.on("error", () => {
+          if (onError) onError();
+        });
+        c.unref();
+        return true;
       } catch {
         if (onError) onError();
         return false;
       }
     }
-    module2.exports = { notify };
+    module2.exports = { notify, notifyCommand, appleScriptString, powerShellString };
   }
 });
 
@@ -1226,9 +1335,16 @@ var require_browser = __commonJS({
   "src/platform/os/browser.js"(exports2, module2) {
     "use strict";
     var { spawn } = require("node:child_process");
+    function openCommand(platform, url) {
+      const pl = platform || process.platform;
+      if (pl === "darwin") return { cmd: "open", args: [url] };
+      if (pl === "win32") return { cmd: "cmd", args: ["/c", "start", "", url] };
+      return { cmd: "xdg-open", args: [url] };
+    }
     function open(url) {
       try {
-        const p = process.platform === "darwin" ? spawn("open", [url], { detached: true, stdio: "ignore" }) : process.platform === "win32" ? spawn("cmd", ["/c", "start", "", url], { detached: true, stdio: "ignore" }) : spawn("xdg-open", [url], { detached: true, stdio: "ignore" });
+        const c = openCommand(process.platform, url);
+        const p = spawn(c.cmd, c.args, { detached: true, stdio: "ignore" });
         p.on("error", () => {
         });
         p.unref();
@@ -1255,6 +1371,37 @@ var require_browser = __commonJS({
       child.unref();
       return child;
     }
+    function isolatedPlan(platform, url, opts) {
+      const o = opts || {};
+      const antiArgs = o.antiArgs || [];
+      const profileDir = o.profileDir;
+      const pl = platform || process.platform;
+      if (pl === "darwin") {
+        return { kind: "single", bin: "open", args: ["-na", "Google Chrome", "--args", ...antiArgs], isolated: true, label: "Google Chrome" };
+      }
+      if (pl === "win32") {
+        return {
+          kind: "single",
+          bin: "cmd",
+          args: ["/c", "start", "", "chrome", "--incognito", "--user-data-dir=" + profileDir, url],
+          isolated: true,
+          label: "chrome"
+        };
+      }
+      return {
+        kind: "chain",
+        candidates: [
+          { bin: "microsoft-edge", args: antiArgs, isolated: true, watch: true, envKind: "anti" },
+          { bin: "microsoft-edge-stable", args: antiArgs, isolated: true, watch: true, envKind: "anti" },
+          { bin: "google-chrome", args: antiArgs, isolated: true, watch: true, envKind: "anti" },
+          { bin: "chromium", args: antiArgs, isolated: true, watch: true, envKind: "anti" },
+          { bin: "chromium-browser", args: antiArgs, isolated: true, watch: true, envKind: "anti" },
+          { bin: "firefox", args: ["--private-window", url], isolated: false, watch: true, envKind: "sys" },
+          { bin: "xdg-open", args: [url], isolated: false, watch: false, envKind: "sys" }
+          // 兜底：无隔离
+        ]
+      };
+    }
     function launchIsolated(url, o) {
       const opts = o || {};
       const profileDir = opts.profileDir;
@@ -1263,31 +1410,20 @@ var require_browser = __commonJS({
       const sysEnv = opts.sysEnv || process.env;
       const onExit = opts.onExit;
       try {
-        if (process.platform === "darwin") {
-          const p = _spawnDetached("open", ["-na", "Google Chrome", "--args", ...antiArgs], antiEnv, onExit);
-          return { ok: !!p, bin: p ? "Google Chrome" : null, isolated: true };
-        }
-        if (process.platform === "win32") {
-          const p = _spawnDetached("cmd", ["/c", "start", "", "chrome", "--incognito", "--user-data-dir=" + profileDir, url], sysEnv, onExit);
-          return { ok: !!p, bin: p ? "chrome" : null, isolated: true };
-        }
-        const candidates = [
-          { bin: "microsoft-edge", args: antiArgs, env: antiEnv, isolated: true, watch: true },
-          { bin: "microsoft-edge-stable", args: antiArgs, env: antiEnv, isolated: true, watch: true },
-          { bin: "google-chrome", args: antiArgs, env: antiEnv, isolated: true, watch: true },
-          { bin: "chromium", args: antiArgs, env: antiEnv, isolated: true, watch: true },
-          { bin: "chromium-browser", args: antiArgs, env: antiEnv, isolated: true, watch: true },
-          { bin: "firefox", args: ["--private-window", url], env: sysEnv, isolated: false, watch: true },
-          { bin: "xdg-open", args: [url], env: sysEnv, isolated: false, watch: false }
-          // 兜底：无隔离
-        ];
+        const plan = isolatedPlan(process.platform, url, { profileDir, antiArgs });
+        if (plan.kind === "single") {
+          const env = plan.bin === "open" ? antiEnv : sysEnv;
+          const p = _spawnDetached(plan.bin, plan.args, env, onExit);
+          return { ok: !!p, bin: p ? plan.label : null, isolated: plan.isolated };
+        }
         let idx = 0;
         const tryNext = () => {
-          if (idx >= candidates.length) return { ok: false, bin: null, isolated: false };
-          const c = candidates[idx++];
+          if (idx >= plan.candidates.length) return { ok: false, bin: null, isolated: false };
+          const c = plan.candidates[idx++];
+          const env = c.envKind === "anti" ? antiEnv : sysEnv;
           let child;
           try {
-            child = spawn(c.bin, c.args, { detached: true, stdio: "ignore", env: c.env || sysEnv });
+            child = spawn(c.bin, c.args, { detached: true, stdio: "ignore", env: env || sysEnv });
           } catch {
             return tryNext();
           }
@@ -1308,7 +1444,7 @@ var require_browser = __commonJS({
         return { ok: false, bin: null, isolated: false };
       }
     }
-    module2.exports = { open, launchIsolated };
+    module2.exports = { open, launchIsolated, openCommand, isolatedPlan };
   }
 });
 
@@ -1356,7 +1492,7 @@ var require_desktop = __commonJS({
       }
       return {
         platform: PLATFORM,
-        available: PLATFORM === "darwin" || PLATFORM === "win32",
+        available: sessionAvailable(),
         reason: "session-scoped-by-launcher"
       };
     }
@@ -1459,6 +1595,9 @@ var require_autostart = __commonJS({
           guiLabel: GUI_LABEL
         };
       }
+      if (!isLinux && !isMac && !isWindows) {
+        return { kind: "none", unit: "unsupported", on: false, gui: false };
+      }
       let unit = "unknown";
       const en = ex2.runDetail("systemctl", ["--user", "is-enabled", "dsh-supervisor.service"]);
       unit = String(en.stdout || en.stderr || "disabled").trim() || "disabled";
@@ -4690,6 +4829,7 @@ var require_dist = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     var net = require("node:net");
+    var matrix = require_matrix();
     var { spawn } = require("node:child_process");
     var { npmBin } = require_exec_path();
     var registryContract = require_registry_contract();
@@ -4869,14 +5009,7 @@ var require_dist = __commonJS({
        *   并如实上报（见该函数的 try/catch），不会让守卫崩溃。
        */
       _platformTag() {
-        const osMap = { darwin: "darwin", win32: "win", linux: "linux" };
-        const archMap = { arm64: "arm64", x64: "x64" };
-        const os2 = osMap[process.platform];
-        const arch = archMap[process.arch];
-        if (!os2 || !arch) {
-          throw new Error("\u4E0D\u652F\u6301\u7684\u5E73\u53F0\u7EC4\u5408: " + process.platform + "/" + process.arch + "\uFF08\u4EC5 linux/darwin/win32 \xD7 x64/arm64\uFF09");
-        }
-        return os2 + "-" + arch;
+        return matrix.npmTag();
       }
       /**
        * 探测单个 registry 的可达性 + 延迟。
@@ -7355,20 +7488,14 @@ var require_frpmgr = __commonJS({
     "use strict";
     var fs2 = require("node:fs");
     var path2 = require("node:path");
+    var matrix = require_matrix();
     var http2 = require("node:http");
     var https = require("node:https");
     var { spawn } = require("node:child_process");
     var crypto = require("node:crypto");
     var FRP_VERSION = "0.61.1";
     function frpPlatformTag(platform, arch) {
-      const pl = platform || process.platform;
-      const ar = arch || process.arch;
-      const osMap = { linux: "linux", darwin: "darwin", win32: "windows" };
-      const archMap = { x64: "amd64", arm64: "arm64" };
-      const os2 = osMap[pl];
-      const am = archMap[ar];
-      if (!os2 || !am) return null;
-      return { os: os2, arch: am, tag: os2 + "_" + am, exe: pl === "win32" };
+      return matrix.frpTag(platform, arch);
     }
     var MIRROR_PREFIXES = [
       "https://ghfast.top/",
@@ -7640,8 +7767,9 @@ var require_frpmgr = __commonJS({
           }
         };
         if (!this.frpTag) {
-          if (this.events) this.events.append("frpc_install_failed", { detail: "\u5F53\u524D\u5E73\u53F0\u65E0 frpc \u5B98\u65B9\u4EA7\u7269: " + process.platform + "/" + process.arch });
-          return { ok: false, error: "\u5F53\u524D\u5E73\u53F0\u4E0D\u652F\u6301 FRP\uFF08" + process.platform + "/" + process.arch + "\uFF09\uFF0C\u4EC5 linux/darwin/win32 \xD7 x64/arm64" };
+          const cur = matrix.current();
+          if (this.events) this.events.append("frpc_install_failed", { detail: "\u5F53\u524D\u5E73\u53F0\u65E0 frpc \u5B98\u65B9\u4EA7\u7269: " + cur.platform + "/" + cur.arch });
+          return { ok: false, error: "\u5F53\u524D\u5E73\u53F0\u4E0D\u652F\u6301 FRP\uFF08" + cur.platform + "/" + cur.arch + "\uFF09\uFF0C\u4EC5 linux/darwin/win32 \xD7 x64/arm64" };
         }
         const asset = "frp_" + FRP_VERSION + "_" + this.frpTag.tag + ".tar.gz";
         const urls = downloadUrls(asset);
@@ -10358,6 +10486,7 @@ var require_plugins = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     var os2 = require("node:os");
+    var matrix = require_matrix();
     var { semverCompare } = require_dist();
     var { dirSizeBytes } = require_fs_utils();
     var PROTECTED = /* @__PURE__ */ new Set(["@deepseek-ai/dsh-base", "@deepseek-ai/dsh-web-app"]);
@@ -10725,7 +10854,7 @@ var require_plugins = __commonJS({
             const killTree = (sig) => {
               if (!child) return;
               try {
-                if (process.platform !== "win32" && child.pid) process.kill(-child.pid, sig);
+                if (matrix.supportsProcessGroup() && child.pid) process.kill(-child.pid, sig);
                 else child.kill(sig);
               } catch {
                 try {
@@ -11506,7 +11635,7 @@ var require_watchdog = __commonJS({
         if (inUpdate && !phaseStale) return true;
         try {
           const j = shell.readJournal && shell.readJournal();
-          if (j && j.to && !j.confirmed && !j.rolledBack) return true;
+          if (j && j.to && !j.confirmed) return true;
         } catch {
         }
         return false;
@@ -11661,11 +11790,7 @@ var require_shell = __commonJS({
       return readJson(journalPath()) || {
         from: null,
         to: null,
-        attempts: 0,
-        maxAttempts: 2,
         confirmed: false,
-        rolledBack: false,
-        pinnedVersions: [],
         startedAt: null,
         lastAttemptAt: null
       };
@@ -11677,9 +11802,7 @@ var require_shell = __commonJS({
       const j = readJournal();
       j.from = from || j.from;
       j.to = to;
-      j.attempts = 0;
       j.confirmed = false;
-      j.rolledBack = false;
       j.startedAt = (/* @__PURE__ */ new Date()).toISOString();
       writeJournal(j);
       return j;
@@ -11692,45 +11815,19 @@ var require_shell = __commonJS({
       if (cur && cur === j.to && id && id.phase === "ready") {
         if (!j.confirmed) {
           j.confirmed = true;
-          j.attempts = 0;
           writeJournal(j);
         }
         return { state: "confirmed", version: cur, reason: "\u58F3\u5DF2\u5065\u5EB7\u8FD0\u884C\u65B0\u7248\u672C", journal: j, identity: id };
       }
-      const attempt = id && typeof id.attempt === "number" ? id.attempt : 0;
-      if (cur && cur !== j.to && attempt >= (j.maxAttempts || 2)) {
-        return {
-          state: "should-rollback",
-          target: j.to,
-          current: cur,
-          attempts: attempt,
-          reason: `\u58F3 ${attempt} \u6B21\u672A\u80FD\u5728 ${j.to} \u4E0A\u5C31\u7EEA\uFF08\u5F53\u524D ${cur}\uFF09`,
-          journal: j,
-          identity: id
-        };
-      }
       return {
         state: "pending",
         target: j.to,
         current: cur,
-        attempts: attempt,
         reason: cur === j.to ? "\u7B49\u5F85\u58F3\u4E0A\u62A5\u5C31\u7EEA" : "\u7B49\u5F85\u58F3\u91CD\u542F\u5230\u65B0\u7248\u672C",
         journal: j,
         identity: id
       };
     }
-    function rollback(reason) {
-      const j = readJournal();
-      const bad = j.to;
-      if (bad && !j.pinnedVersions.includes(bad)) j.pinnedVersions.push(bad);
-      j.rolledBack = true;
-      j.confirmed = false;
-      j.attempts = 0;
-      j.to = null;
-      j.lastAttemptAt = (/* @__PURE__ */ new Date()).toISOString();
-      writeJournal(j);
-      return { ok: true, pinned: bad, reason: reason || null, journal: j };
-    }
     function health(payload) {
       const p = payload || {};
       const dir = shellDir();
@@ -11753,7 +11850,6 @@ var require_shell = __commonJS({
         journal: j,
         state: ev.state,
         reason: ev.reason || null,
-        pinned: j.pinnedVersions || [],
         dir: shellDir()
       };
     }
@@ -11859,7 +11955,7 @@ var require_shell = __commonJS({
         return { ok: false, error: "\u62C9\u8D77\u65B0\u58F3\u5931\u8D25: " + (e && e.message || e), killed };
       }
     }
-    module2.exports = { status, evaluate, health, markPending, rollback, identity, readJournal, shellDir, checkUpdate, restartShell, SHELL_RELEASE_PKG };
+    module2.exports = { status, evaluate, health, markPending, identity, readJournal, shellDir, checkUpdate, restartShell, SHELL_RELEASE_PKG };
   }
 });
 
@@ -12270,6 +12366,9 @@ var require_manager2 = __commonJS({
     function npmExe(self) {
       return self && self._npmBin || execPath.npmBin();
     }
+    function npmExeArgs(self) {
+      return self && Array.isArray(self._npmBinArgs) ? self._npmBinArgs.slice() : [];
+    }
     var { semverCompare, VERSION_RE } = require_dist();
     var NativeManager = class {
       constructor(opts) {
@@ -12415,7 +12514,7 @@ var require_manager2 = __commonJS({
         const errors = [];
         const nv = ex2.runOut("node", ["--version"]);
         if (!nv || !nv.trim()) errors.push("node \u672A\u5B89\u88C5\u6216\u4E0D\u53EF\u6267\u884C");
-        const npmv = ex2.runOut(npmExe(this), ["--version"]);
+        const npmv = ex2.runOut(npmExe(this), npmExeArgs(this).concat(["--version"]));
         if (!npmv || !npmv.trim()) errors.push("npm \u672A\u5B89\u88C5\u6216\u4E0D\u53EF\u6267\u884C");
         let npmRoot = this.npmRoot;
         if (!npmRoot) {
@@ -12467,7 +12566,7 @@ var require_manager2 = __commonJS({
         let pkgDir = null;
         try {
           if (!npmRoot) {
-            const r = ex2.runOut(npmExe(this), ["root", "-g"]);
+            const r = ex2.runOut(npmExe(this), npmExeArgs(this).concat(["root", "-g"]));
             if (r) npmRoot = r.trim();
           }
           pkgDir = path2.join(npmRoot, this.config.packageName || "@deepseek-ai/dsh");
@@ -12946,7 +13045,7 @@ var require_manager2 = __commonJS({
           const exitCode = await new Promise((resolve) => {
             let child;
             try {
-              child = spawn(npmExe(this), uninstallArgs, { stdio: ["ignore", "pipe", "pipe"] });
+              child = spawn(npmExe(this), npmExeArgs(this).concat(uninstallArgs), { stdio: ["ignore", "pipe", "pipe"] });
             } catch (e) {
               return resolve(-1);
             }
@@ -16191,26 +16290,6 @@ var require_shell2 = __commonJS({
           return send(r.ok ? 200 : 500, r);
         }).catch((e) => send(500, { ok: false, error: e.message }));
       }
-      if (req.method === "POST" && pathname === "/shell/rollback") {
-        if (!originAllowed(req, sup.config.apiPort)) {
-          req.resume();
-          return send(403, {});
-        }
-        return collectBody(req, res, 8192, (body) => {
-          let j = {};
-          try {
-            j = body ? JSON.parse(body) : {};
-          } catch {
-          }
-          try {
-            const r = shell.rollback(j.reason || "manual");
-            if (sup.events) sup.events.append("shell_update_rolled_back", { pinned: r.pinned, reason: r.reason });
-            return send(200, r);
-          } catch (e) {
-            return send(500, { ok: false, error: e.message });
-          }
-        });
-      }
       if (req.method === "GET" || req.method === "POST") return send(404, { error: "not found", path: pathname });
       return send(405, { error: "method not allowed" });
     }
@@ -16616,7 +16695,7 @@ var require_supervise_view = __commonJS({
         try {
           const pid = pidlook.findListeningPid(this._routerCtlPort());
           if (!pid) return false;
-          const cmd2 = pidlook.readCmdline(pid) || "";
+          const cmd2 = pidlook.normCmdline(pidlook.readCmdline(pid) || "");
           return cmd2.indexOf("router-daemon") >= 0 || cmd2.indexOf("service-daemon") >= 0 || cmd2.indexOf("/domains/router/daemon.js") >= 0;
         } catch {
           return false;
@@ -17648,6 +17727,7 @@ var require_settings_view = __commonJS({
     var { spawn } = require("node:child_process");
     var { execFile } = require("node:child_process");
     var ex2 = require_exec();
+    var matrix = require_matrix();
     var netInfo = require_netinfo();
     var { EnvCatalog } = require_env_catalog();
     var { semverCompare } = require_dist();
@@ -17748,7 +17828,7 @@ var require_settings_view = __commonJS({
       }
       /** 守卫自更新「重启生效」衔接：仅当配置 guardRestartAllowed=true 且存在 systemd 用户单元才执行；
        *  否则返回明确指引（避免误杀/误起守卫）。 */
-      /** 自更新后的守卫重启（A2）：能力按部署形态自动判定（SEA=systemd 重启闭环；源码形态=拒绝），
+      /** 自更新后的守卫重启（A2）：能力按部署形态自动判定（打包态=systemd 重启闭环；源码形态=拒绝），
        *  去掉 guardRestartAllowed 人工配置门槛。重启前落盘「预期版本」，重启后 /status 校验自报版本
        *  达标才算更新成功——闭环可观测，不再出现"装了没生效"的静默失败。 */
       guardSelfUpdateRestart() {
@@ -17787,8 +17867,7 @@ var require_settings_view = __commonJS({
       guardCorePkg() {
         const raw = this.config.corePackageName;
         if (!raw) return null;
-        const map = { win32: "win", linux: "linux", darwin: "darwin" };
-        return String(raw).replace(/{os}/g, map[process.platform] || process.platform).replace(/{arch}/g, String(process.arch)) || null;
+        return String(raw).replace(/{os}/g, matrix.osTag()).replace(/{arch}/g, matrix.current().arch) || null;
       }
       /** 守卫自更新（2026-09 收敛：npm 通道）——查 @dsh-sup/dsh-core-<os>-<arch> 全 tag 最高版本（全更新：
        *  BETA/RC/正式都算更新，任一更高即提示可更新），对本机 guardVersion 比较。 */
@@ -18268,7 +18347,7 @@ var require_control_view = __commonJS({
         try {
           const pid = pidlook.findListeningPid(this._lanCtlPort());
           if (!pid) return false;
-          const cmd2 = pidlook.readCmdline(pid) || "";
+          const cmd2 = pidlook.normCmdline(pidlook.readCmdline(pid) || "");
           return cmd2.indexOf("lan-daemon") >= 0 || cmd2.indexOf("/domains/relay/daemon.js") >= 0;
         } catch {
           return false;
@@ -19481,6 +19560,7 @@ var require_supervisor = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     var os2 = require("node:os");
+    var matrix = require_matrix();
     var pidlook = require_pidlookup();
     var { DaemonLifecycle } = require_daemon_lifecycle();
     var platform = require_os();
@@ -20393,7 +20473,7 @@ var require_supervisor = __commonJS({
         if (!this.notifyEnabled) return;
         platform.notify(title, body, () => {
           this.notifyEnabled = false;
-          this.logger.warn("\u684C\u9762\u901A\u77E5\u4E0D\u53EF\u7528\uFF08" + process.platform + "\uFF09\uFF0C\u5DF2\u505C\u7528");
+          this.logger.warn("\u684C\u9762\u901A\u77E5\u4E0D\u53EF\u7528\uFF08" + matrix.osTag() + "\uFF09\uFF0C\u5DF2\u505C\u7528");
         });
       }
       // ---- 升级流程挂钩（先停后装，消除运行中替换文件的混合版本窗口）----