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

package/core.cjs

@@ -1471,7 +1471,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.0.12");
+      if (true) return String("0.0.14");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -1994,7 +1994,6 @@ var require_store = __commonJS({
       const record = g.record;
       const fields = g.fields;
       const mainStore = g.mainStore;
-      const upgradeHold = g.upgradeHold;
       const config = () => typeof g.getConfig === "function" ? g.getConfig() || {} : {};
       const logger = () => typeof g.getLogger === "function" ? g.getLogger() : null;
       const events = () => typeof g.getEvents === "function" ? g.getEvents() : null;
@@ -2040,7 +2039,6 @@ var require_store = __commonJS({
           if (typeof raw.startupFailCount === "number") record.fieldOf("startupFailCount", raw.startupFailCount, true);
           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 (e) {
           const l = logger();
@@ -2200,203 +2198,6 @@ var require_desired = __commonJS({
   }
 });
 
-// src/app/main/decide.js
-var require_decide = __commonJS({
-  "src/app/main/decide.js"(exports2, module2) {
-    "use strict";
-    var pidlook = require_pidlookup();
-    function startDeadlinePassed(deadline, now) {
-      return !!(deadline && now > deadline);
-    }
-    function childAlive(child) {
-      return !!(child && child.exitCode === null && child.signalCode === null);
-    }
-    function adoptedAlive(adoptPid) {
-      return adoptPid !== null && adoptPid !== void 0 && pidlook.isAlive(adoptPid);
-    }
-    function targetAlive(child, adoptPid) {
-      return childAlive(child) || adoptedAlive(adoptPid);
-    }
-    var DEPS = /* @__PURE__ */ new WeakMap();
-    function depsOf(host) {
-      let d = DEPS.get(host);
-      if (!d) {
-        d = {
-          state() {
-            return host.state;
-          },
-          session() {
-            return host.session;
-          },
-          upgradeHold() {
-            return host._upgradeHold;
-          },
-          manualRestart() {
-            return host.manualRestart;
-          },
-          crashHalted() {
-            return host._crashHalted;
-          },
-          portUp() {
-            return host._lastPortUp === true;
-          },
-          mChild() {
-            return host._mChild();
-          },
-          mAdoptPid() {
-            return host._mAdoptPid();
-          },
-          mAdopted() {
-            return host._mAdopted();
-          },
-          mObservedOnly() {
-            return host._mObservedOnly();
-          },
-          mSpawnBlockedUntil() {
-            return host._mSpawnBlockedUntil();
-          },
-          mStartDeadline() {
-            return host._mStartDeadline();
-          },
-          mRestartAt() {
-            return host._mRestartAt();
-          },
-          mStartupFailWindowStart() {
-            return host._mStartupFailWindowStart();
-          },
-          mStartupFailCount() {
-            return host._mStartupFailCount();
-          }
-        };
-        DEPS.set(host, d);
-      }
-      return d;
-    }
-    module2.exports = {
-      methods: {
-        _mainStateSnapshot() {
-          const d = depsOf(this);
-          const now = Date.now();
-          const phase = d.state().phase();
-          const startDeadline = d.mStartDeadline();
-          return {
-            phase,
-            desired: d.state().desired(),
-            portUp: d.portUp() === true,
-            childAlive: childAlive(d.mChild()),
-            adoptedAlive: adoptedAlive(d.mAdoptPid()),
-            adoptedPidSet: d.mAdoptPid() !== null,
-            childPresent: d.mChild() !== null,
-            adopted: d.mAdopted() === true,
-            observedOnly: d.mObservedOnly() === true,
-            upgradeHold: d.upgradeHold() === true,
-            manualRestart: d.manualRestart() === true,
-            spawnBlocked: !!(d.mSpawnBlockedUntil() && now < d.mSpawnBlockedUntil()),
-            startDeadlinePassed: startDeadlinePassed(startDeadline, now),
-            restartInFlight: phase === "STARTING" && startDeadline === null,
-            restartDue: d.mRestartAt() === null || now >= d.mRestartAt(),
-            crashHalted: d.crashHalted() === true,
-            sessionHalting: d.session().halting() === true,
-            startupFailWindowStart: d.mStartupFailWindowStart(),
-            startupFailCount: d.mStartupFailCount()
-          };
-        }
-      },
-      startDeadlinePassed,
-      childAlive,
-      adoptedAlive,
-      targetAlive
-    };
-  }
-});
-
-// src/app/state/upgrade-hold.js
-var require_upgrade_hold = __commonJS({
-  "src/app/state/upgrade-hold.js"(exports2, module2) {
-    "use strict";
-    var pidlook = require_pidlookup();
-    var { childAlive: childAliveOf, adoptedAlive: adoptedAliveOf } = require_decide();
-    function createUpgradeHold(deps) {
-      const g = deps || {};
-      const fields = g.fields;
-      const store = () => typeof g.getStore === "function" ? g.getStore() : null;
-      const config = () => typeof g.getConfig === "function" ? g.getConfig() || {} : {};
-      const intents = () => typeof g.getIntents === "function" ? g.getIntents() : null;
-      const tick = () => {
-        if (typeof g.tick === "function") g.tick();
-      };
-      const stopProcess = (why) => {
-        if (typeof g.stopProcess === "function") g.stopProcess(why);
-      };
-      const setHold = typeof g.setHold === "function" ? g.setHold : () => {
-      };
-      const setSince = typeof g.setSince === "function" ? g.setSince : () => {
-      };
-      function enter() {
-        setHold(true);
-        setSince(Date.now());
-        const child = fields.child();
-        const adoptPid = fields.adoptPid();
-        const targetAlive = childAliveOf(child) || adoptedAliveOf(adoptPid);
-        if (targetAlive) {
-          stopProcess("upgrade");
-        } else if (fields.phase() !== "STOPPED") {
-          fields.setPhase("STOPPED");
-          const s = store();
-          if (s) s.writeState();
-        }
-      }
-      async function enterAsync() {
-        const refs = { child: fields.child(), adoptedPid: fields.adoptPid() };
-        enter();
-        if (childAliveOf(refs.child)) {
-          await new Promise((resolve) => {
-            let settled = false;
-            const done = () => {
-              if (!settled) {
-                settled = true;
-                resolve();
-              }
-            };
-            refs.child.once("exit", done);
-            setTimeout(done, config().stopGraceMs + 5e3);
-          });
-          return;
-        }
-        if (refs.adoptedPid && pidlook.isAlive(refs.adoptedPid)) {
-          await new Promise((resolve) => {
-            let settled = false;
-            const done = () => {
-              if (!settled) {
-                settled = true;
-                resolve();
-              }
-            };
-            const start = Date.now();
-            const check = () => {
-              if (!pidlook.isAlive(refs.adoptedPid)) return done();
-              if (Date.now() > start + config().stopGraceMs + 5e3) return done();
-              setTimeout(check, 200);
-            };
-            check();
-          });
-        }
-      }
-      function exit(explicit) {
-        setHold(false);
-        setSince(null);
-        if (explicit) {
-          const it = intents();
-          if (it) it.register("upgrade-resume");
-        }
-        tick();
-      }
-      return { enter, enterAsync, exit };
-    }
-    module2.exports = { createUpgradeHold };
-  }
-});
-
 // src/app/state/collaborator.js
 var require_collaborator = __commonJS({
   "src/app/state/collaborator.js"(exports2, module2) {
@@ -2406,7 +2207,6 @@ var require_collaborator = __commonJS({
     var { createFields } = require_fields();
     var { createStore } = require_store();
     var { createDesired } = require_desired();
-    var { createUpgradeHold } = require_upgrade_hold();
     function createStateStore(deps) {
       const g = deps || {};
       const logger = () => typeof g.getLogger === "function" ? g.getLogger() : null;
@@ -2414,21 +2214,10 @@ var require_collaborator = __commonJS({
       const mainStore = createMainStore({ getConfig: g.getConfig, getLogger: logger });
       const fields = createFields({ record, mainStore, getManagedObjects: g.getManagedObjects, getLogger: logger });
       const holder = {};
-      const upgradeHold = createUpgradeHold({
-        fields,
-        getStore: () => holder.store,
-        getConfig: g.getConfig,
-        getIntents: g.getIntents,
-        tick: g.tick,
-        stopProcess: g.stopProcess,
-        setHold: g.setHold,
-        setSince: g.setSince
-      });
       const store = createStore({
         record,
         fields,
         mainStore,
-        upgradeHold,
         getConfig: g.getConfig,
         getLogger: logger,
         getEvents: g.getEvents,
@@ -2474,10 +2263,7 @@ var require_collaborator = __commonJS({
         loadState: store.loadState,
         migrateMainRecord: store.migrateMainRecord,
         setDesiredPublic: desired.setDesired,
-        requestRestart: desired.requestRestart,
-        enterUpgradeHold: upgradeHold.enter,
-        enterUpgradeHoldAsync: upgradeHold.enterAsync,
-        exitUpgradeHold: upgradeHold.exit
+        requestRestart: desired.requestRestart
       };
     }
     module2.exports = { createStateStore };
@@ -4704,8 +4490,6 @@ var require_collaborators = __commonJS({
       },
       main: {
         converge: "_dshConverge",
-        noteStartupFailure: "_noteStartupFailure",
-        retryStartupFailure: "_retryStartupFailure",
         startWindowMs: "startWindowMs",
         adopt: "_adopt",
         adoptObserved: "_adoptObserved",
@@ -4776,14 +4560,6 @@ var require_collaborators = __commonJS({
         setManualRestart: (v) => {
           host.manualRestart = v;
         },
-        getHold: () => host._upgradeHold,
-        setHold: (v) => {
-          host._upgradeHold = v;
-        },
-        getSince: () => host._upgradeHoldSince,
-        setSince: (v) => {
-          host._upgradeHoldSince = v;
-        },
         getShellHalted: () => host._shellHalted,
         setShellHalted: (v) => {
           host._shellHalted = v;
@@ -4811,9 +4587,6 @@ var require_collaborators = __commonJS({
       host.setDesired = (v) => state.setDesiredPublic(v);
       host.requestRestart = () => state.requestRestart();
       host.persistConfigPatch = (patch) => state.persistConfigPatch(patch);
-      host._enterUpgradeHold = () => state.enterUpgradeHold();
-      host._enterUpgradeHoldAsync = () => state.enterUpgradeHoldAsync();
-      host._exitUpgradeHold = (explicit) => state.exitUpgradeHold(explicit);
       installFieldHelpers(host, state);
       for (const name of Object.keys(state.accessors)) Object.defineProperty(host, name, state.accessors[name]);
     }
@@ -8068,122 +7841,6 @@ var require_os = __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/assembly/bootstrap.js
 var require_bootstrap = __commonJS({
   "src/app/assembly/bootstrap.js"(exports2, module2) {
@@ -8199,15 +7856,6 @@ var require_bootstrap = __commonJS({
     var platform = require_os();
     var ENV_FORM_STARTUP_DELAY_MS = 3e3;
     function _bootstrap(host) {
-      try {
-        require_pm_client().setUnavailableHook((route) => {
-          try {
-            host.events.append("pm_endpoint_unavailable", { route });
-          } catch {
-          }
-        });
-      } catch {
-      }
       try {
         host.events.append("guard_started", {
           pid: process.pid,
@@ -10140,44 +9788,6 @@ var require_scheduler = __commonJS({
         async tick() {
           const d = depsOf(this);
           return d.main().converge();
-        },
-        async _dshSuperviseOnce() {
-          const d = depsOf(this);
-          try {
-            if (d.stopping()) return { ok: false, error: "guard stopping" };
-            if (d.exitIntended()) return { ok: false, error: "exit intended" };
-            await d.main().converge();
-            try {
-              d.control().syncInstancesView();
-            } catch (e) {
-              d.logger() && d.logger().warn && d.logger().warn("instances view sync: " + (e && e.message || e));
-            }
-          } catch (e) {
-            d.logger() && d.logger().warn && d.logger().warn("[dsh] supervise \u5F02\u5E38: " + (e && e.message || e));
-          }
-          try {
-            const now = Date.now();
-            if (!d.readLastOrphanAuditAt() || now - d.readLastOrphanAuditAt() > 6e4) {
-              d.writeLastOrphanAuditAt(now);
-              d.audit().orphan();
-            }
-          } catch (e) {
-            d.logger() && d.logger().debug && d.logger().debug("orphan audit: " + (e && e.message || e));
-          }
-          if (d.eventHub()) {
-            try {
-              await d.eventHub().sync();
-            } catch (e) {
-              d.logger() && d.logger().debug && d.logger().debug("eventHub sync: " + (e && e.message || e));
-            }
-          }
-          const snap = d.mainSnapshot();
-          const alive = !!(snap && (snap.childAlive || snap.adoptedAlive));
-          const ph = d.state().phase();
-          return {
-            ok: alive,
-            error: alive ? null : ph === "FAILED" ? "\u542F\u52A8\u53CD\u590D\u5931\u8D25\uFF1A\u5DF2\u505C\u6B62\u81EA\u52A8\u91CD\u542F\uFF0C\u7B49\u5F85\u4EBA\u5DE5\u91CD\u8BD5" : ph === "STARTING" ? "\u542F\u52A8\u7A97\u53E3\u5185\u8FDB\u7A0B\u5DF2\u9000\u51FA\uFF0C\u7B49\u5F85\u91CD\u542F" : "\u8FDB\u7A0B\u672A\u8FD0\u884C"
-          };
         }
       }
     };
@@ -10266,7 +9876,113 @@ var require_instance_adapter = __commonJS({
             d.logger() && d.logger().warn && d.logger().warn("sandbox setRestartCount: " + (e && e.message || e));
           }
         }
-      }
+      }
+    };
+  }
+});
+
+// src/app/main/decide.js
+var require_decide = __commonJS({
+  "src/app/main/decide.js"(exports2, module2) {
+    "use strict";
+    var pidlook = require_pidlookup();
+    function startDeadlinePassed(deadline, now) {
+      return !!(deadline && now > deadline);
+    }
+    function childAlive(child) {
+      return !!(child && child.exitCode === null && child.signalCode === null);
+    }
+    function adoptedAlive(adoptPid) {
+      return adoptPid !== null && adoptPid !== void 0 && pidlook.isAlive(adoptPid);
+    }
+    function targetAlive(child, adoptPid) {
+      return childAlive(child) || adoptedAlive(adoptPid);
+    }
+    var DEPS = /* @__PURE__ */ new WeakMap();
+    function depsOf(host) {
+      let d = DEPS.get(host);
+      if (!d) {
+        d = {
+          state() {
+            return host.state;
+          },
+          session() {
+            return host.session;
+          },
+          manualRestart() {
+            return host.manualRestart;
+          },
+          crashHalted() {
+            return host._crashHalted;
+          },
+          portUp() {
+            return host._lastPortUp === true;
+          },
+          mChild() {
+            return host._mChild();
+          },
+          mAdoptPid() {
+            return host._mAdoptPid();
+          },
+          mAdopted() {
+            return host._mAdopted();
+          },
+          mObservedOnly() {
+            return host._mObservedOnly();
+          },
+          mSpawnBlockedUntil() {
+            return host._mSpawnBlockedUntil();
+          },
+          mStartDeadline() {
+            return host._mStartDeadline();
+          },
+          mRestartAt() {
+            return host._mRestartAt();
+          },
+          mStartupFailWindowStart() {
+            return host._mStartupFailWindowStart();
+          },
+          mStartupFailCount() {
+            return host._mStartupFailCount();
+          }
+        };
+        DEPS.set(host, d);
+      }
+      return d;
+    }
+    module2.exports = {
+      methods: {
+        _mainStateSnapshot() {
+          const d = depsOf(this);
+          const now = Date.now();
+          const phase = d.state().phase();
+          const startDeadline = d.mStartDeadline();
+          return {
+            phase,
+            desired: d.state().desired(),
+            portUp: d.portUp() === true,
+            childAlive: childAlive(d.mChild()),
+            adoptedAlive: adoptedAlive(d.mAdoptPid()),
+            adoptedPidSet: d.mAdoptPid() !== null,
+            childPresent: d.mChild() !== null,
+            adopted: d.mAdopted() === true,
+            observedOnly: d.mObservedOnly() === true,
+            manualRestart: d.manualRestart() === true,
+            spawnBlocked: !!(d.mSpawnBlockedUntil() && now < d.mSpawnBlockedUntil()),
+            startDeadlinePassed: startDeadlinePassed(startDeadline, now),
+            restartInFlight: phase === "STARTING" && startDeadline === null,
+            restartDue: d.mRestartAt() === null || now >= d.mRestartAt(),
+            crashHalted: d.crashHalted() === true,
+            sessionHalting: d.session().halting() === true,
+            startupFailWindowStart: d.mStartupFailWindowStart(),
+            startupFailCount: d.mStartupFailCount()
+          };
+        }
+      },
+      startDeadlinePassed,
+      childAlive,
+      adoptedAlive,
+      targetAlive
     };
   }
 });
@@ -10397,18 +10113,6 @@ var require_controller = __commonJS({
           writeLastPortUp(v) {
             host._lastPortUp = v;
           },
-          upgradeHold() {
-            return host._upgradeHold;
-          },
-          writeUpgradeHold(v) {
-            host._upgradeHold = v;
-          },
-          upgradeHoldSince() {
-            return host._upgradeHoldSince;
-          },
-          writeUpgradeHoldSince(v) {
-            host._upgradeHoldSince = v;
-          },
           manualRestart() {
             return host.manualRestart;
           },
@@ -10419,8 +10123,7 @@ var require_controller = __commonJS({
             host._crashHalted = v;
           },
           sessionState() {
-            const p = String(host._mPhase() || "").toUpperCase();
-            return p === "STARTING" || p === "RUNNING" ? "running" : "stopped";
+            return host.session ? host.session.state() : "running";
           },
           mChild() {
             return host._mChild();
@@ -10512,22 +10215,6 @@ var require_controller = __commonJS({
               d.state().write();
               return;
             }
-            if (d.upgradeHold()) {
-              if (targetAlive) {
-                d.main().stopProcess("upgrade_hold");
-              } else {
-                if (d.state().phase() !== "STOPPED") d.state().setPhase("STOPPED");
-                const maxHold = (d.config().upgradeTimeoutMs || 6e5) + 12e4;
-                if (d.upgradeHoldSince() && Date.now() - d.upgradeHoldSince() > maxHold) {
-                  d.events().append("upgrade_hold_timeout", {});
-                  d.ui().notify("\u5347\u7EA7\u6D41\u7A0B\u5F02\u5E38", "\u5347\u7EA7 hold \u8D85\u65F6\u5DF2\u81EA\u52A8\u91CA\u653E\uFF0C\u8BF7\u68C0\u67E5\u5347\u7EA7\u72B6\u6001");
-                  d.writeUpgradeHold(false);
-                  d.writeUpgradeHoldSince(null);
-                }
-              }
-              d.state().write();
-              return;
-            }
             const manual = d.manualRestart();
             if (manual) {
               d.writeManualRestart(false);
@@ -10611,7 +10298,6 @@ var require_controller = __commonJS({
                 const wantsRetry = manual || startIntent !== void 0 || restartIntent !== void 0;
                 if (!wantsRetry) break;
                 if (d.state().desired() === "stopped") break;
-                d.main().retryStartupFailure();
                 d.mSetStartDeadline(null);
                 d.mSetRestartAt(null);
                 if (targetAlive) d.main().beginRestart("manual", { manual: true, startupFailure: false });
@@ -10631,7 +10317,7 @@ var require_controller = __commonJS({
             d.logger().error("tick error: " + (e && e.stack || e));
           } finally {
             d.writeTicking(false);
-            if (d.sessionState() === "running") d.session().setState("running");
+            if (d.sessionState() !== "running") d.session().setState("running");
             try {
               d.control().syncDshView();
             } catch (e) {
@@ -10905,7 +10591,6 @@ var require_process2 = __commonJS({
     var native = require_command();
     var BRAND2 = require_brand();
     var { findManagedDshPort, applyMainPort } = require_port_rederive();
-    var pmClient = require_pm_client();
     var DEPS = /* @__PURE__ */ new WeakMap();
     var HELPERS = [
       "MissingNotified",
@@ -11040,7 +10725,6 @@ var require_process2 = __commonJS({
             errBuf.flush();
             if (d.mChild() !== child) return;
             d.events().append(BRAND2.EVENT_HARNESS_EXITED, { code, signal, phase: d.state().phase() });
-            pmClient.recordExit("main", code, signal, d.state().phase() === "STARTING");
             d.mSetChild(null);
             if (d.stopping()) return;
             if (d.state().desired() !== "running") return;
@@ -11050,7 +10734,6 @@ var require_process2 = __commonJS({
               const why = code !== null ? String(code) : "sig" + signal;
               const inStartup = phase === "STARTING";
               if (inStartup || d.state().guardian()) {
-                pmClient.requestRestart("main");
                 d.beginRestart("exit:" + why, { startupFailure: inStartup });
               } else {
                 d.writeCrashHalted(true);
@@ -11139,7 +10822,7 @@ var require_process2 = __commonJS({
           d.logger().warn("restart triggered: " + reason + (startupFailure ? "\uFF08\u542F\u52A8\u7A97\u53E3\u5185\u9000\u51FA\uFF0C\u8BA1\u4E00\u6B21\u542F\u52A8\u5931\u8D25\uFF09" : "\uFF08\u6B63\u5E38\u91CD\u542F\uFF09"));
           d.tokenService().clear("main");
           if (!manual) d.mSetRestartCount(d.mRestartCount() + 1);
-          const throttle = startupFailure ? d.main().noteStartupFailure() : null;
+          const throttle = null;
           if (throttle && throttle.failed) {
             d.mSetRestartAt(null);
           } else {
@@ -11367,247 +11050,6 @@ var require_signals = __commonJS({
   }
 });
 
-// src/shared/guardian.js
-var require_guardian = __commonJS({
-  "src/shared/guardian.js"(exports2, module2) {
-    "use strict";
-    function shouldGuard(inst) {
-      return !!(inst && inst.guardian === true);
-    }
-    function bumpStartupFailure(w, now, cfg) {
-      const windowMs = cfg && Number(cfg.windowMs) > 0 ? Number(cfg.windowMs) : 6e4;
-      const burst = cfg && Number(cfg.burst) >= 1 ? Number(cfg.burst) : 5;
-      let start = w.start;
-      let count = w.count;
-      if (start === null || start === void 0 || now - start > windowMs) {
-        start = now;
-        count = 1;
-      } else {
-        count += 1;
-      }
-      return { start, count, tripped: count >= burst };
-    }
-    function makeBudget(cfg) {
-      const windowMs = cfg && Number(cfg.windowMs) > 0 ? Number(cfg.windowMs) : 6e4;
-      const burst = cfg && Number(cfg.burst) >= 1 ? Number(cfg.burst) : 5;
-      let state = { start: null, count: 0 };
-      const self = {
-        windowMs,
-        burst,
-        get count() {
-          return state.count;
-        },
-        get tripped() {
-          return state.count >= burst;
-        },
-        note(startupFailure) {
-          if (startupFailure === false || startupFailure == null) {
-            return { tripped: false, count: state.count, halted: false };
-          }
-          const dec = bumpStartupFailure(state, Date.now(), { windowMs, burst });
-          state.start = dec.start;
-          state.count = dec.count;
-          return { tripped: dec.tripped, count: state.count, halted: dec.tripped };
-        },
-        reset() {
-          state = { start: null, count: 0 };
-        }
-      };
-      return self;
-    }
-    module2.exports = { shouldGuard, bumpStartupFailure, makeBudget };
-  }
-});
-
-// src/app/main/startup-throttle.js
-var require_startup_throttle = __commonJS({
-  "src/app/main/startup-throttle.js"(exports2, module2) {
-    "use strict";
-    var guardian = require_guardian();
-    var pmClient = require_pm_client();
-    var DEPS = /* @__PURE__ */ new WeakMap();
-    function depsOf(host) {
-      let d = DEPS.get(host);
-      if (!d) {
-        d = {
-          config() {
-            return host.config;
-          },
-          state() {
-            return host.state;
-          },
-          events() {
-            return host.events;
-          },
-          logger() {
-            return host.logger;
-          },
-          ui() {
-            return host.ui;
-          },
-          mStartupFailWindowStart() {
-            return host._mStartupFailWindowStart();
-          },
-          mStartupFailCount() {
-            return host._mStartupFailCount();
-          },
-          mSetStartupFailWindowStart(v) {
-            return host._mSetStartupFailWindowStart(v);
-          },
-          mSetStartupFailCount(v) {
-            return host._mSetStartupFailCount(v);
-          }
-        };
-        DEPS.set(host, d);
-      }
-      return d;
-    }
-    module2.exports = {
-      methods: {
-        _noteStartupFailure() {
-          const d = depsOf(this);
-          const windowMs = d.config().startupFailWindowMs || 6e4;
-          const dec = guardian.bumpStartupFailure(
-            { start: d.mStartupFailWindowStart(), count: d.mStartupFailCount() },
-            Date.now(),
-            { windowMs, burst: d.config().startupFailBurst }
-          );
-          d.mSetStartupFailWindowStart(dec.start);
-          d.mSetStartupFailCount(dec.count);
-          if (!dec.tripped) return { failed: false, count: dec.count };
-          d.state().setPhase("FAILED");
-          d.events().append("startup_failed", {
-            count: dec.count,
-            windowMs,
-            retry: "/lifecycle/dsh/restart"
-          });
-          d.logger().error("\u542F\u52A8\u5931\u8D25 " + dec.count + " \u6B21\uFF08\u7A97\u53E3 " + Math.round(windowMs / 1e3) + "s\uFF09\u2192 FAILED\uFF1A\u505C\u6B62\u81EA\u52A8\u91CD\u542F\uFF0C\u7B49\u5F85\u4EBA\u5DE5\u91CD\u8BD5\uFF08/lifecycle/dsh/restart\uFF09");
-          d.ui().notify(
-            "DSH \u542F\u52A8\u53CD\u590D\u5931\u8D25",
-            dec.count + " \u6B21\u542F\u52A8\u5931\u8D25\uFF08" + Math.round(windowMs / 1e3) + "s \u5185\uFF09\uFF0C\u5DF2\u505C\u6B62\u81EA\u52A8\u91CD\u542F\uFF1B\u8BF7\u5728\u9762\u677F\u70B9\u300C\u91CD\u542F\u300D\u91CD\u8BD5"
-          );
-          return { failed: true, count: dec.count };
-        },
-        _retryStartupFailure() {
-          const d = depsOf(this);
-          d.mSetStartupFailWindowStart(null);
-          d.mSetStartupFailCount(0);
-          pmClient.resetBackoff("main");
-          d.events().append("startup_retry", {});
-          d.logger().warn("\u542F\u52A8\u5931\u8D25\u8BA1\u6570\u5DF2\u6E05\u96F6\uFF1A\u4EBA\u5DE5\u91CD\u8BD5\uFF0C\u56DE\u5230 STARTING");
-          return { ok: true };
-        }
-      }
-    };
-  }
-});
-
-// src/app/daemons/supervise.js
-var require_supervise = __commonJS({
-  "src/app/daemons/supervise.js"(exports2, module2) {
-    "use strict";
-    var pidlook = require_pidlookup();
-    var ROUTER_SUMMARY_TIMEOUT_MS = 5e3;
-    var DEPS = /* @__PURE__ */ new WeakMap();
-    function depsOf(host) {
-      let d = DEPS.get(host);
-      if (!d) {
-        d = {
-          stopping: () => host._stopping,
-          exitIntended: () => host._exitIntended(),
-          lifecycleManager: () => host.lifecycleManager,
-          config: () => host.config,
-          daemons: () => host.daemons,
-          control: () => host.control,
-          views: () => host.views,
-          managedObjects: () => host.managedObjects,
-          ctl: () => host.ctl,
-          events: () => host.events,
-          logger: () => host.logger
-        };
-        DEPS.set(host, d);
-      }
-      return d;
-    }
-    module2.exports = {
-      methods: {
-        async _daemonSuperviseOnce(kind) {
-          const d = depsOf(this);
-          if (d.stopping()) return { ok: false };
-          if (d.exitIntended()) return { ok: false, error: "exit intended" };
-          try {
-            if (kind === "router") {
-              const wantRunning = d.config().routerAutostart === true;
-              const rlc = d.lifecycleManager() ? d.lifecycleManager().get("router") : null;
-              if (!wantRunning) return { ok: d.daemons().routerActive() };
-              if (!d.daemons().managed()) return { ok: d.daemons().routerActive() };
-              const rlcx = d.daemons().lifecycle("router");
-              if (rlcx && typeof rlcx.classify === "function") {
-                const c = rlcx.classify();
-                if (c && c.mode === "external") {
-                  d.logger() && d.logger().warn && d.logger().warn("[router] \u76D1\u7763\uFF1Actl " + d.ctl().routerPort() + " \u88AB\u5916\u90E8\u8FDB\u7A0B\u5360\u7528\uFF08pid=" + c.owner + "\uFF09\uFF0C\u4E0D\u63A5\u7BA1\u4E0D\u62C9\u8D77");
-                  return { ok: false };
-                }
-              }
-              if (d.daemons().routerActive()) {
-                try {
-                  d.control().syncRouterView({ ok: true });
-                } catch (e) {
-                  d.logger() && d.logger().warn && d.logger().warn("router view sync: " + (e && e.message));
-                }
-                try {
-                  if (d.views().routerDaemonActive() && d.managedObjects()) {
-                    const s = await d.ctl().call(d.ctl().routerPort(), "domainSummary", [], ROUTER_SUMMARY_TIMEOUT_MS);
-                    const e = d.managedObjects().get("router-daemon");
-                    if (e && s && typeof s === "object") {
-                      e.domainSummary = Object.assign({ fetchedAt: Date.now() }, s);
-                    }
-                  }
-                } catch (e2) {
-                  d.logger() && d.logger().debug && d.logger().debug("router \u57DF\u6458\u8981\u62C9\u53D6\u5931\u8D25: " + (e2 && e2.message || e2));
-                }
-                return { ok: true };
-              }
-              const rt2 = d.daemons().ensureRouterRuntime(true);
-              if (rt2.mode === "daemon" && rt2.spawned) {
-                d.events().append("router_daemon_supervised", { pid: rt2.spawned });
-                if (d.logger() && d.logger().warn) d.logger().warn("[router] \u76D1\u7763\uFF1Arouter-daemon \u5931\u8054\uFF0C\u5DF2\u91CD\u65B0\u62C9\u8D77 pid=" + rt2.spawned);
-                if (rlc) {
-                  rlc._setPhase("starting");
-                }
-                setTimeout(() => {
-                  const up = pidlook.findListeningPid(d.ctl().routerPort());
-                  try {
-                    d.control().syncRouterView({ ok: !!up, error: up ? null : "router-daemon \u62C9\u8D77\u540E\u672A\u5C31\u7EEA" });
-                  } catch (e) {
-                    d.logger() && d.logger().warn && d.logger().warn("router view sync: " + (e && e.message));
-                  }
-                }, 3e3);
-              } else if (rt2.mode === "error") {
-                if (d.logger() && d.logger().warn) d.logger().warn("[router] \u76D1\u7763\u62C9\u8D77\u5931\u8D25: " + (rt2.error || "\u672A\u77E5"));
-              }
-              return { ok: false };
-            }
-            if (!d.daemons().enabled()) return { ok: d.daemons().lanActive() };
-            d.daemons().syncLanState();
-            if (d.daemons().lanActive()) return { ok: true };
-            const rt = d.daemons().ensureLanRuntime(true);
-            if (rt.mode === "daemon" && rt.spawned) {
-              if (d.logger() && d.logger().warn) d.logger().warn("[lan] \u76D1\u7763\uFF1Alan-daemon \u5931\u8054\uFF0C\u5DF2\u91CD\u65B0\u62C9\u8D77 pid=" + rt.spawned);
-            } else if (rt.mode === "error") {
-              if (d.logger() && d.logger().warn) d.logger().warn("[lan] \u76D1\u7763\u62C9\u8D77\u5931\u8D25: " + (rt.error || "\u672A\u77E5"));
-            }
-            return { ok: false };
-          } catch (e) {
-            if (d.logger() && d.logger().warn) d.logger().warn("[" + kind + "] \u76D1\u7763\u5F02\u5E38: " + (e && e.message));
-            return { ok: false };
-          }
-        }
-      }
-    };
-  }
-});
-
 // src/app/daemons/process-wait.js
 var require_process_wait = __commonJS({
   "src/app/daemons/process-wait.js"(exports2, module2) {
@@ -12805,10 +12247,7 @@ var require_status = __commonJS({
         desired: host._mDesired(),
         phase: host._mPhase(),
         state: deriveState(host),
-        sessionState: (function() {
-          const p = String(host._mPhase() || "").toUpperCase();
-          return p === "STARTING" || p === "RUNNING" ? "running" : "stopped";
-        })(),
+        sessionState: host.session ? host.session.state() : "running",
         dataDirProtected: Array.isArray(host._fileProtectStatus) ? host._fileProtectStatus.length > 0 && host._fileProtectStatus.every((r) => r.ok) : null,
         guardVersion: host.guardVersion,
         installId: installId(),
@@ -12821,7 +12260,6 @@ var require_status = __commonJS({
         startupFailCount: host._mStartupFailCount(),
         lastFailure: host._mLastFailure(),
         lastRestartAt: host._mLastRestartAt(),
-        upgradeHold: host._upgradeHold,
         shellHalted: host._shellHalted === true,
         commandMissing: !!(host._mMissingNotified && host._mMissingNotified()),
         dshTokenCaptured: !!(host.tokenService && host.tokenService.get("main")),
@@ -14081,8 +13519,6 @@ var require_facets = __commonJS({
       { name: "main/process", mod: require_process2() },
       { name: "main/port-rederive", mod: require_port_rederive() },
       { name: "main/signals", mod: require_signals() },
-      { name: "main/startup-throttle", mod: require_startup_throttle() },
-      { name: "daemons/supervise", mod: require_supervise() },
       { name: "daemons/runtime", mod: require_runtime2() },
       { name: "daemons/identity", mod: require_identity() },
       { name: "daemons/probe", mod: require_probe4() },
@@ -15688,8 +15124,6 @@ var require_core5 = __commonJS({
       host._stopping = false;
       host._crashHalted = false;
       host._shellHalted = false;
-      host._upgradeHold = false;
-      host._upgradeHoldSince = null;
       host._timer = null;
       host._beatScheduler = null;
       host._heartbeatBusy = false;
@@ -16951,6 +16385,58 @@ var require_instance_lifecycle = __commonJS({
   }
 });
 
+// src/shared/guardian.js
+var require_guardian = __commonJS({
+  "src/shared/guardian.js"(exports2, module2) {
+    "use strict";
+    function shouldGuard(inst) {
+      return !!(inst && inst.guardian === true);
+    }
+    function bumpStartupFailure(w, now, cfg) {
+      const windowMs = cfg && Number(cfg.windowMs) > 0 ? Number(cfg.windowMs) : 6e4;
+      const burst = cfg && Number(cfg.burst) >= 1 ? Number(cfg.burst) : 5;
+      let start = w.start;
+      let count = w.count;
+      if (start === null || start === void 0 || now - start > windowMs) {
+        start = now;
+        count = 1;
+      } else {
+        count += 1;
+      }
+      return { start, count, tripped: count >= burst };
+    }
+    function makeBudget(cfg) {
+      const windowMs = cfg && Number(cfg.windowMs) > 0 ? Number(cfg.windowMs) : 6e4;
+      const burst = cfg && Number(cfg.burst) >= 1 ? Number(cfg.burst) : 5;
+      let state = { start: null, count: 0 };
+      const self = {
+        windowMs,
+        burst,
+        get count() {
+          return state.count;
+        },
+        get tripped() {
+          return state.count >= burst;
+        },
+        note(startupFailure) {
+          if (startupFailure === false || startupFailure == null) {
+            return { tripped: false, count: state.count, halted: false };
+          }
+          const dec = bumpStartupFailure(state, Date.now(), { windowMs, burst });
+          state.start = dec.start;
+          state.count = dec.count;
+          return { tripped: dec.tripped, count: state.count, halted: dec.tripped };
+        },
+        reset() {
+          state = { start: null, count: 0 };
+        }
+      };
+      return self;
+    }
+    module2.exports = { shouldGuard, bumpStartupFailure, makeBudget };
+  }
+});
+
 // src/domains/router/providers/restart.js
 var require_restart = __commonJS({
   "src/domains/router/providers/restart.js"(exports2, module2) {
@@ -24838,82 +24324,6 @@ var require_managed_object = __commonJS({
   }
 });
 
-// src/app/control/heartbeat.js
-var require_heartbeat = __commonJS({
-  "src/app/control/heartbeat.js"(exports2, module2) {
-    "use strict";
-    var ADAPTER_TIMEOUT_TICKS = 6;
-    function withTimeout(registry, p, ms, id) {
-      let t = null;
-      const timeout = new Promise((resolve) => {
-        t = setTimeout(() => resolve({ __timedOut: true, ok: false, error: "\u76D1\u7763\u8D85\u65F6(" + ms + "ms)" }), ms);
-        if (t && typeof t.unref === "function") t.unref();
-      });
-      return Promise.race([Promise.resolve(p).finally(() => {
-        if (t) clearTimeout(t);
-      }), timeout]).catch((e) => ({ ok: false, error: e && e.message || String(e) })).then((res) => {
-        if (res && res.__timedOut) {
-          registry._log("warn", "heartbeat \u76D1\u7763\u8D85\u65F6(" + id + ")\uFF1A\u5DF2\u8DF3\u8FC7\u672C\u62CD\uFF08\u9632\u5FC3\u8DF3\u505C\u6446\uFF09");
-        }
-        return res;
-      });
-    }
-    async function runHeartbeat(registry, intervalMs) {
-      if (registry._heartbeatInFlight) return registry._heartbeatInFlight;
-      const beat = runBeat(registry, intervalMs);
-      registry._heartbeatInFlight = beat;
-      try {
-        return await beat;
-      } finally {
-        if (registry._heartbeatInFlight === beat) registry._heartbeatInFlight = null;
-      }
-    }
-    async function runBeat(registry, intervalMs) {
-      const iv = intervalMs || 5e3;
-      const now = Date.now();
-      const observed = [];
-      const errors = [];
-      for (const e of registry._objects.slice()) {
-        const ad = registry._adapters[e.kind];
-        if (!ad) continue;
-        const fn = typeof ad.supervise === "function" ? ad.supervise : typeof ad.observe === "function" ? ad.observe : null;
-        if (!fn) continue;
-        const tickEvery = ad.tickEvery || e.ownership && e.ownership.meta && e.ownership.meta.tickEvery || 1;
-        if (tickEvery > 1) {
-          if (e._nextTickAt && now < e._nextTickAt) continue;
-          e._nextTickAt = Date.now() + tickEvery * iv;
-        }
-        try {
-          const res = await withTimeout(registry, fn(e), iv * ADAPTER_TIMEOUT_TICKS, e.id);
-          if (res && res.__timedOut) errors.push(e.id + ":" + (res.error || "\u76D1\u7763\u8D85\u65F6"));
-          if (res && typeof res.ok === "boolean") {
-            if (registry.get(e.id) !== e) continue;
-            registry.applyObservation(e.id, res);
-            if (ad.derivePhase === true) {
-              const want = e.desired === "running";
-              const p = want && res.ok ? "running" : "stopped";
-              if (e.phase !== p) registry.setPhase(e.id, p);
-            }
-          }
-          observed.push(e.id);
-        } catch (err) {
-          errors.push(e.id + ":" + (err && err.message || err));
-          registry._log("warn", "heartbeat " + (ad.supervise ? "supervise" : "observe") + "(" + e.kind + ":" + e.id + "): " + (err && err.message || err));
-        }
-      }
-      if (typeof registry.onBeatDone === "function") {
-        try {
-          await registry.onBeatDone({ observed, errors });
-        } catch (err) {
-          registry._log("warn", "heartbeat onBeatDone: " + (err && err.message || err));
-        }
-      }
-      return { observed, errors };
-    }
-    module2.exports = { runHeartbeat, withTimeout, ADAPTER_TIMEOUT_TICKS };
-  }
-});
-
 // src/app/control/registry.js
 var require_registry4 = __commonJS({
   "src/app/control/registry.js"(exports2, module2) {
@@ -24924,8 +24334,6 @@ var require_registry4 = __commonJS({
     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 { runHeartbeat } = require_heartbeat();
-    var pmClient = require_pm_client();
     var configDefaults = require_config();
     var RESTART_FALLBACK = { windowMs: 6e4, burst: 5 };
     var restartDefaults = () => {
@@ -25067,7 +24475,6 @@ var require_registry4 = __commonJS({
         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: [], restart_window_ms: rd.windowMs, restart_burst: rd.burst });
         return e;
       }
       update(id, patch) {
@@ -25077,7 +24484,6 @@ 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) {
@@ -25109,7 +24515,6 @@ 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) {
@@ -25141,9 +24546,6 @@ var require_registry4 = __commonJS({
       count() {
         return this._objects.length;
       }
-      heartbeat(intervalMs) {
-        return runHeartbeat(this, intervalMs);
-      }
       applyObservation(id, obs) {
         const e = this.get(id);
         if (!e) return null;
@@ -25174,7 +24576,6 @@ 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, p);
         }
         return e;
       }
@@ -26369,9 +25770,6 @@ var require_domains = __commonJS({
         });
         host._syncManagedRegistry();
         if (host.managedObjects && typeof host.managedObjects.registerAdapter === "function") {
-          host.managedObjects.registerAdapter("router-daemon", { supervise: () => host._daemonSuperviseOnce("router"), tickEvery: 6, derivePhase: true });
-          host.managedObjects.registerAdapter("lan-daemon", { supervise: () => host._daemonSuperviseOnce("lan"), tickEvery: 6, derivePhase: true });
-          host.managedObjects.registerAdapter("dsh", { supervise: () => host._dshSuperviseOnce(), tickEvery: 1 });
           host.managedObjects.registerAdapter("sandbox-instance", { supervise: (entry) => host._sandboxSuperviseOnce(entry), tickEvery: 1 });
         }
         if (host.managedObjects) host.managedObjects.onBeatDone = () => host.instances.governSweep();
@@ -26422,8 +25820,6 @@ var require_domains = __commonJS({
         hooks: {
           isDshActive: () => ["STARTING", "RUNNING"].includes(host._mPhase()),
           desiredRunning: () => host._mDesired() === "running",
-          stopForUpgrade: () => host._enterUpgradeHoldAsync(),
-          resumeAfterUpgrade: () => host._exitUpgradeHold(true),
           verifyDeadlineMs: () => Math.max(2 * host.config.startsecs * 1e3, 12e4),
           notify: (t, b) => host.notify(t, b)
         }

package/package.json

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