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

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.10");
+      if (true) return String("0.0.12");
       try {
         return JSON.parse(fs2.readFileSync(path2.join(__dirname, "..", "..", "package.json"), "utf8")).version || "unknown";
       } catch {
@@ -1824,10 +1824,7 @@ var require_phase = __commonJS({
       STARTING: "starting",
       RUNNING: "running",
       STOPPING: "draining",
-      FAILED: "failed",
-      OBSERVED: "stopped",
-      RESTARTING: "starting",
-      BACKOFF: "failed"
+      FAILED: "failed"
     };
     function entryToLegacyPhase(ph) {
       return ENTRY_TO_LEGACY[ph] || "STOPPED";
@@ -1865,10 +1862,7 @@ var require_fields = __commonJS({
       }
       function phase() {
         const e = record.storeOf();
-        const p = e.process || null;
-        const upper = entryToLegacyPhase(e.phase || "stopped");
-        if (upper === "STOPPED" && p && p.observedOnly && p.adopted) return "OBSERVED";
-        return upper;
+        return entryToLegacyPhase(e.phase || "stopped");
       }
       function setPhase(upper) {
         const e = record.storeOf();
@@ -2126,11 +2120,11 @@ var require_desired = __commonJS({
           if (it) it.register("start");
           setCrashHalted(false);
         }
-        if (v === "running" && fields.phase() === "OBSERVED") {
+        if (v === "running" && fields.observedOnly() && fields.accessors.adoptedPid.get() !== null) {
           fields.setObservedOnly(false);
           fields.setPhase("STOPPED");
         }
-        if (v === "stopped" && fields.phase() === "OBSERVED" && fields.observedOnly()) {
+        if (v === "stopped" && fields.observedOnly() && fields.accessors.adoptedPid.get() !== null) {
           stopProcess("desired_stopped");
         }
         if (fields.desired() !== v) {
@@ -4830,7 +4824,10 @@ var require_collaborators = __commonJS({
         crashHalted: () => host._crashHalted
       });
       host.session = session;
-      host.sessionState = () => session.state();
+      host.sessionState = () => {
+        const p = String(host._mPhase ? host._mPhase() : "").toUpperCase();
+        return p === "STARTING" || p === "RUNNING" ? "running" : "stopped";
+      };
       host._setSessionState = (s) => {
         session.setState(s);
       };
@@ -8407,7 +8404,13 @@ var require_bootstrap = __commonJS({
         const isBare = policies.isBareCommand(cur);
         if (!isBare) return;
         const d = execPath.resolveDsh();
-        if (!d || !d.bin) return;
+        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;
+        }
         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] });
@@ -10416,7 +10419,8 @@ var require_controller = __commonJS({
             host._crashHalted = v;
           },
           sessionState() {
-            return host._sessionState;
+            const p = String(host._mPhase() || "").toUpperCase();
+            return p === "STARTING" || p === "RUNNING" ? "running" : "stopped";
           },
           mChild() {
             return host._mChild();
@@ -10491,8 +10495,8 @@ var require_controller = __commonJS({
               if (managedAlive) {
                 d.main().stopProcess("desired_stopped");
               } else if (adoptedAlive && d.mObservedOnly()) {
-                if (d.state().phase() !== "OBSERVED") {
-                  d.state().setPhase("OBSERVED");
+                d.state().setObservedOnly(true);
+                if (d.state().phase() !== "STOPPED") {
                   d.state().write();
                 }
               } else if (portUp) {
@@ -10537,6 +10541,16 @@ var require_controller = __commonJS({
                 d.intents().consume("start");
               }
             }
+            {
+              const nst = host.nativeManager ? host.nativeManager.status() : null;
+              if (nst && nst.installed === false) {
+                const ph0 = String(d.state().phase() || "").toUpperCase();
+                if (ph0 === "STARTING" || ph0 === "RUNNING") {
+                  d.events().append("state_corrected", { from: ph0, to: "STOPPED", reason: "harness_not_installed" });
+                  d.state().setPhase("STOPPED");
+                }
+              }
+            }
             switch (d.state().phase()) {
               case "STOPPED": {
                 if (portUp) {
@@ -10617,7 +10631,7 @@ var require_controller = __commonJS({
             d.logger().error("tick error: " + (e && e.stack || e));
           } finally {
             d.writeTicking(false);
-            if (d.sessionState() === "starting") d.session().setState("running");
+            if (d.sessionState() === "running") d.session().setState("running");
             try {
               d.control().syncDshView();
             } catch (e) {
@@ -10761,8 +10775,20 @@ var require_command = __commonJS({
     "use strict";
     var fs2 = require("node:fs");
     var dshCli = require_dsh_cli();
+    var execPath = require_exec_path();
+    var policies = require_policies();
+    function resolveBareCommand(command) {
+      if (!Array.isArray(command) || command.length === 0) return command;
+      const idx = command.length > 1 ? 1 : 0;
+      const cur = command[idx];
+      if (!policies.isBareCommand(cur)) return command;
+      const d = execPath.resolveDsh();
+      if (!d || !d.bin) return command;
+      const rest = command.slice(idx + 1);
+      return d.isJs ? [d.runtime || process.execPath, d.bin, ...rest] : [d.bin, ...rest];
+    }
     function nativeCommand(config, pluginManager) {
-      const command = config.command || [];
+      const command = resolveBareCommand(config.command || []);
       const patchFile = pluginManager && pluginManager.overlayFile && fs2.existsSync(pluginManager.overlayFile) ? pluginManager.overlayFile : null;
       const out = [];
       let portSet = false;
@@ -11054,7 +11080,8 @@ var require_process2 = __commonJS({
         },
         _adoptObserved() {
           const d = depsOf(this);
-          d.state().setPhase("OBSERVED");
+          d.state().setObservedOnly(true);
+          d.state().setPhase("STOPPED");
           d.mSetAdopted(true);
           d.mSetObservedOnly(true);
           d.mSetChild(null);
@@ -12762,12 +12789,26 @@ var require_status = __commonJS({
   "src/app/facade/status.js"(exports2, module2) {
     "use strict";
     var { installId } = require_install_id();
+    function deriveState(host) {
+      const nat = host.nativeManager ? host.nativeManager.status() : null;
+      if (nat && nat.installed === false) return "uninstalled";
+      if (host._mMissingNotified && host._mMissingNotified()) return "command_missing";
+      const ph = String(host._mPhase() || "").toUpperCase();
+      if (ph === "RUNNING") return "running";
+      if (ph === "STARTING") return "starting";
+      if (ph === "FAILED") return "failed";
+      return "stopped";
+    }
     function statusSummary(host) {
       const dshPidNow = host._mChild() ? host._mChild().pid : host._mAdoptPid();
       return {
         desired: host._mDesired(),
         phase: host._mPhase(),
-        sessionState: host._sessionState,
+        state: deriveState(host),
+        sessionState: (function() {
+          const p = String(host._mPhase() || "").toUpperCase();
+          return p === "STARTING" || p === "RUNNING" ? "running" : "stopped";
+        })(),
         dataDirProtected: Array.isArray(host._fileProtectStatus) ? host._fileProtectStatus.length > 0 && host._fileProtectStatus.every((r) => r.ok) : null,
         guardVersion: host.guardVersion,
         installId: installId(),
@@ -12782,7 +12823,7 @@ var require_status = __commonJS({
         lastRestartAt: host._mLastRestartAt(),
         upgradeHold: host._upgradeHold,
         shellHalted: host._shellHalted === true,
-        commandMissing: !!(host._mSpawnBlockedUntil() && Date.now() < host._mSpawnBlockedUntil()),
+        commandMissing: !!(host._mMissingNotified && host._mMissingNotified()),
         dshTokenCaptured: !!(host.tokenService && host.tokenService.get("main")),
         tasks: host.tasks ? host.tasks.running().map((t) => ({ id: t.id, kind: t.kind, action: t.action, target: t.target, state: t.state })) : [],
         native: host.nativeManager ? host.nativeManager.status() : null,
@@ -15645,7 +15686,6 @@ var require_core5 = __commonJS({
       host._ticking = false;
       host.intents = new IntentLedger();
       host._stopping = false;
-      host._sessionState = "starting";
       host._crashHalted = false;
       host._shellHalted = false;
       host._upgradeHold = false;

package/package.json

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