@lob-ox/core-darwin-x64 0.0.14 → 0.0.16

package/core.cjs

@@ -972,8 +972,6 @@ var require_brand = __commonJS({
     var ENV_PLATFORM_OVERRIDE = "DSH_PLATFORM_OVERRIDE";
     var ENV_ESBUILD_VERSION = "DSH_ESBUILD_VERSION";
     var ENV_VERSION_LIB = "DSH_VERSION_LIB";
-    var WINDOWS_GUARD_TASK = "Lobox";
-    var WINDOWS_WATCHDOG_TASK = "Lobox-Watchdog";
     var WINDOWS_GUI_TASK = "Lobox-Shell";
     var WINDOWS_RUN_VALUE = "Lobox";
     var SYSTEMD_UNIT_NAME = "lobox";
@@ -1094,8 +1092,6 @@ var require_brand = __commonJS({
       ENV_PLATFORM_OVERRIDE,
       ENV_ESBUILD_VERSION,
       ENV_VERSION_LIB,
-      WINDOWS_GUARD_TASK,
-      WINDOWS_WATCHDOG_TASK,
       WINDOWS_GUI_TASK,
       WINDOWS_RUN_VALUE,
       SYSTEMD_UNIT_NAME,
@@ -1471,7 +1467,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.0.14");
+      if (true) return String("0.0.16");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -6648,12 +6644,6 @@ var require_portable = __commonJS({
     var OUTCOME = require_outcome();
     var STOP_WAIT_CAP_MS = 3e3;
     var NAP_MS = 150;
-    function nap(ms) {
-      try {
-        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
-      } catch {
-      }
-    }
     function readPidFile(pidFile) {
       if (!pidFile) return null;
       try {
@@ -6667,7 +6657,7 @@ var require_portable = __commonJS({
       if (!pid || !Array.isArray(anchors) || !anchors.length) return false;
       const cmd2 = pidlookup.readCmdline(pid);
       if (!cmd2) return false;
-      return anchors.every((a) => a && cmd2.indexOf(String(a)) !== -1);
+      return anchors.some((a) => a && cmd2.indexOf(String(a)) !== -1);
     }
     var portOf = (o) => {
       const p = Number(o && o.port);
@@ -6710,6 +6700,15 @@ var require_portable = __commonJS({
       kind: "portable",
       supportsUnits: false,
       supportsTransient: true,
+      /**
+       * 能力协商（根因 B 修法；与 router 域 `supports(cap)` 同一范式，下沉到平台层）。
+       *
+       * 判据来源：capability-profile.js 的 sandboxEnforcement —— 三平台均为 'supervise'
+       * （= 产品自身监控，**无 cgroup 级强制**）。此前该字段全仓 0 处查询，
+       * 于是 governor 在"限额根本无法生效"的前提下仍判违规并重启 ⇒ 永动机（P0）。
+       *
+       * 调用方（governor）必须先问后处置：不支持限额 ⇒ 只观测，绝不重启。
+       */
       supports(cap) {
         if (cap === "treeKill") return true;
         if (cap === "limits") return false;
@@ -6790,73 +6789,19 @@ var require_portable = __commonJS({
         }
         return false;
       },
-      daemonReload() {
-        return true;
-      },
-      resetFailed() {
-        return true;
-      },
-      startTransient(o) {
-        const opts = o || {};
-        const cmd2 = opts.cmd || [];
-        if (!cmd2.length) throw new Error("portable \u62C9\u8D77\u62D2\u7EDD\uFF1A\u7A7A\u547D\u4EE4");
-        const child = spawner.detached(cmd2[0], cmd2.slice(1), {
-          cwd: opts.workingDir || void 0,
-          env: Object.assign({}, process.env, opts.env || {})
-        });
-        child.on("error", () => {
-        });
-        if (!child.pid) {
-          try {
-            child.kill();
-          } catch {
-          }
-          throw new Error("portable \u62C9\u8D77\u5931\u8D25\uFF1Aspawn \u672A\u4EA7\u751F\u8FDB\u7A0B");
-        }
-        try {
-          child.unref();
-        } catch {
-        }
-        if (opts.pidFile) {
-          try {
-            fs2.writeFileSync(opts.pidFile, String(child.pid));
-          } catch {
-          }
-        }
-        return true;
-      },
-      stopUnit(unit, o) {
-        const opts = o || {};
-        const ours = findOurs(opts);
-        if (!ours) {
-          removePidFile(opts);
-          return true;
-        }
-        try {
-          procOS.killTree(ours.pid, "SIGTERM", void 0, { ownGroup: ours.ownGroup });
-        } catch {
-        }
-        const budget = Math.max(0, Math.min(typeof opts.timeoutMs === "number" ? opts.timeoutMs : STOP_WAIT_CAP_MS, STOP_WAIT_CAP_MS));
-        const t0 = Date.now();
-        for (; ; ) {
-          if (!findOurs(opts)) {
-            removePidFile(opts);
-            return true;
-          }
-          if (Date.now() - t0 >= budget) break;
-          nap(NAP_MS);
-        }
-        try {
-          procOS.killTree(ours.pid, "SIGKILL", void 0, { ownGroup: ours.ownGroup });
-        } catch {
-        }
-        nap(NAP_MS);
-        if (!findOurs(opts)) {
-          removePidFile(opts);
-          return true;
-        }
-        return false;
-      },
+      /**
+       * 单元是否活跃 —— 返回 Outcome 三态（根因 A 修法）。
+       *
+       * 此前返回 null 表示"未知"，而调用方 instance/ops.js:67 用 `active !== false` 判，
+       * 于是 null（未知）被当成"仍活跃" ⇒ removeInstance 把未知报成删除成功（P0）。
+       *
+       * 关键修正：**无 anchors 时不得把"有人在监听"当成"我们的实例在跑"**。
+       * 端口是共享事实、不是身份（与 monitor.js#matchesAnchors 同一条判据）；
+       * 缺锚点即无从验证身份 ⇒ 如实返回 unknown，由调用方决定（升级校验须失败并回滚）。
+       *
+       * 兼容：既有调用方若直接判真假，Outcome 对象恒为真值，行为同"true"，不会静默反转；
+       *      但显式判据（isOk/isFail/isUnknown）才能区分三态——见 shared/outcome.js。
+       */
       isUnitActive(unit, o) {
         const opts = o || {};
         if (findOurs(opts)) return OUTCOME.OK;
@@ -7413,10 +7358,8 @@ var require_win32 = __commonJS({
       }
     }
     function status() {
-      const guard = hasTask(BRAND2.WINDOWS_GUARD_TASK);
       const gui = hasTask(BRAND2.WINDOWS_GUI_TASK);
-      const watchdog = hasTask(BRAND2.WINDOWS_WATCHDOG_TASK);
-      return { kind: "schtasks", on: guard || gui || watchdog, gui, watchdog, guard };
+      return { kind: "schtasks", on: gui, gui };
     }
     function setAutostart(on, deps) {
       const errors = [];
@@ -7709,13 +7652,7 @@ var require_autostart = __commonJS({
     var isLinux = process.platform === "linux";
     var isMac = process.platform === "darwin";
     var isWindows = process.platform === "win32";
-    var CLI_EXE = isWindows ? BRAND2.CLI_NAME + ".exe" : BRAND2.CLI_NAME;
     var GUI_EXE = isWindows ? BRAND2.GUI_BIN_NAME + ".exe" : BRAND2.GUI_BIN_NAME;
-    function daemonCommand() {
-      const hit = resolveExecutable(BRAND2.CLI_NAME, { envVar: BRAND2.ENV_DAEMON });
-      if (hit) return hit;
-      return path2.join(os2.homedir(), ".local", "bin", CLI_EXE);
-    }
     function guiCommand() {
       const hit = resolveExecutable(BRAND2.GUI_BIN_NAME, { envVar: BRAND2.ENV_SHELL_EXE });
       if (hit) return hit;
@@ -7753,7 +7690,7 @@ var require_autostart = __commonJS({
       if (pl !== "linux") return { ok: false, unsupported: true, platform: pl, enabled: false, error: "\u672A\u77E5\u5E73\u53F0" };
       return linux.setGuiAutostart(on, DEPS);
     }
-    module2.exports = { status, setAutostart, setGuiAutostart, daemonCommand, guiCommand };
+    module2.exports = { status, setAutostart, setGuiAutostart, guiCommand };
   }
 });
 
@@ -7884,28 +7821,8 @@ var require_bootstrap = __commonJS({
       const beat = host._beatScheduler;
       const tickMs = host.config.tickIntervalMs || 5e3;
       beat.unregister("main");
-      beat.unregister("heartbeat");
-      beat.unregister("instance-supervise");
       beat.unregister("upgrade-check");
       beat.register("main", () => host.tick(), { every: 1 });
-      beat.register("heartbeat", () => {
-        if (host.managedObjects) return host.managedObjects.heartbeat(tickMs);
-        return host.tick();
-      }, { every: 1, timeoutMs: Math.max(3e4, tickMs * 12) });
-      beat.register("instance-supervise", async () => {
-        if (!host.instances) return;
-        try {
-          for (const inst of host.instances.all()) {
-            if (inst.domain === "native") continue;
-            host.instances.supervise && host.instances.supervise(inst.id);
-          }
-        } catch (e) {
-        }
-        try {
-          host.instances.governSweep && host.instances.governSweep();
-        } catch (e) {
-        }
-      }, { every: 1 });
       if (host.config.updateCheckEnabled !== false) {
         const checkDelayMs2 = host.config.initialCheckDelayMs || 2e4;
         const checkIntervalMs2 = Math.max(1, Math.round((host.config.updateCheckIntervalMs || 36e5) / tickMs));
@@ -7918,13 +7835,6 @@ var require_bootstrap = __commonJS({
       }
       beat.tick();
       beat.start(tickMs);
-      host._timer = null;
-      host._heartbeatTimer = null;
-      host._upgradeTimer = null;
-      host._initialCheckTimer = null;
-      host._lastHeartbeatAt = Date.now();
-      host._heartbeatStalls = 0;
-      host._heartbeatBeat = host._heartbeatBeat || 0;
       if (host.lanDaemonEnabled()) {
         host._syncLanState();
         const lrt = host._ensureLanRuntime(true);
@@ -8052,13 +7962,7 @@ var require_bootstrap = __commonJS({
         const isBare = policies.isBareCommand(cur);
         if (!isBare) return;
         const d = execPath.resolveDsh();
-        if (!d || !d.bin) {
-          try {
-            host.logger.warn && host.logger.warn("\u539F\u751F DSH \u542F\u52A8\u671F\u7ED1\u5B9A\u8DF3\u8FC7\uFF1A\u672A\u89E3\u6790\u5230\u5165\u53E3\uFF08PATH \u53EF\u80FD\u5C1A\u672A\u767B\u8BB0\uFF09\uFF1Bspawn \u671F\u4F1A\u518D\u6B21\u89E3\u6790");
-          } catch {
-          }
-          return;
-        }
+        if (!d || !d.bin) return;
         host.config.command = d.isJs ? [d.runtime || process.execPath, d.bin, ...cmd2.slice(2)] : [d.bin, ...cmd2.slice(2)];
         try {
           host.events && host.events.append(BRAND2.EVENT_HARNESS_COMMAND_BOUND, { from: cur || null, to: host.config.command[1] });
@@ -8847,36 +8751,9 @@ var require_registry3 = __commonJS({
     var policies = require_policies2();
     var ref = require_registry_ref();
     var config = require_registry_config();
-    var PROBE_MAX_BODY_BYTES = 8 * 1024 * 1024;
     function platformTag() {
       return matrix.npmTag();
     }
-    async function probeRegistry(state, origin) {
-      const spec = state.contract && state.contract.ok && state.contract.probe || null;
-      let tag = null;
-      try {
-        if (matrix.isSupported()) tag = platformTag();
-      } catch {
-        tag = null;
-      }
-      const target = policies.resolveProbe(origin, spec, tag);
-      if (!target.url) {
-        return { ok: false, latencyMs: 0, probe: target.kind, error: target.violation || "\u955C\u50CF\u57FA\u5740\u975E\u6CD5" };
-      }
-      const start = Date.now();
-      const r = await ref.fetchRegistry(target.url, {
-        timeoutMs: target.timeoutMs,
-        expect: "text",
-        maxBytes: PROBE_MAX_BODY_BYTES
-      });
-      return { ok: !!r.ok, latencyMs: Date.now() - start, probe: target.kind, error: r.error || null };
-    }
-    async function probeOrigin(state, origin) {
-      const parsed = ref.parseRegistryBase(origin);
-      if (!parsed.ok) return { origin: ref.normalizeBase(origin), ok: false, latencyMs: null, error: parsed.violation };
-      const p = await probeRegistry(state, parsed.base);
-      return { origin: parsed.base, ok: !!p.ok, latencyMs: p.latencyMs, probe: p.probe, error: p.error || null };
-    }
     function registryOrigins(state) {
       const seen = /* @__PURE__ */ new Set();
       const out = [];
@@ -8889,21 +8766,13 @@ var require_registry3 = __commonJS({
       }
       return out;
     }
-    async function probeAllOrigins(state, origins) {
-      const results = await Promise.all(origins.map(async (origin) => {
-        const p = await probeRegistry(state, origin);
-        return { origin, ok: !!p.ok, latencyMs: p.latencyMs, error: p.error || null };
-      }));
-      results.sort((a, b) => a.ok === b.ok ? a.latencyMs - b.latencyMs : a.ok ? -1 : 1);
-      return results;
-    }
     async function probeOrAdopt(state, origins) {
       const c = state.contract;
       if (c && c.ok) {
         const adopted = policies.shellProbeResults(origins, c.measurements, Math.floor(Date.now() / 1e3));
         if (adopted) return adopted;
       }
-      return probeAllOrigins(state, origins);
+      return (origins || []).map((origin) => ({ origin, ok: false, latencyMs: null, error: "shell-contract \u672A\u63D0\u4F9B\u6D4B\u901F\u7ED3\u679C\uFF08\u955C\u50CF\u6E90\u5F52\u58F3\u4FA7\u5E95\u5EA7\uFF09", from: "no-contract" }));
     }
     function orderFor(primary, origins, results) {
       const usable = (o) => ref.parseRegistryBase(o).ok;
@@ -9038,9 +8907,6 @@ var require_registry3 = __commonJS({
     }
     module2.exports = {
       platformTag,
-      probeRegistry,
-      probeOrigin,
-      probeAllOrigins,
       registryOrigins,
       orderFor,
       selectRegistry,
@@ -12986,37 +12852,27 @@ var require_env = __commonJS({
 var require_node_lts = __commonJS({
   "src/app/settings/node-lts.js"(exports2, module2) {
     "use strict";
-    var fs2 = require("node:fs");
-    var path2 = require("node:path");
+    var runtimeContract = require_runtime();
     module2.exports = {
       methods: {
         async nodeLtsStatus() {
           try {
-            const cacheFile = path2.join(path2.dirname(this.config.stateFile), "node-lts-cache.json");
             const now = Date.now();
-            let cache = null;
-            try {
-              if (fs2.existsSync(cacheFile)) cache = JSON.parse(fs2.readFileSync(cacheFile, "utf8"));
-            } catch {
-            }
-            if (cache && now - (cache.fetchedAt || 0) < 6 * 3600 * 1e3) {
-              return { ok: true, ...cache, cached: true };
-            }
-            const ver = process.versions.node || "";
+            const rt = runtimeContract.read ? runtimeContract.read() : null;
+            const shellVer = rt && rt.nodeVersion || null;
+            const ver = shellVer || process.versions.node || "";
             const major = parseInt(String(ver).split(".")[0], 10) || 0;
-            const ltsLine = major % 2 === 0;
-            const data = {
+            const fromShell = !!shellVer;
+            return {
+              ok: true,
               current: ver,
               major,
-              ltsLine,
-              suggested: "\u5F53\u524D " + ver + (ltsLine ? "\uFF08\u5076\u6570\u4E3B\u7248\u672C\u7EBF\uFF0C\u901A\u5E38\u4E3A LTS\uFF09" : "\uFF08\u5947\u6570\u4E3B\u7248\u672C\u975E LTS \u7EBF\uFF0C\u5EFA\u8BAE\u5076\u6570\u4E3B\u7248\u672C\uFF09"),
-              fetchedAt: now
+              ltsLine: fromShell ? rt && rt.ltsLine === true : null,
+              source: fromShell ? "shell-contract" : "process",
+              suggested: fromShell ? "\u5F53\u524D " + ver + (rt && rt.ltsLine === true ? "\uFF08LTS \u7EBF\uFF09" : "") : "shell \u5951\u7EA6\u672A\u63D0\u4F9B Node \u7248\u672C",
+              fetchedAt: now,
+              cached: false
             };
-            try {
-              fs2.writeFileSync(cacheFile, JSON.stringify(data));
-            } catch {
-            }
-            return { ok: true, ...data, cached: false };
           } catch (e) {
             return { ok: false, error: e.message };
           }
@@ -24324,6 +24180,122 @@ var require_managed_object = __commonJS({
   }
 });
 
+// src/platform/contract/pm-client.js
+var require_pm_client = __commonJS({
+  "src/platform/contract/pm-client.js"(exports2, module2) {
+    "use strict";
+    var fs2 = require("node:fs");
+    var path2 = require("node:path");
+    var http2 = require("node:http");
+    var stateRoot2 = require_state_root();
+    var pidlookup = require_pidlookup();
+    var FILE_NAME = "guard-mgmt.json";
+    var SUPPORTED_SCHEMA = 1;
+    var HOST = "127.0.0.1";
+    var TIMEOUT_MS = 1500;
+    var unavailableHook = null;
+    function setUnavailableHook(fn) {
+      unavailableHook = typeof fn === "function" ? fn : null;
+    }
+    function file() {
+      return path2.join(stateRoot2.supervisorDir(), FILE_NAME);
+    }
+    function pidAlive2(pid) {
+      if (!Number.isInteger(pid) || pid <= 0) return false;
+      return pidlookup.probeAlive(pid) === "alive";
+    }
+    function endpoint() {
+      let text;
+      try {
+        text = fs2.readFileSync(file(), "utf8");
+      } catch {
+        return null;
+      }
+      let j;
+      try {
+        j = JSON.parse(text);
+      } catch {
+        return null;
+      }
+      if (!j || typeof j !== "object" || j.schema !== SUPPORTED_SCHEMA) return null;
+      const port = Number(j.port);
+      if (!Number.isInteger(port) || port <= 0 || port > 65535) return null;
+      if (!pidAlive2(Number(j.pid))) return null;
+      return { port, host: typeof j.host === "string" && j.host ? j.host : HOST };
+    }
+    function post(route, payload) {
+      const ep = endpoint();
+      if (!ep) {
+        if (unavailableHook) {
+          try {
+            unavailableHook(route);
+          } catch {
+          }
+        }
+        return false;
+      }
+      let body;
+      try {
+        body = JSON.stringify(payload || {});
+      } catch {
+        return false;
+      }
+      const req = http2.request(
+        {
+          host: ep.host,
+          port: ep.port,
+          path: route,
+          method: "POST",
+          headers: { "content-type": "application/json", "content-length": Buffer.byteLength(body) },
+          timeout: TIMEOUT_MS
+        },
+        (res) => {
+          res.resume();
+        }
+      );
+      req.on("timeout", () => {
+        try {
+          req.destroy();
+        } catch {
+        }
+      });
+      req.on("error", () => {
+      });
+      try {
+        req.end(body);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    module2.exports = {
+      FILE_NAME,
+      SUPPORTED_SCHEMA,
+      file,
+      endpoint,
+      setUnavailableHook,
+      register(desc) {
+        return post("/pm/register", desc);
+      },
+      setDesired(id, desired) {
+        return post("/pm/set-desired", { id, desired });
+      },
+      onPhase(id, phase) {
+        return post("/pm/on-phase", { id, phase });
+      },
+      recordExit(id, code, signal, startupFailure) {
+        return post("/pm/record-exit", { id, code, signal, startup_failure: startupFailure === true });
+      },
+      requestRestart(id) {
+        return post("/pm/request-restart", { id });
+      },
+      resetBackoff(id) {
+        return post("/pm/reset-backoff", { id });
+      }
+    };
+  }
+});
+
 // src/app/control/registry.js
 var require_registry4 = __commonJS({
   "src/app/control/registry.js"(exports2, module2) {
@@ -24332,15 +24304,11 @@ var require_registry4 = __commonJS({
     var path2 = require("node:path");
     var { writeAtomic } = require_fs();
     var { DESIRED, MANAGED_KINDS, kindMeta, registerKind: registerManagedKind, createEntry, normalizeOwnership } = require_managed_object();
-    var { legacyToEntryPhase } = require_phase();
     var PHASES = ["stopped", "installing", "starting", "running", "draining", "failed"];
-    var configDefaults = require_config();
-    var RESTART_FALLBACK = { windowMs: 6e4, burst: 5 };
-    var restartDefaults = () => {
-      const r = configDefaults && configDefaults.restart;
-      if (r && Number.isFinite(r.windowMs) && Number.isFinite(r.burst)) return { windowMs: r.windowMs, burst: r.burst };
-      return RESTART_FALLBACK;
-    };
+    var LEGACY_PHASES = { backoff: "failed", restarting: "starting" };
+    var pmClient = require_pm_client();
+    var PM_PHASE = { installing: "starting" };
+    var pmPhase = (p) => PM_PHASE[p] || p;
     var ManagedRegistry = class {
       constructor(opts) {
         this.file = opts && opts.file;
@@ -24386,8 +24354,7 @@ var require_registry4 = __commonJS({
           try {
             if (!o || !kindMeta(o.kind)) continue;
             const e = createEntry({ kind: o.kind, id: o.id, name: o.name, desired: o.desired, ownership: o.ownership });
-            const np = legacyToEntryPhase(o.phase);
-            if (PHASES.includes(np)) e.phase = np;
+            if (PHASES.includes(LEGACY_PHASES[o.phase] || o.phase)) e.phase = LEGACY_PHASES[o.phase] || o.phase;
             if (Number.isInteger(o.restartCount) && o.restartCount >= 0) e.restartCount = o.restartCount;
             if (o.startupFailWindowStart === null || typeof o.startupFailWindowStart === "number") e.startupFailWindowStart = o.startupFailWindowStart;
             if (Number.isInteger(o.startupFailCount) && o.startupFailCount >= 0) e.startupFailCount = o.startupFailCount;
@@ -24474,7 +24441,7 @@ var require_registry4 = __commonJS({
         this._syncPortsOwner(e, true);
         this._save();
         this._event("managed_object_registered", { kind: e.kind, id: e.id, name: e.name });
-        const rd = restartDefaults();
+        pmClient.register({ id: e.id, spawn_cmd: [] });
         return e;
       }
       update(id, patch) {
@@ -24484,6 +24451,7 @@ var require_registry4 = __commonJS({
         if (p.desired !== void 0) {
           if (!DESIRED.includes(p.desired)) return { ok: false, error: "\u975E\u6CD5 desired: " + p.desired };
           e.desired = p.desired;
+          pmClient.setDesired(e.id, p.desired);
         }
         if (p.name !== void 0) e.name = String(p.name || e.id);
         if (p.ownership !== void 0) {
@@ -24515,6 +24483,7 @@ var require_registry4 = __commonJS({
         this._drop(e);
         this._save();
         this._event("managed_object_removed", { kind: e.kind, id: e.id });
+        pmClient.setDesired(e.id, "stopped");
         return { ok: true };
       }
       _releasePort(port, ownerId) {
@@ -24576,6 +24545,7 @@ var require_registry4 = __commonJS({
           e.lastTransitionAt = (/* @__PURE__ */ new Date()).toISOString();
           this._event("managed_object_phase", { kind: e.kind, id: e.id, phase: p });
           this._save();
+          pmClient.onPhase(e.id, pmPhase(p));
         }
         return e;
       }

package/package.json

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