@lob-ox/core-darwin-x64 0.0.26 → 0.0.28

package/core.cjs

@@ -1642,7 +1642,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.0.26");
+      if (true) return String("0.0.28");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -2532,10 +2532,16 @@ var require_pm_client = __commonJS({
         return false;
       }
     }
-    function keepAlive(pid) {
+    function keepAlive(pid, id) {
       const n = Number(pid);
       if (!Number.isInteger(n) || n <= 0) return false;
-      return post("/pm/keep-alive", { pid: n });
+      const body = { pid: n };
+      if (id !== void 0 && id !== null) {
+        const s = String(id);
+        if (!s) return false;
+        body.id = s;
+      }
+      return post("/pm/keep-alive", body);
     }
     module2.exports = {
       FILE_NAME,
@@ -2580,6 +2586,8 @@ var require_desired = __commonJS({
       };
       const setManualRestart = typeof g.setManualRestart === "function" ? g.setManualRestart : () => {
       };
+      const setShellHalted = typeof g.setShellHalted === "function" ? g.setShellHalted : null;
+      const shellHalted = () => typeof g.getShellHalted === "function" ? g.getShellHalted() === true : false;
       const tick = () => {
         if (typeof g.tick === "function") g.tick();
       };
@@ -2600,7 +2608,19 @@ var require_desired = __commonJS({
         if (v === "stopped" && fields.observedOnly() && fields.accessors.adoptedPid.get() !== null) {
           stopProcess("desired_stopped");
         }
-        pmClient.setDesired("core", v);
+        const reported = pmClient.setDesired("core", v) === true;
+        if (reported && shellHalted() && setShellHalted) {
+          setShellHalted(false);
+          try {
+            events().append("shell_halt_cleared", { reason: "shell_sync_ok", desired: v });
+          } catch {
+          }
+          try {
+            const l = logger();
+            l && l.info && l.info("shellHalted \u5DF2\u6E05\uFF08\u58F3\u72B6\u6001\u540C\u6B65\u6210\u529F\u56DE\u6267\uFF09");
+          } catch {
+          }
+        }
         if (fields.desired() !== v) {
           fields.setDesired(v);
           const ev = events();
@@ -2714,6 +2734,10 @@ var require_collaborator = __commonJS({
         getLogger: logger,
         setCrashHalted: g.setCrashHalted,
         setManualRestart: g.setManualRestart,
+        // 壳状态同步成功回执 ⇒ 清「壳让停」旧标记。缺这两个 setter 时清除静默不执行
+        // （desired.js 内部按 null 跳过）⇒ 那正是本次要修的静默失败，不能以同样形态引入。
+        getShellHalted: g.getShellHalted,
+        setShellHalted: g.setShellHalted,
         tick: g.tick,
         stopProcess: g.stopProcess
       });
@@ -5241,6 +5265,51 @@ var require_native = __commonJS({
 var require_changelog = __commonJS({
   "src/shared/changelog.json"(exports2, module2) {
     module2.exports = [
+      {
+        version: "0.0.28",
+        date: "2026-10-19",
+        sections: [
+          {
+            title: "\u4FEE\u590D",
+            items: [
+              "\u58F3\u6536\u5230\u5185\u6838\u81EA\u62A5\u7684 pid \u65F6\u8FDB\u7A0B\u8868\u91CC\u8FD8\u6CA1\u6709 core \u884C\uFF08\u5185\u6838\u5728\u300C\u5C31\u7EEA\u90A3\u4E00\u523B\u300D\u81EA\u62A5\uFF0C\u800C\u58F3\u5728 await_daemon \u8FD4\u56DE\u4E4B\u540E\u624D\u5EFA\u884C\uFF09\u21D2 \u66F4\u65B0\u5FC5\u672A\u547D\u4E2D\u3002\u73B0\u6539\u4E3A\u5148\u5EFA\u884C\uFF08\u5165\u53E3 pid \u5360\u4F4D\uFF09\u518D\u7B49\u5C31\u7EEA\uFF0C\u81EA\u62A5\u7684 pid \u7531 update_pid \u6539\u5199\u90A3\u4E00\u884C",
+              "\u58F3\u7684\u5951\u7EA6\u515C\u5E95\u4E0E\u8BA4\u9886\u767B\u8BB0\u4F1A\u62FF\u58F3\u81EA\u5DF1\u53BB\u6740/\u767B\u8BB0\uFF1Alive_contract_owner \u8BFB\u7684 guard-mgmt.json \u7684 pid \u662F\u58F3\u81EA\u5DF1\uFF08export_port \u5199 std::process::id\uFF09\uFF0C\u800C\u5B83\u6052\u771F \u21D2 shutdown_all \u7684\u515C\u5E95\u4F1A kill_tree_pid(\u58F3\u81EA\u5DF1) \u81EA\u6740\uFF0Cregister_core \u4F1A\u628A\u81EA\u5DF1 adopt_spawned \u8FDB core \u884C\u8BA9 already \u8BEF\u89E6\uFF08\u5185\u6838\u6C38\u8FDC\u8D77\u4E0D\u6765\uFF09\u3002\u4E24\u5904\u90FD\u52A0\u4E86 pid != \u81EA\u5DF1\u7684\u8FC7\u6EE4"
+            ]
+          },
+          {
+            title: "\u6E05\u7406",
+            items: [
+              "\u4E24\u5904 edit \u6B8B\u7559\uFF08\u4E24\u6761\u8BED\u53E5\u6324\u4E00\u884C\uFF09\uFF1Aguardctl.rs \u7684 })); \u4E0E let outcome\u3001bounded.rs \u7684\u4E24\u6761 extern \u58F0\u660E\u3002\u8BED\u6CD5\u5BF9\u6240\u4EE5 CI \u6293\u4E0D\u5230\uFF0C\u4F46\u4EBA\u8BFB\u96BE\u53D7"
+            ]
+          }
+        ]
+      },
+      {
+        version: "0.0.27",
+        date: "2026-10-19",
+        sections: [
+          {
+            title: "\u4FEE\u590D",
+            items: [
+              "\u58F3\u7684\u8FDB\u7A0B\u8868\u8BB0\u7684\u5185\u6838 pid \u662F\u5165\u53E3\u8FDB\u7A0B\uFF08--run-guard\uFF09\u800C\u4E0D\u662F\u771F\u5185\u6838\uFF0C\u6052\u5DEE\u4E00\u4E2A\u8FDB\u7A0B\u4EE3 \u21D2 \u58F3\u505C\u5185\u6838\u65F6\u6740\u7684\u662F\u5165\u53E3\uFF0C\u771F\u5185\u6838\u53EA\u9760 JobObject \u8FDE\u5E26\u6740\u3002\u73B0\u7531\u5185\u6838\u5728\u542F\u52A8\u540E\u7ECF /pm/keep-alive \u81EA\u62A5\u81EA\u5DF1\u7684 pid\uFF0C\u58F3\u66F4\u65B0\u8FDB\u7A0B\u8868\uFF08update_pid \u7A84\u65B9\u6CD5\uFF0C\u53EA\u8BBE pid \u4E0D\u52A8\u5176\u4ED6\u5B57\u6BB5\uFF09",
+              "\u8FDE\u5E26\u4FEE\u590D\u4E09\u5904\u56E0 pid \u6052\u7A7A\u800C\u6C38\u4E0D\u6210\u7ACB\u7684\u5224\u636E\uFF1Aalready\uFF08\u6BCF\u6B21\u542F\u52A8\u90FD\u8D70\u5B8C\u6574\u5E8F\u5217\uFF09\u3001serving\uFF08\u9762\u677F\u663E\u793A\u300C\u6CA1\u5728\u670D\u52A1\u300D\uFF09\u3001heal_candidates\uFF08core \u4ECE\u4E0D\u62A5\u76F8\u4F4D \u21D2 \u81EA\u6108\u51E0\u4E4E\u4E0D\u53EF\u89E6\u53D1\uFF09"
+            ]
+          },
+          {
+            title: "\u6539\u8FDB",
+            items: [
+              "\u58F3 API /pm/keep-alive \u7684 role \u6539\u4E3A\u53EF\u9009\u3001\u7F3A\u7701 managed\uFF1A\u5185\u6838\u4FA7\u53EA\u53D1 {pid}\uFF0C\u800C\u58F3\u4FA7 role \u8BCD\u8868\u53EA\u6709\u4E00\u4E2A\u503C \u21D2 \u4E0D\u8981\u6C42\u8C03\u7528\u65B9\u8BF4\u4E00\u53E5\u58F3\u5DF2\u7ECF\u77E5\u9053\u7684\u8BDD",
+              "DSH \u4E3B\u5B9E\u4F8B\u7684 keep-alive \u6539\u62A5 id 'dsh-main' \u800C\u975E 'core'\uFF1A\u58F3\u7684 core \u884C\u4EE3\u8868\u5185\u6838\u8FDB\u7A0B\uFF08Priority::Core\uFF09\uFF0C\u4E0E DSH \u4E3B\u5B9E\u4F8B\u5171\u7528\u4E00\u4E2A id \u4F1A\u8BA9\u540E\u5199\u8986\u76D6\u524D\u5199"
+            ]
+          },
+          {
+            title: "\u6E05\u7406",
+            items: [
+              "\u5220 core/test/ 22 \u4E2A\u6D4B\u8BD5\u6587\u4EF6\uFF0821 \u4E2A *-test.js + README\uFF09\u2014\u2014\u5B83\u4EEC\u66FE\u670D\u52A1\u5DF2\u62C6\u9664\u7684 standards-check\uFF0C\u5168\u4ED3\u96F6 require\u3001CI \u96F6\u5F15\u7528\u3001package.json \u65E0 test \u811A\u672C"
+            ]
+          }
+        ]
+      },
       {
         version: "0.0.26",
         date: "2026-10-18",
@@ -7179,7 +7248,7 @@ var require_process = __commonJS({
         d.logger().info("spawn pid=" + child.pid + " cmd=" + d.spawnCommand().join(" "));
         if (child.pid) {
           try {
-            pmClient.keepAlive(child.pid);
+            pmClient.keepAlive(child.pid, "dsh-main");
           } catch {
           }
         }
@@ -9255,7 +9324,8 @@ var require_portable = __commonJS({
         }
         if (opts.keepAlive) {
           try {
-            require_pm_client().keepAlive(child.pid);
+            const ka = require_pm_client().keepAlive;
+            ka(child.pid, opts.keepAliveId || void 0);
           } catch {
           }
         }
@@ -12947,7 +13017,7 @@ var require_process3 = __commonJS({
         this._writeIdentity(child.pid);
         if (child.pid) {
           try {
-            pmClient.keepAlive(child.pid);
+            pmClient.keepAlive(child.pid, this.name);
           } catch {
           }
         }
@@ -23667,7 +23737,7 @@ var require_lifecycle3 = __commonJS({
           const ctx = sandbox.launchCtx(instancesRoot, deps.dshBin, inst);
           _cleanStaleUnit("dsh-web@" + inst.id, ctx);
           try {
-            service.startTransient({ unit: "dsh-web@" + inst.id, cmd: cmdArr, env, workingDir, port: ctx.port, pidFile: ctx.pidFile, anchors: ctx.anchors, keepAlive: true });
+            service.startTransient({ unit: "dsh-web@" + inst.id, cmd: cmdArr, env, workingDir, port: ctx.port, pidFile: ctx.pidFile, anchors: ctx.anchors, keepAlive: true, keepAliveId: "sandbox" });
           } catch (e) {
             const msg = "systemd \u542F\u52A8\u5931\u8D25: " + (e.message || e);
             inst.state.lastError = msg;
@@ -28822,7 +28892,7 @@ var require_frp = __commonJS({
         this.child = child;
         if (child.pid) {
           try {
-            pmClient.keepAlive(child.pid);
+            pmClient.keepAlive(child.pid, "frpc");
           } catch {
           }
         }
@@ -29776,7 +29846,24 @@ function cmdDaemon() {
   });
   sup.start();
   console.log("[supervisor] daemon started, pid=" + process.pid);
-  traceExit("started", { version: true ? "0.0.26" : null });
+  traceExit("started", { version: true ? "0.0.28" : null });
+  try {
+    const pmc = require_pm_client();
+    if (pmc.keepAlive(process.pid, "core")) {
+      sup.events.append("core_pid_reported", { pid: process.pid, semantics: "request_sent" });
+    } else {
+      const ep = pmc.endpoint();
+      sup.events.append("core_pid_not_reported", {
+        pid: process.pid,
+        reason: ep ? "post_failed" : "shell_absent"
+      });
+    }
+  } catch (e) {
+    try {
+      sup.events.append("core_pid_report_failed", { pid: process.pid, error: e && e.message || String(e) });
+    } catch {
+    }
+  }
   process.on("exit", (code) => {
     if (!_exiting) {
       traceExit("process_exit", { code });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lob-ox/core-darwin-x64",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "DSH lifecycle guard core (Node launcher) for darwin-x64 — requires Node >=22.12.0.",
   "license": "UNLICENSED",
   "repository": {