@dsh-sup/dsh-core-linux-x64 0.1.6-BETA.3 → 0.1.6-BETA.4

package/core.cjs

@@ -929,7 +929,7 @@ var require_version = __commonJS({
     var fs2 = require("node:fs");
     var path2 = require("node:path");
     function guardVersion() {
-      if (true) return String("0.1.6-BETA.3");
+      if (true) return String("0.1.6-BETA.4");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -2038,8 +2038,6 @@ var require_specs = __commonJS({
       }
       function sandboxSpec(inst) {
         if (!inst || !inst.id) return null;
-        const phase = inst.state && inst.state.phase;
-        const running = phase === "RUNNING" || phase === "STARTING" || phase === "INSTALLING";
         let rootPath = null;
         const im = instances();
         try {
@@ -2050,7 +2048,7 @@ var require_specs = __commonJS({
           kind: "sandbox-instance",
           id: inst.id,
           name: String(inst.name || inst.id),
-          desired: running ? "running" : "stopped",
+          desired: inst.state && inst.state.desired === "stopped" ? "stopped" : "running",
           guardian: inst.guardian === true,
           ownership: {
             ports: [{ role: "inst", port: Number(inst.port) }],
@@ -2060,13 +2058,12 @@ var require_specs = __commonJS({
           }
         };
       }
-      function upsert(spec, opts) {
+      function upsert(spec) {
         const m = reg();
         if (!m || !spec) return;
-        const keepDesired = !!(opts && opts.keepDesired);
         try {
           const existing = m.get(spec.id);
-          if (existing) m.update(spec.id, { desired: keepDesired ? void 0 : spec.desired, guardian: spec.guardian, name: spec.name, ownership: spec.ownership });
+          if (existing) m.update(spec.id, { desired: spec.desired, guardian: spec.guardian, name: spec.name, ownership: spec.ownership });
           else m.register(spec);
         } catch (e) {
           const l = logger();
@@ -2092,7 +2089,7 @@ var require_specs = __commonJS({
           const sandboxes = _m && typeof _m.all === "function" && _m.all() || [];
           for (const inst of sandboxes) {
             if (inst.id === "main" || inst.domain === "native") continue;
-            upsert(sandboxSpec(inst), { keepDesired: true });
+            upsert(sandboxSpec(inst));
           }
           const c = ctl();
           upsert({
@@ -3872,8 +3869,8 @@ var require_orphan_scan = __commonJS({
       const issues = [];
       try {
         const daemons = [
-          { kind: "router-daemon", port: g.getCtl().routerPort(), active: () => g.getDaemons().routerActive(), managed: () => g.getDaemons().managed(), want: () => g.getConfig().routerAutostart === true || !!(reg && reg.get("router-daemon") && reg.get("router-daemon").desired === "running") },
-          { kind: "lan-daemon", port: g.getCtl().lanPort(), active: () => g.getDaemons().lanActive(), managed: () => g.getDaemons().lanManaged(), want: () => g.getDaemons().enabled() || !!(reg && reg.get("lan-daemon") && reg.get("lan-daemon").desired === "running") }
+          { kind: "router-daemon", port: g.getCtl().routerPort(), active: () => g.getDaemons().routerActive(), managed: () => g.getDaemons().managed(), want: () => g.getConfig().routerAutostart === true },
+          { kind: "lan-daemon", port: g.getCtl().lanPort(), active: () => g.getDaemons().lanActive(), managed: () => g.getDaemons().lanManaged(), want: () => g.getDaemons().enabled() }
         ];
         for (const d of daemons) {
           if (!d.active()) continue;
@@ -7807,8 +7804,8 @@ var require_instance_adapter = __commonJS({
           return { ok: running, error: running ? null : "\u6C99\u7BB1\u5B9E\u4F8B\u672A\u8FD0\u884C" };
         },
         /** 目录项 <- 实例域状态对齐（监督拍后调用）：实例已删 -> 注销（防死登记）；存在 -> 经
-         *  sandboxSpec 同步 name/guardian/ownership + phase 落目录词表。desired 不同步（keepDesired，
-         *  契约 M-1：观测推导不得写回应然，崩溃进 BACKOFF 不等于「用户想停」）。 */
+         *  sandboxSpec 同步 name/guardian/ownership + phase 落目录词表。desired 走的是实例意图字段的
+         *  投影（不是 phase 推导），所以观测路径写它不会改写任何意图（契约 M-1）。 */
         _syncSandboxRegistryEntry(entry) {
           const d = depsOf(this);
           if (!entry || !d.managedObjects() || !d.instances()) return;
@@ -7819,7 +7816,7 @@ var require_instance_adapter = __commonJS({
             return;
           }
           try {
-            d.control().upsert(d.control().sandboxSpec(inst), { keepDesired: true });
+            d.control().upsert(d.control().sandboxSpec(inst));
           } catch (e) {
             d.logger() && d.logger().warn && d.logger().warn("sandbox upsert: " + (e && e.message || e));
           }
@@ -9479,8 +9476,8 @@ var require_supervise = __commonJS({
           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;
-              const wantRunning = d.config().routerAutostart === true || rlc && rlc.desired === "running";
               if (!wantRunning) return { ok: d.daemons().routerActive() };
               if (!d.daemons().managed()) return { ok: d.daemons().routerActive() };
               const rlcx = d.daemons().lifecycle("router");
@@ -10897,7 +10894,7 @@ var require_router2 = __commonJS({
             config.routerAutostart = false;
             state.persistConfigPatch({ routerAutostart: false });
             if (rlc) {
-              rlc.desired = "stopped";
+              rlc.wantStopped();
               rlc._monitoring = false;
               rlc._setPhase("stopped");
               rlc.healthy = false;
@@ -10908,7 +10905,7 @@ var require_router2 = __commonJS({
           config.routerAutostart = false;
           state.persistConfigPatch({ routerAutostart: false });
           if (rlc) {
-            rlc.desired = "stopped";
+            rlc.wantStopped();
             rlc._monitoring = false;
             rlc._setPhase("stopped");
             rlc.healthy = false;
@@ -19237,6 +19234,10 @@ var require_model3 = __commonJS({
         inst.state.lastError = null;
       }
       if (inst.state) inst.state.phase = inst.state.phase || "STOPPED";
+      if (inst.state && inst.state.desired === void 0) {
+        const p = inst.state.phase;
+        inst.state.desired = p === "RUNNING" || p === "STARTING" || p === "INSTALLING" ? "running" : "stopped";
+      }
       return inst;
     }
     function createRecord(payload, id) {
@@ -19261,7 +19262,7 @@ var require_model3 = __commonJS({
           protectHome: payload.protectHome === void 0 ? false : !!payload.protectHome
           // 资源配额不接收户输入：启动时由 governor 按机器预算与活跃实例数推导。
         },
-        state: { phase: "STOPPED", restartCount: 0, backoffLevel: 0, lastProbeOk: null },
+        state: { phase: "STOPPED", desired: "stopped", restartCount: 0, backoffLevel: 0, lastProbeOk: null },
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
     }
@@ -19603,6 +19604,10 @@ var require_lifecycle = __commonJS({
               return { ok: false, error: adm.error };
             }
           }
+          if (inst.state.desired !== "running") {
+            inst.state.desired = "running";
+            store.save();
+          }
           store.ensureDirs(inst);
           const dshEntry = sandbox.dshEntry(instancesRoot, inst);
           if (!fs2.existsSync(dshEntry)) {
@@ -19613,7 +19618,8 @@ var require_lifecycle = __commonJS({
         }
         return _systemdStart(inst);
       }
-      function stop(id) {
+      function stop(id, opts) {
+        const transient = !!(opts && opts.intent === "transient");
         const inst = store.instances.find((i) => i.id === id);
         if (!inst) return { ok: false, error: "\u5B9E\u4F8B\u4E0D\u5B58\u5728" };
         if (!isSandboxSupported()) return { ok: false, error: "\u5F53\u524D\u5E73\u53F0\u4E0D\u652F\u6301\u6C99\u7BB1\u5B9E\u4F8B\uFF08\u80FD\u529B\u77E9\u9635\u89C1 GET /env/status \u7684 capabilities.sandboxLaunch\uFF1B\u9650\u989D\u6267\u884C\u6863\u4F4D\u89C1 capabilities.sandboxEnforcement\uFF09" };
@@ -19635,6 +19641,7 @@ var require_lifecycle = __commonJS({
         }
         inst.state.phase = "STOPPED";
         inst.state.usage = null;
+        if (!transient) inst.state.desired = "stopped";
         runtime.delete(inst.id);
         store.save();
         if (inst.port && hooks.onInstanceStop) hooks.onInstanceStop(inst);
@@ -20138,7 +20145,7 @@ var require_upgrade = __commonJS({
               tasks.stepState(task.id, tasks.get(task.id).steps.indexOf(s), "running");
             }
             try {
-              await lifecycle.stop(id);
+              await lifecycle.stop(id, { intent: "transient" });
             } catch {
             }
             if (task) {
@@ -20186,7 +20193,7 @@ var require_upgrade = __commonJS({
               tasks.log(task.id, "\u81EA\u52A8\u56DE\u6EDA\u5230 " + oldVersion + "\u2026");
             }
             try {
-              const rs = await lifecycle.stop(id);
+              const rs = await lifecycle.stop(id, { intent: "transient" });
               if (rs && rs.ok === false && task) tasks.log(task.id, "\u56DE\u6EDA\u524D\u505C\u6B62\u5931\u8D25\uFF08\u7EE7\u7EED\u56DE\u88C5\u65E7\u7248\uFF09\uFF1A" + (rs.error || ""));
             } catch (e) {
               if (task) tasks.log(task.id, "\u56DE\u6EDA\u524D\u505C\u6B62\u5F02\u5E38\uFF08\u7EE7\u7EED\u56DE\u88C5\u65E7\u7248\uFF09\uFF1A" + (e && e.message || e));
@@ -20765,8 +20772,8 @@ var require_instance = __commonJS({
       startInstance(id, opts) {
         return this._lifecycle.start(id, opts);
       }
-      stopInstance(id) {
-        return this._lifecycle.stop(id);
+      stopInstance(id, opts) {
+        return this._lifecycle.stop(id, opts);
       }
       supervise(id) {
         return this._lifecycle.supervise(id);
@@ -21831,7 +21838,7 @@ var require_restart3 = __commonJS({
           log("\u91CD\u542F\u5B9E\u4F8B\u300C" + (target.name || target.id) + "\u300D\u4F7F\u63D2\u4EF6\u53D8\u66F4\u751F\u6548\u2026");
           if (ctx.events) ctx.events.append("plugin_restart_started", { name: target.name || target.id, target: target.id, kind });
           try {
-            ctx.instances.stopInstance(target.id);
+            ctx.instances.stopInstance(target.id, { intent: "transient" });
           } catch (e) {
             log("\u505C\u6B62\u5B9E\u4F8B\u5931\u8D25: " + e.message);
           }
@@ -24066,6 +24073,7 @@ var require_entry = __commonJS({
         } catch (e) {
           this.error = e && e.message || String(e);
           this._setPhase("stopped");
+          this.desired = "stopped";
           if (this.logger && this.logger.warn) this.logger.warn("[lifecycle] " + this.id + " start \u5931\u8D25: " + this.error);
           return { ok: false, error: this.error };
         }
@@ -24375,11 +24383,11 @@ var require_adapters = __commonJS({
           kind: "router",
           name: "\u667A\u80FD\u8DEF\u7531",
           logger,
-          start: async () => sup && typeof sup.setRouterRunning === "function" ? sup.setRouterRunning(true) : router.start(),
+          start: async () => sup && typeof sup.setRouterRunning === "function" ? sup.setRouterRunning(true) : { ok: false, error: "\u7F3A setRouterRunning \u5199\u53E3\uFF1A\u542F\u505C\u4E0D\u5F97\u7ED5\u8FC7 config \u6301\u4E45\u5316" },
           // 守卫自身 shutdown（_stopping=true）不得停独立 daemon：守卫退出不影响被管模块，仅显式用户停止才停。
           stop: async () => {
             if (sup && sup._stopping) return { ok: true, already: true, reason: "guard-shutdown \u4E0D\u505C daemon" };
-            return sup && typeof sup.setRouterRunning === "function" ? sup.setRouterRunning(false) : router.stop();
+            return sup && typeof sup.setRouterRunning === "function" ? sup.setRouterRunning(false) : { ok: false, error: "\u7F3A setRouterRunning \u5199\u53E3\uFF1A\u505C\u6B62\u987B\u540C\u65F6\u6E05 config \u6301\u4E45\u5316" };
           },
           // detail 走守卫真实 router 状态视图（daemon 模式经 ctl 取实时态）
           status: () => sup && typeof sup.routerStatus === "function" ? sup.routerStatus() : router.status ? router.status() : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-sup/dsh-core-linux-x64",
-  "version": "0.1.6-BETA.3",
+  "version": "0.1.6-BETA.4",
   "description": "DSH lifecycle guard core (Node launcher) for linux-x64 — requires Node >=18.",
   "license": "UNLICENSED",
   "repository": {