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

package/core.cjs

@@ -348,7 +348,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.8");
+      if (true) return String("0.1.5-BETA.9");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -783,6 +783,7 @@ var require_store = __commonJS({
           if (typeof raw.lastFailure === "string" || raw.lastFailure === null) record.procFieldOf("lastFailure", raw.lastFailure, true);
           if (typeof raw.lastRestartAt === "string" || raw.lastRestartAt === null) record.procFieldOf("lastRestartAt", raw.lastRestartAt, true);
           if (raw.upgradeHold === true) upgradeHold.enter();
+          if (raw.shellHalted === true && typeof g.setShellHalted === "function") g.setShellHalted(true);
         } catch {
         }
         try {
@@ -1346,7 +1347,9 @@ var require_collaborator = __commonJS({
         getEvents: g.getEvents,
         getInstances: g.getInstances,
         getViews: g.getViews,
-        getManagedObjects: g.getManagedObjects
+        getManagedObjects: g.getManagedObjects,
+        getShellHalted: g.getShellHalted,
+        setShellHalted: g.setShellHalted
       });
       holder.store = store;
       const desired = createDesired({
@@ -3562,6 +3565,10 @@ var require_collaborators = __commonJS({
         setSince: (v) => {
           host._upgradeHoldSince = v;
         },
+        getShellHalted: () => host._shellHalted,
+        setShellHalted: (v) => {
+          host._shellHalted = v;
+        },
         stopProcess: (why) => host.stopProcess(why),
         tick: () => host.tick()
       });
@@ -4140,6 +4147,16 @@ var require_watchdog = __commonJS({
           const t = now();
           const procs = shellProcs();
           const alive = procs.length;
+          if (alive > 0 && typeof o.onShellAlive === "function") {
+            try {
+              o.onShellAlive();
+            } catch {
+            }
+          }
+          if (typeof o.halted === "function" && o.halted()) {
+            lastSkipReason = "\u4F1A\u8BDD\u9000\u51FA\u4E2D/\u7528\u6237\u5DF2\u9000\u51FA\uFF08\u4E0D\u62C9\u8D77\uFF09";
+            return { skipped: "halted", reason: lastSkipReason };
+          }
           if (alive > 0 && !everSawAlive) {
             everSawAlive = true;
             log("\u5DF2\u89C2\u6D4B\u5230\u684C\u9762\u58F3\u5728\u8FD0\u884C\uFF08pid=" + procs[0].pid + "\uFF09");
@@ -4185,7 +4202,12 @@ var require_watchdog = __commonJS({
             return { skipped: d.reason };
           }
           restarts.push(t);
-          const r = await shell.restartShell({ exePath: exe, procPattern });
+          const r = await shell.restartShell({
+            exePath: exe,
+            procPattern,
+            // 在飞复判（K4）：杀旧壳与 spawn 之间有 ~8s 窗口，退出请求可能在窗口内到达。
+            shouldAbort: typeof o.halted === "function" ? () => o.halted() : void 0
+          });
           if (r && r.ok) {
             if (events) events.append("shell_watchdog_restart", { pid: r.pid, exe: r.exe, absentMs: absentForMs });
             log("\u684C\u9762\u58F3\u7F3A\u5931 " + Math.round(absentForMs / 1e3) + "s\uFF0C\u5DF2\u62C9\u8D77 pid=" + r.pid + " exe=" + r.exe);
@@ -5430,7 +5452,22 @@ var require_bootstrap = __commonJS({
           desktop: platform.desktop,
           logger: host.logger,
           events: host.events,
-          config: host.config
+          config: host.config,
+          // 门**下沉到看护域**（2026-09-18 修，K3）：tick() 的一切调用者都受同一门约束。
+          halted: () => !!(host._stopping || host._shellHalted || host._sessionHalting && host._sessionHalting()),
+          // 壳已在线 = 用户重新打开了壳 -> 清除持久退出标记（否则自愈被永久抑制）。
+          //   ⚠ 只在**非退出中**才清：退出握手期间壳还会存活数百 ms，若此时误清，
+          //   持久标记被写成 false，守卫重启后看护又把壳拉回（本修的核心场景）。
+          onShellAlive: () => {
+            if (!host._shellHalted) return;
+            if (host._stopping) return;
+            if (host._sessionHalting && host._sessionHalting()) return;
+            host._shellHalted = false;
+            try {
+              host.writeState(true);
+            } catch {
+            }
+          }
         });
         host._shellWatchdogTimer = setInterval(() => {
           Promise.resolve(host.shellWatchdog.tick()).catch(() => {
@@ -5624,6 +5661,40 @@ var require_shutdown = __commonJS({
     async function shutdownAll(host) {
       if (host._sessionHalting()) return { ok: true, already: true, sessionState: host._sessionState };
       host._setSessionState("stopping");
+      host._shellHalted = true;
+      try {
+        host.writeState(true);
+      } catch (e) {
+        host.logger.warn && host.logger.warn("shutdownAll persist shellHalted: " + e.message);
+      }
+      if (host._shellWatchdogTimer) {
+        clearInterval(host._shellWatchdogTimer);
+        host._shellWatchdogTimer = null;
+      }
+      if (host._heartbeatTimer) {
+        clearInterval(host._heartbeatTimer);
+        host._heartbeatTimer = null;
+      }
+      if (host._timer) {
+        clearInterval(host._timer);
+        host._timer = null;
+      }
+      if (host._initialCheckTimer) {
+        clearTimeout(host._initialCheckTimer);
+        host._initialCheckTimer = null;
+      }
+      if (host._upgradeTimer) {
+        clearInterval(host._upgradeTimer);
+        host._upgradeTimer = null;
+      }
+      if (host._killTimer) {
+        clearTimeout(host._killTimer);
+        host._killTimer = null;
+      }
+      if (host._adoptKillTimer) {
+        clearTimeout(host._adoptKillTimer);
+        host._adoptKillTimer = null;
+      }
       host.logger.info("[session] \u9000\u51FA\u6D41\u7A0B\u5F00\u59CB\uFF1A\u505C\u6B62\u5168\u90E8\u88AB\u7BA1\u5BF9\u8C61\u2026");
       host.events && host.events.append("shutdown_all", {});
       host._stopMainDsh();
@@ -8859,6 +8930,8 @@ var require_status = __commonJS({
         lastFailure: host._mLastFailure(),
         lastRestartAt: host._mLastRestartAt(),
         upgradeHold: host._upgradeHold,
+        // 用户退出标记（跨守卫重启持久）：退出后守卫重启不得凭看护把壳拉回。
+        shellHalted: host._shellHalted === true,
         commandMissing: !!(host._mSpawnBlockedUntil() && Date.now() < host._mSpawnBlockedUntil()),
         dshTokenCaptured: !!(host.tokenService && host.tokenService.get("main")),
         tasks: host.tasks ? host.tasks.running().map((t) => ({ id: t.id, kind: t.kind, action: t.action, target: t.target, state: t.state })) : [],
@@ -11857,6 +11930,12 @@ var require_restart = __commonJS({
       if (!gone) {
         return { ok: false, error: "\u65E7\u58F3\u8FDB\u7A0B\u672A\u80FD\u5728\u8D85\u65F6\u5185\u9000\u51FA\uFF0C\u5DF2\u653E\u5F03\u91CD\u542F\uFF08\u907F\u514D\u53CC\u5B9E\u4F8B\uFF09", killed };
       }
+      if (typeof o.shouldAbort === "function") {
+        try {
+          if (o.shouldAbort()) return { ok: false, aborted: true, error: "\u4F1A\u8BDD\u5DF2\u9000\u51FA/\u9000\u51FA\u4E2D\uFF0C\u5DF2\u653E\u5F03\u62C9\u8D77\u684C\u9762\u58F3", killed };
+        } catch {
+        }
+      }
       try {
         const child = spawnOS.detachedIgnored(exe, [], { env: process.env });
         child.on("error", (e) => {
@@ -12408,6 +12487,7 @@ var require_core5 = __commonJS({
       host._stopping = false;
       host._sessionState = "starting";
       host._crashHalted = false;
+      host._shellHalted = false;
       host._upgradeHold = false;
       host._upgradeHoldSince = null;
       host._timer = null;
@@ -24116,8 +24196,14 @@ var require_shell2 = __commonJS({
           req.resume();
           return send(403, {});
         }
+        if (typeof sup._sessionHalting === "function" && sup._sessionHalting()) {
+          req.resume();
+          return send(409, { ok: false, error: "\u4F1A\u8BDD\u5DF2\u9000\u51FA/\u9000\u51FA\u4E2D\uFF0C\u62D2\u7EDD\u91CD\u542F\u684C\u9762\u58F3" });
+        }
         req.resume();
-        return Promise.resolve(shell.restartShell()).then((r) => {
+        return Promise.resolve(shell.restartShell({
+          shouldAbort: () => typeof sup._sessionHalting === "function" && sup._sessionHalting()
+        })).then((r) => {
           if (sup.events) sup.events.append("shell_restart_requested", { ok: r.ok, killed: r.killed || [], pid: r.pid || null });
           return send(r.ok ? 200 : 500, r);
         }).catch((e) => send(500, { ok: false, error: e.message }));

package/package.json

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